Merge pull request #9 from brentspector/master

Expanded MapEvent and Corrected Character/Test