fix #26
fix #29
fix #28
Merge pull request #33 from xiechao06/dev

fix issue