Merge pull request #19 from heyongjian/master

merger