Fixes #1
Fixes #1
Merge pull request #23 from mhansbury/master

Fixes #1