tomepel Merge pull request #9 from zhangzhishan/master …