CLU-220 related
Merge pull request #204 from krzysiekbarca/master

CLU-220 related