Closes #47
Merge pull request #49 from lloydbenson/master

Closes #47