Merge pull request #1 from moztw/master

Merge from master