added Makefile
Merge branch 'master' into make