update version numbers and doc
add colon to "note"
Merge branch 'master' into develop

Conflicts:
	README.md