Merge origin/master

Conflicts:
	README.md

- Fix Launch
- Fix Stop