Updates
Merge pull request #4 from oompt/official

Updates