ticket:9 makefile change 2
Merge branch 'ticket_9'