Change Makefile and update submodule.
Merge master.