headdesk
Merge branch 'master' into proofread

Conflicts:
	README.md
Merge pull request #4 from plasticine/proofread

It's dependencies