KRACOEUS-8557: sprint 11
Merge pull request #47 from leoherbie/KRACOEUS-8557

KRACOEUS-8557: sprint 11