ticket:9 makefile change 1
Merge branch 'ticket_9'