Feature #55, added test
Merge branch 'feature-55' into develop