Merge github_GBSX/master

Conflicts:
	README.md