added avatar generation code
Merge branch 'master'