Add makefile
Merge branch 'devel'