Fixed a bug
Merge branch 'launcher'