Added versioning
Missed a quote
Merge branch 'master' into stable

Conflicts:
	README.rst
	puush