first commit
Merge remote branch 'template/master'
refine Makefile