Updated to latest version, added Makefiles