Experimental fix and added features.
Merge branch 'master' of https://github.com/HerobrinesArmy/ChatInterfaces