dev on develop
Merge branch 'latest_branch' into develop

Conflicts:
	readme
Merge branch 'release/1.0'