KRACOEUS-8614: sprint 12
Merge pull request #21 from leoherbie/KRACOEUS-8614

KRACOEUS-8614: sprint 12