Changed gem version, added timeouts