Merge pull request #16 from heyongjian/master

Merge pull request #31 from lwanghaol/master