Cleans up Makefile
Merge pull request #1747 from yurydelendik/makefile

Cleans up Makefile