Merge pull request #58 from drobbs/master

Fixed MapEvent stuff