Merge pull request #19 from heyongjian/master

merger
Merge pull request #40 from lwanghaol/master

Merge pull request #19 from heyongjian/master