more doc changes
more doc changes
more doc changes
more doc changes
Merge branch 'develop'

Conflicts:
	README.md