Makefile is being set up.
Basic makefile is working correctly.
Merge branch 'develop' into stable