Fixed logical bug in mapEquals method
Merge branch 'master' into develop