vCard Avatar Updates

Merge from Pull Request #46