Merge pull request #13 from zapiski/master

asdf
Merge pull request #61 from rokkolesa/master

Merge pull request #13 from zapiski/master