TGTrinity - Issue 58

Issue 58 1
Issue 58 2