mmyaah!
Merge branch 'iss8a'

Conflicts:
	README.md