Cleans up Makefile and fixes #4