Fix and improved
Merge branch 'master' of https://github.com/fanfank/Chatty

Conflicts:
	README.md
Fixed and improved