JBTM-1365. API changes
Merge pull request #6 from Gytis/5_BRANCH-JBTM-1365

JBTM-1365. API changes