Merge pull request #3 from zapiski/master

Update
Merge pull request #38 from Osebek/master

Merge pull request #3 from zapiski/master