Fixed works for Firefox
Merge branch 'master' into gh-pages