Merge pull request #9 from heyongjian/master

merger