ticket:9 makefile change 3
Merge remote-tracking branch 'remotes/origin/ticket_9'