Completed refactoring of event handling mechanism
Updated version to 2.0.0-SNAPSHOT