Refactoring code to make it look good
Merge branch 'master' into gh-pages
Regenerate index.html