Improved Makefile
Merge branch 'tp'