Merge pull request #39 from heyongjian/master

Merge pull request #119 from lwanghaol/master
modfiy bug issue-18
modfiy bug issue-24
Merge pull request #122 from lwanghaol/master

wanghao:modfiy bug issue-18