gh-page fixes
style fix
Merge branch 'gh-pages'