Merge pull request #11 from heyongjian/master

merger
Merge pull request #12 from heyongjian/master

merger
Merge pull request #23 from lwanghaol/master

Merge pull request #11 from heyongjian/master