Added Makefile.
Merge branch 'feature-makefile' into develop