ticket:4 tests fail
ticket:4 tests pass
ticket:4 pep8 correction
Merge branch 't4_contact'