Fixes #64
Merge pull request #66 from XboxLeaders/develop

Fixes #64