Testing branch.
Merge pull request #40 from santhnm2/map_gen

Testing branch.