fix issue #1
Merge pull request #1 from aaron-em/master

Closes #2