ticket:9 makefile change
Merge branch 'ticket_9'