ticket:10 tests pass
Merge branch 't10_contact'