master changes
Merge branch 'master' into Yuke

Conflicts:
	README.md