Update README.md
Merge branch 'master' into screenshots
Solved problems

Conflicts:
	README.md