Resolve issue #30
Merge pull request #33 from BenV/fix-issue-30

Resolve issue #30