Fixed #265. Fixed #266. Fixed #267.
Merge branch 'develop' of https://github.com/Particular/ServiceMatrix into develop