Fix Firefox
Merge pull request #2 from cavarzan/ng1.2wip

Merge pull request #1 from cavarzan/master
Merge pull request #3 from cavarzan/master

Master