Fix #174
Fix #174
Merge pull request #187 from s17t/master

Fix #174