pull upstream
Makefile now great, sub module patch fixed