mapping context
Merge pull request #26 from marqh/mapVocab

Map vocab