fixed chat
Merge branch 'james'