Modified Makefile (see #3)

Some modifications from suggestions on PR #3