rebase @joellundell PR #144 w/ develop
Merge pull request #150 from Soundnode/follow-user

Rebase/Merge @joellundell PR #144 w/ develop and fixes