Made it work in FF and Internet Explorer without a hitch!
Merge branch 'master' into gh-pages
(compiled js)