fixing makefile
Merge branch 'master' into blog-examples