Closed #32 Refactoring exception
Closed #101 Refactoring events