Fixes #193, Fixes #194
Merge branch 'develop' of https://github.com/Particular/ServiceInsight into develop