Merge origin/master

Conflicts:
	README.md
Revert "Merge origin/master"

This reverts commit 49de2a8c805f30b7258831e2514ab9a854626a24.
min version name fix