Fix issue#120
Merge pull request #121 from caiiiycuk/master

Fix issue#120