resolves #20
Merge pull request #21 from tomasherman/fix-20

resolves #20