Update docs; fix bugs
Merge
Merge branch 'gh-pages'