Makefile: rev back to simonsj/v0-6-plus