Python package
Merge remote branch 'tony/pypi'

Conflicts:
	README.rst