Fixed timeout issue

Signed-off-by: Daniel Stone <dstone@viaresponse.com>
Merge pull request #7 from frodo2975/master

Fixed timeout issue
Bumped version to 0.0.7
Merge pull request #8 from martin-naumann/master

Bump version to 0.0.7
Merge remote-tracking branch 'upstream/master'