Merge branch 'develop' into release
Merge branch 'release'
Update README.md
Merge branch 'develop'

Conflicts:
	README.md
Merge branch 'develop'
bug fixes
Merge branch 'master' into develop