ticket:1 makefile edit
Merge branch 't1_contact'