#133 reduce impact of creating map instance during query execution
Merge remote-tracking branch 'origin/master'