Added back line to prevent 'null' loading
Merge branch 'master' into gh-pages