fixed some issues with the launcher
Merge branch 'master' into command-runner-class