Closes #32
Really closes #32
Really closes #32 this time
Merge pull request #33 from jeffgodwyll/master

Closes #32