More robust maps specs
Merge pull request #83 from xzyfer/feat/nested-maps

More robust maps specs