origin
Merge pull request #11 from cpaika/master

Bug fix