Fixed #15
Merge branch 'develop-mators11' into develop