Fixed timeout behaviour
Added type signature to fix warning
Merge pull request #11 from Taneb/master

Fixed timeout behaviour