Improved makefile
Merge branch 'master' into Colin