Makefile re-added after deletion.
Merge remote-tracking branch 'origin/master'