Merge branch 'Firefox'

Firefox compatibility