ticket:1 makefile fix
Merge branch 't1_contact'