Added Makefile changes from issue #52