Merge branch 'readme-update'
Merge branch 'specs'

Conflicts:
	README.md