Merge pull request #7 from jianmingyong/master