ticket:1 Makefile added
Merge branch 't1_contancts'