support for maps
Merge pull request #208 from dcy/master

support for maps