Merge pull request #1 from Aurorastation/master

unbork my fork
Merge pull request #2 from SoundScopes/development

unbork test