Merge pull request #6 from jindai1783/master

Merge pull request #4 from jindai1783/fix
Merge pull request #7 from jindai1783/fix

Merge pull request #6 from jindai1783/master