more changes basic structure
Merge branch 'gh-pages'