Updated the Makefile such that it is more generic and easier to edit