version increment :D
Merge branch 'master' into unstable

Conflicts:
	README.md