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