MapEvent patch
Merge remote-tracking branch 'upstream/master'
Fixed stuff
Merge pull request #72 from brentspector/master

Fixed variable and string errors