Map objects
Merge pull request #1474 from wild-billy/map_objects

Map objects