update makefile
Merge branch 'develop'
update makefile