Fix #118
Merge pull request #119 from matt4682/master

Fix #118