Merge pull request #20 from heyongjian/master

merger