updated makefile
Merge branch 'gkahn'