Feature/24 remote avatar

Creating the pull request, since it's easier to read diff.