fixed avatar collisions
Merge remote-tracking branch 'upstream/master'
Merge pull request #142 from Ventrella/master

fixed avatar collisions