fixups carried over from gh-pages
Merge branch 'release/v0.0.1' into gh-pages