Merge remote-tracking branch 'xhibit/master'
Added timeout
Merge pull request #9 from ridiekel/master

Added timeout