Merge pull request #88 from qkhj/master

add
Merge pull request #89 from qkhj/master

add
Merge pull request #29 from JohnCny/master

merge