Merge pull request #315 from treeowl/map-combination-update

Continue to improve map functions

Author: treeowl