Fixes #6
Merge pull request #25 from mhansbury/master

Fixes #6