Fix #124,#127
Merge pull request #128 from caiiiycuk/master

Fix #124,#127