This closes #23
Merge pull request #74 from efraimgentil/master

This closes #23