Closes #44
Merge pull request #63 from ericschultz/master

Closes #44