Firefox compatibility
Firefox compatibility
removed merge conflicts
Merge pull request #101 from rishy/master

removed merge conflicts