Added new Makefile to this branch as well.