Merge branch 'gh-pages' into tianyi_working
Merge pull request #4 from fgassert-pub/tianyi_working

Merge branch 'gh-pages' into tianyi_working