ticket:09 makefile 2
Merge remote-tracking branch 'remotes/origin/ticket_9'