Merge pull request #34 from marc-portier/master

syncing up
Fix launcher