ticket:9 makefile new line
Merge remote-tracking branch 'remotes/origin/ticket_9'