Minor changes to makefile
Merge branch 'master' into better-branch