First implementation of map results. Missing test cases
Added test cases for map results and fixed bugs along the way
Merge branch 'mapResults' into devel