version 1.0
Merge branch 'gh-pages'