Fixed #101
Fixed #100
Fixed 99

Collision was fixed as part of fix for #100
Merge branch 'develop' of https://github.com/Particular/ServiceInsight into develop