Fix makefile
Merge branch 'master' into develop
Update Makefile
Merge branch 'develop'