Merge pull request #3 from jimbeveridge/janupdate

Updated to match Mozilla as of Jan 6, 2016