Massive perforance improvements for very large mappings
Merge pull request #27 from topicusonderwijs/master

Massive perforance improvements for very large mappings