John Hu: 9/29 - 10/3
Merge pull request #5 from huchengtw-moz/2014-10-03

[W40] John Hu - 9/29 - 10/3