Organizing... I'm in that mood.
Merge branch 'gh-pages'