added avatar support
Merge branch 'refs/heads/avatar_support'