Newest modification and slightly better makefile.
Amend this to the provious