Pull changes in vcard-1 branch