Merge pull request #573 from fabrixxm/catavatar