Issue #17
Merge pull request #18 from stac47/fix_issue_17

Issue #17