Merge pull request #3 from oompt/official

Official
Merge pull request #4 from oompt/official

Updates
Merge pull request #5 from oompt/gh-pages

Updates