Location free start scripts
Merge pull request #66 from babs/code-refactoring-startscripts

Fixed startup script to be location free