Merge pull request #441 from kwolekr/mapgen_factories