Issue #64
Merge pull request #65 from agonist/master

Issue #64