Merge pull request #68 from santhnm2/map_gen

Fixed islands and merge conflicts.
Merge branch 'master' into map_gen