Merge branch 'cleanup_mathjax'
Merge branch 'PEP8'