Merge pull request #5 from netceler/master

Some code cleaning
Merge branch 'master' into launcher-hold-vm
Merge branch 'launcher-hold-vm' into configurable-wait-time