Fix #81
Merge pull request #96 from caseyjhol/master

Fix #81