Add contact / phone number handling code.
Merge remote-tracking branch 'origin/master'