fix#10
Merge branch 'add_users_avatar'