fix docs
Merge branch 'master' into paste.pya.cz

Conflicts:
	README.md