added makefile
Merge branch 'master' into placeName-extension