Documentation fix
Modified data for release
Merge branch 'master' into 1.0.0_docfix

Conflicts:
	README.md
	setup.py