Fixed #72
Merge pull request #75 from sbellem/issue-72

Fixed #72