Merge branch 'master' into develop
Add makefiles
Merge branch 'develop'

Fixed makefile typo