fixed bug: was adding contact.canonical even when contact was null
added some checks
updated Jar-files and pad file