Merge pull request #62 from RedOrion/master

JT chat upgrades