Implemented handling of maps
Merged pull request #6