Merge branch 'gh-pages'
fix injection function
Merge branch 'master' into gh-pages