Done
Merge pull request #11 from pvovk/master

Done