Merge pull request #18 from heyongjian/master

merger
Merge pull request #39 from lwanghaol/master

Merge pull request #18 from heyongjian/master