Fix #31
Merge pull request #95 from caseyjhol/master

Fix #31