Fixed compiler error.
Merge branch 'map_gen'