Updated to have working Makefile