#50 Avatar
merge rebase