Fixed the build-tool (Makefile).
Merge remote-tracking branch 'origin/master'