fix makefile error
Merge branch 'master' into Ben's-Branch