Merge pull request #17 from lwanghaol/master

Merge pull request #9 from heyongjian/master