Fixes #26
Merge pull request #27 from pkuczynski/issue_26

Fixes #26