Merge

Merged `master` and `gh-pages`