Minor changes to Makefile
Merge pull request #1063 from jmaas/master

Minor changes to Makefile