Merge pull request #42 from lwanghaol/master

Merge pull request #20 from heyongjian/master