Fixed and added a shell script to start it all
Merge branch 'hotfix/Issue_#1'