Update Sample config and makefile