Merge branch 'master' into gh-pages

Conflicts:
style/main.css