Merge pull request #6 from zapiski/master

Merge into fork