Merge pull request #6 from MozillaChina/master

上游合并
合并修改
Merge branch 'yuanwowo-master'