Merge pull request #4 from bythink/master

合并