Map fix for empty result set
Merge pull request #5 from darsadow/bugfix/empty-map-result

Map fix for empty result set