Closes #20
Merge pull request #21 from lloydbenson/master

Closes #20