Updates makefile.
Prepares release.
Merge branch 'develop'