Merge pull request #5 from Aurorastation/development

Code Catchup
Jump link location

This should ok to commit, unless you want to change the 2 lines to match
the thing on your side
Merge pull request #297 from SoundScopes/development

Jump link location