Fix issue#116
Merge pull request #117 from caiiiycuk/master

Fix issue#116