add comment
simplify structure
improve header style
Merge branch 'master' into gh-pages