Update docs
Merge branch 'pr/67' into develop

Conflicts:
	README.rst