Proper fixes
Merge branch 'master' into mht_gameui
Merge pull request #38 from felamaslen/mht_gameui

should be fixed uiMessages