Fixes #120
Fixes #114
Merge branch 'develop' of https://github.com/Particular/ServiceInsight into develop