Merge pull request #7 from ridiekel/master

Single threaded queue for messages
Merge remote-tracking branch 'xhibit/master'
Added timeout