Merge pull request #8 from UberMouse/master

Merge master into develop
Merge pull request #9 from UberMouse/develop

Sync master back with develop