Merge pull request #5 from meteormatt/master

修改文档里的注释
Merge pull request #6 from meteormatt/master

小修改
Merge pull request #2 from MozillaChina/master

合并