Merge pull request #166 from Aurorastation/development

Syncin master.
Merge pull request #3 from Aurorastation/master

Code Catchup
Merge mess up repair
Merge pull request #167 from SoundScopes/master

Code repair