commit
Merge branch 'master' into feature/gh-1

Conflicts:
	README.md