Added additional contact info support
Merge branches 'master' and 'add-additional-contacts'