Fixed Jens's, compiling errors
Merge branch 'master' of github.com:/hansfilipelo/ChattY
Merge branch 'master' of github.com:/hansfilipelo/ChattY