No longer calling mathjax immediately
Merge branch 'development'