new version
more reasonable timeout
be more liberal about converting database values into ruby
new version