made Firefox compatible
Merge branch 'develop'