Merge pull request #1 from vlmiroshnikov/develop

Develop
Merge pull request #2 from vlmiroshnikov/develop

scalariform formatting
Merge pull request #3 from vlmiroshnikov/event_routing

Event routing