Browser safe iframe adding (fix FF infinite loading bug
Load scripts later
Merge branch 'master' into gh-pages