Adding support for Firefox.
Solving merge conflicts