Merge pull request #4 from williecheong/master

Merge pull request from williecheong/master
Merge pull request #55 from mozilla/master

Merge pull request #4 from williecheong/master