Merge "Bugfix for setup.sh and add the user manual"