formatting
Merge remote-tracking branch 'origin/gh-p' into gh-pages