add sample, rename makefile
merge