Merge pull request #61 from ryanlecompte/develop

issue #60: properly handle small Scala maps when registration is required