Merge pull request #19 from PHP-Chat/1.1

Merge 1.1 with master