Small refactoring to enable more SoundCloud API calls.
Merge remote-tracking branch 'origin/master'