Merge branch 'release/v-1.0.1'
hotfix so it starts the server
Merge remote-tracking branch 'origin/master' into hotfix/install-not-working