Set base
Merge pull request #1 from almost/gh-pages

Merge from upstream