Merge pull request #134 from dejan-brkic/master

Ebus configuration refactor