Merge pull request #79 from whuthm/master

huangming:merge the main branch to native branch.
Merge pull request #55 from heyongjian/master

huangming:merge the main branch to native branch.