Fixed issues with Firefox
Merge pull request #2 from Kylemade/master

Fixes for Firefox by Kylemade