Added support for map. fixes #15