Update
Updated jekyll
Minor bugfix
Fix
Merge branch 'master' into gh-pages