Added timestamp option
Merge branch 'master' of github.com:frymaster/ChatSuite.git