CDITCK-308
Merge pull request #4 from tremes/CDI-TCK-308

Merged, thanks!