Merge pull request #2 from zapiski/master

Update
Merge pull request #9 from Osebek/master

Merge pull request #2 from zapiski/master