Merge pull request #493 from bengott/avatar-tweaks

Update to bengott:avatar 0.2.1