Merged from branch gh-pages, v0.0.1