Added makefile to fortran directory
Merge branch 'develop'

Include revisions into master branch