Fixed #113
Fixed #126, #127
Fixed #125
Fixed #122
Merge branch 'develop' of https://github.com/Particular/ServiceInsight into develop