Merge pull request #14 from zapiski/master

sadf
Merge pull request #65 from rokkolesa/master

Merge pull request #14 from zapiski/master