Merge pull request #231 from Dantemss/master

Made height limit 1000px
mathjax ssl
Merge remote-tracking branch 'upstream/master'