before integration of last changes from marinos
Merged changes from Marinos, target seems valid! (excect VCARD)