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

[TIMOB-15300]