Merge pull request #18 from heyongjian/master

merger