Avatar support
Merge pull request #3 from mattheu/avatars

Avatar support