Merge branch 'gh-pages'
Add genkou
Merge remote-tracking branch 'origin/master' into gh-pages