Avoiding contact duplication.
closes #14
closes #15