Makefile fix
små fixes
små fixes
Merge branch 'devel'