Added MapGenerator
Improved makefile