Merge pull request #5 from williecheong/master

Merge pull request #6 from williecheong/master
Merge pull request #6 from williecheong/master

Merge pull request #7 from williecheong/master
Merge pull request #56 from mozilla/master

Merge pull request #8 from williecheong/master