implement timeouts
Merged Bart's pull request and updated Rakefile and bumped version
Ah, missed one in Rakefile.  Done.