Merge remote-tracking branch 'upstream/master'
Merge pull request #60 from aguibert/master

Super awesome bug fix
Merge remote-tracking branch 'upstream/master'
small chat update font
Merge pull request #61 from Hartman2/master

small chat multiple windows updated
Merge pull request #26 from BlueText/master

Merge from upstream