added stop timeout
removed extra )
added closing of message on second click for timeout messages
Fixed code style and merge conflicts
Merge branch 'willjk-master'