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