Merge pull request #1 from oompt/official

Official
Merge pull request #2 from oompt/gh-pages

Merge pull request #1 from oompt/official