Tweaks to configurations and events.
Merge pull request #11 from WorldCretornica/Refactoring2

Tweaks to configurations and events.