@override for implementations of IMap interface
Merge pull request #1384 from jerrinot/IMap-override

@override for implementations of IMap interface