Fix #65
Merge pull request #78 from 130s/issue65

Fix #65