TC-1765 - api compatible with java 6
Merge pull request #277 from szprutamich/master

TC-1765 - api compatible with java 6