ticket:1 modify func and unit tests
Merge branch 't1_contact'