resolves #102
Merge remote-tracking branch 'origin/map' into map