[TIMOB-14806]
Merge pull request #7 from euforic/TIMOB-14806

[TIMOB-14806]