The impl. and tests for TRN-336.
Merge pull request #114 from iParadigms/TRN-336

The impl. and tests for TRN-336.
Merge branch 'master' into TRN-368