fix #12
Merge pull request #34 from errorx666/issue12

fix issue #12