More general Makefile
Merge branch 'dev'