RED-1955
Merge pull request #22 from bozba/patch-18

RED-1955