Merging 42sh

The sample with patched Makefile.