Small refactorings done
Merge pull request #7 from Convey-Compliance/service-bus-build

Small refactorings done
Merge pull request #8 from Convey-Compliance/master

Bring development up to date