Merge pull request #6 from zapiski/master

Merge into fork
Merge pull request #34 from rokkolesa/master

Merge pull request #6 from zapiski/master