Updated makefile.
Merge branch 'master' into gofer-0.77