makefile
Merge remote-tracking branch 'remotes/origin/ticket_1'
ticket:1 settigs change