trader text
Merge branch 'tradertext'