fixes for contacts
Merge pull request #71 from lvl0nax/contacts_fixes

Contacts fixes