Fixed make-diff
Merge branch 'master' of github.com:uprial/mine-ctrl-linux