Merge pull request #11 from heyongjian/master

merger