contacts - merge changes

Signed-off-by: Karel Kellner <karel@kellner.be>