Code

Patch by John Faith: fixed crash resulting from inproperly initialized std::map