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