Merge pull request #488 from bengott/avatar-tweaks

Update to bengott:avatar 0.1.4