Feature map
Merge pull request #14 from vovka/feature/Map

Merged.