SPR-10710
Merge pull request #53 from peterdewachter/master

Project for SPR-10710