documentation fixes
Merge remote-tracking branch 'origin/develop' into pull-requests/17

Conflicts:
	README.rst