Merge branch 'develop' into feature/update-makefile
adding more descriptive help to makefile
Merge branch 'feature/update-makefile' into develop