Merge pull request #116 from iParadigms/TRN-368

Trn 368
Merge branch 'master' into TRN-333