small fixes to make the launcher work
some fix
Merge pull request #5 from wkerzendorf/launcher/fixing_to_work

Launcher/fixing to work