updated makefile.
Merge remote-tracking branch 'template/master'
draft for -04