Fixes #13
Merge pull request #20 from vjovanov/issue-13

Fixes #13