Fix errors, improve translation
Merge branch 'master' into ru

Conflicts:
	README.ru.md