Merge pull request #21 from heyongjian/master

Merge pull request #42 from lwanghaol/master