diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d466e58
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,30 @@
+Makefile
+inc/
+.c
+ppport.h
+.*.sw[pon]
+*.bak
+*.old
+Build
+_build/
+xshelper.h
+META.yml
+MYMETA.yml
+.online
+blib/
+pm_to_blib
+Furl.bs
+xs/Furl.o
+xs/Furl.c
+nytprof*
+core
+perltidy.ERR
+MYMETA.json
+/Furl-*
+/.build
+/_build_params
+/Build
+!Build/
+!META.json
+/Build.bat
+!LICENSE
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..d34b5d8
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "picohttpparser"]
+	path = picohttpparser
+	url = http://github.com/kazuho/picohttpparser.git
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..ec8fa93
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,11 @@
+language: perl
+sudo: false
+perl:
+  - "5.12"
+  - "5.14"
+  - "5.16"
+  - "5.18"
+  - "5.20"
+  - "5.22"
+before_install:
+  - "cpanm -n --installdeps --with-develop --with-recommends --with-suggests ."
diff --git a/Changes b/Changes
index b6e26e0..7449fd5 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,7 @@
 Revision history for Perl module Furl
 
+{{$NEXT}}
+
 3.13 2017-09-19T06:31:34Z
 
     - Fixed test code(skaji++)
diff --git a/MANIFEST b/MANIFEST
deleted file mode 100644
index 4c573b8..0000000
--- a/MANIFEST
+++ /dev/null
@@ -1,93 +0,0 @@
-Build.PL
-Changes
-LICENSE
-META.json
-README.md
-TODO
-author/benchmark/byown.pl
-author/benchmark/note.mkdn
-author/benchmark/profile.pl
-author/benchmark/simple.pl
-author/mk-chunked-response.pl
-cpanfile
-example/get.pl
-lib/Furl.pm
-lib/Furl/ConnectionCache.pm
-lib/Furl/HTTP.pm
-lib/Furl/Headers.pm
-lib/Furl/Request.pm
-lib/Furl/Response.pm
-lib/Furl/ZlibStream.pm
-t/00_compile.t
-t/01_version.t
-t/100_low/01_simple.t
-t/100_low/03_redirect.t
-t/100_low/04_chunked.t
-t/100_low/05_slowloris.t
-t/100_low/06_errors.t
-t/100_low/07_timeout.t
-t/100_low/08_proxy.t
-t/100_low/09_body.t
-t/100_low/11_write_file.t
-t/100_low/12_write_code.t
-t/100_low/13_deflate.t
-t/100_low/15_multiline_header.t
-t/100_low/16_read_callback.t
-t/100_low/17_keep_alive.t
-t/100_low/18_no_proxy.t
-t/100_low/19_special_headers.t
-t/100_low/20_header_format_none.t
-t/100_low/21_keep_alive_timedout.t
-t/100_low/22_keep_alive.t
-t/100_low/22_keep_alive_http10.t
-t/100_low/23_redirect_relative.t
-t/100_low/24_no_content.t
-t/100_low/25_signal.t
-t/100_low/26_headers_only.t
-t/100_low/27_close_on_eof.t
-t/100_low/28_idn.t
-t/100_low/29_completion_slash.t
-t/100_low/30_user_agent.t
-t/100_low/31_chunked_unexpected_eof.t
-t/100_low/32_proxy_auth.t
-t/100_low/33_basic_auth.t
-t/100_low/34_keep_request.t
-t/100_low/35_get_address.t
-t/100_low/36_inactivity_timeout.t
-t/100_low/37_bad_content_length.t
-t/100_low/38_continue.t
-t/100_low/39_httpoxy.t
-t/300_high/01_simple.t
-t/300_high/02_agent.t
-t/300_high/04_http_request.t
-t/300_high/05_suppress_dup_host_header.t
-t/300_high/06_keep_request.t
-t/300_high/07_cookie.t
-t/300_high/99_error.t
-t/400_components/001_response-coding/01-file.t
-t/400_components/001_response-coding/t-euc-jp.html
-t/400_components/001_response-coding/t-iso-2022-jp.html
-t/400_components/001_response-coding/t-null.html
-t/400_components/001_response-coding/t-shiftjis.html
-t/400_components/001_response-coding/t-utf-8.html
-t/400_components/01_headers.t
-t/400_components/02_response.t
-t/400_components/03_request.t
-t/800_regression/01_capture_request.t
-t/999_intrenal/parse_url.t
-t/HTTPServer.pm
-t/Slowloris.pm
-t/Util.pm
-xt/02_perlcritic.t
-xt/04_leaktrace.t
-xt/05_valgrind.t
-xt/200_online/01_idn.t
-xt/200_online/02_google.t
-xt/200_online/03_yahoo_com.t
-xt/200_online/04_ssl.t
-xt/200_online/05_connect_error.t
-xt/200_online/06_net-dns-lite.t
-xt/200_online/07_ssl_shutdown.t
-xt/perlcriticrc
-META.yml
-MANIFEST
\ No newline at end of file
diff --git a/META.json b/META.json
index 934bd88..d4ff609 100644
--- a/META.json
+++ b/META.json
@@ -4,7 +4,7 @@
       "Tokuhiro Matsuno <tokuhirom@gmail.com>"
    ],
    "dynamic_config" : 0,
-   "generated_by" : "Minilla/v3.0.9",
+   "generated_by" : "Minilla/v3.0.9, CPAN::Meta::Converter version 2.150010",
    "license" : [
       "perl_5"
    ],
@@ -106,38 +106,14 @@
          }
       }
    },
-   "provides" : {
-      "Furl" : {
-         "file" : "lib/Furl.pm",
-         "version" : "3.13"
-      },
-      "Furl::ConnectionCache" : {
-         "file" : "lib/Furl/ConnectionCache.pm"
-      },
-      "Furl::HTTP" : {
-         "file" : "lib/Furl/HTTP.pm",
-         "version" : "3.13"
-      },
-      "Furl::Headers" : {
-         "file" : "lib/Furl/Headers.pm"
-      },
-      "Furl::Request" : {
-         "file" : "lib/Furl/Request.pm"
-      },
-      "Furl::Response" : {
-         "file" : "lib/Furl/Response.pm"
-      },
-      "Furl::ZlibStream" : {
-         "file" : "lib/Furl/ZlibStream.pm"
-      }
-   },
-   "release_status" : "stable",
+   "release_status" : "unstable",
    "resources" : {
       "bugtracker" : {
          "web" : "https://github.com/tokuhirom/Furl/issues"
       },
       "homepage" : "https://github.com/tokuhirom/Furl",
       "repository" : {
+         "type" : "git",
          "url" : "git://github.com/tokuhirom/Furl.git",
          "web" : "https://github.com/tokuhirom/Furl"
       }
diff --git a/META.yml b/META.yml
deleted file mode 100644
index 2557fe1..0000000
--- a/META.yml
+++ /dev/null
@@ -1,91 +0,0 @@
----
-abstract: 'Lightning-fast URL fetcher'
-author:
-  - 'Tokuhiro Matsuno <tokuhirom@gmail.com>'
-build_requires:
-  File::Temp: '0'
-  Test::More: '0.96'
-  Test::Requires: '0'
-  Test::TCP: '2.11'
-configure_requires:
-  Module::Build::Tiny: '0.035'
-dynamic_config: 0
-generated_by: 'Minilla/v3.0.9, CPAN::Meta::Converter version 2.150010'
-license: perl
-meta-spec:
-  url: http://module-build.sourceforge.net/META-spec-v1.4.html
-  version: '1.4'
-name: Furl
-no_index:
-  directory:
-    - t
-    - xt
-    - inc
-    - share
-    - eg
-    - examples
-    - author
-    - builder
-provides:
-  Furl:
-    file: lib/Furl.pm
-    version: '3.13'
-  Furl::ConnectionCache:
-    file: lib/Furl/ConnectionCache.pm
-  Furl::HTTP:
-    file: lib/Furl/HTTP.pm
-    version: '3.13'
-  Furl::Headers:
-    file: lib/Furl/Headers.pm
-  Furl::Request:
-    file: lib/Furl/Request.pm
-  Furl::Response:
-    file: lib/Furl/Response.pm
-  Furl::ZlibStream:
-    file: lib/Furl/ZlibStream.pm
-recommends:
-  Compress::Raw::Zlib: '0'
-  HTTP::CookieJar: '0'
-  IO::Socket::SSL: '0'
-  Net::IDN::Encode: '0'
-requires:
-  Class::Accessor::Lite: '0'
-  Encode: '0'
-  HTTP::Parser::XS: '0.11'
-  MIME::Base64: '0'
-  Mozilla::CA: '0'
-  Scalar::Util: '0'
-  Socket: '0'
-  Time::HiRes: '0'
-  perl: '5.008001'
-resources:
-  bugtracker: https://github.com/tokuhirom/Furl/issues
-  homepage: https://github.com/tokuhirom/Furl
-  repository: git://github.com/tokuhirom/Furl.git
-version: '3.13'
-x_contributors:
-  - 'Keiji, Yoshimi <walf443@gmail.com>'
-  - 'Fuji, Goro <gfuji@cpan.org>'
-  - 'lestrrat <lestrrat+github@gmail.com>'
-  - 'Audrey Tang <audreyt@audreyt.org>'
-  - 'Fuji Goro <fuji.goro@dena.jp>'
-  - 'Fuji, Goro <g.psy.va@gmail.com>'
-  - 's-aska <s.aska.org@gmail.com>'
-  - 'ikasam_a <masaki.nakagawa@gmail.com>'
-  - 'xaicron <xaicron@gmail.com>'
-  - 'Neil Bowers <neil@bowers.com>'
-  - 'Toshio Ito <debug.ito@gmail.com>'
-  - 'bayashi <bayashi@cpan.org>'
-  - 'Masahiro Nagano <kazeburo@gmail.com>'
-  - 'HIROSE Masaaki <hirose31@gmail.com>'
-  - 'Kazuho Oku <kazuhooku@gmail.com>'
-  - 'Jari Salmela <bissei@users.noreply.github.com>'
-  - 'tarao <tarao.gnn@gmail.com>'
-  - 'kimoto <peerler@gmail.com>'
-  - 'Breno G. de Oliveira <garu@cpan.org>'
-  - 'Jiro Nishiguchi <jiro@cpan.org>'
-  - 'Yasuhiro Matsumoto <mattn.jp@gmail.com>'
-  - 'Syohei YOSHIDA <syohex@gmail.com>'
-  - 'ktat <ktat.is@gmail.com>'
-  - 'Shoichi Kaji <skaji@cpan.org>'
-x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
diff --git a/README.md b/README.md
index 59c85c4..540ef1a 100644
--- a/README.md
+++ b/README.md
@@ -151,7 +151,7 @@ Loads proxy settings from `$ENV{HTTP_PROXY}` and `$ENV{NO_PROXY}`.
 
 - [IO::Socket::SSL](https://metacpan.org/pod/IO::Socket::SSL) preloading
 
-    Furl interprets the `timoeut` argument as the maximum time the module is permitted to spend before returning an error.
+    Furl interprets the `timeout` argument as the maximum time the module is permitted to spend before returning an error.
 
     The module also lazy-loads [IO::Socket::SSL](https://metacpan.org/pod/IO::Socket::SSL) when an HTTPS request is being issued for the first time. Loading the module usually takes ~0.1 seconds.
 
diff --git a/debian/changelog b/debian/changelog
index 426c05f..6fb4951 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libfurl-perl (3.13+git20180726.537c1e6-1) UNRELEASED; urgency=medium
+
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Sat, 28 Sep 2019 13:12:19 +0000
+
 libfurl-perl (3.13-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/1001_relax_timeout_errormsg.patch b/debian/patches/1001_relax_timeout_errormsg.patch
index cd8a002..f6b0c0c 100644
--- a/debian/patches/1001_relax_timeout_errormsg.patch
+++ b/debian/patches/1001_relax_timeout_errormsg.patch
@@ -3,9 +3,11 @@ Author: Jonas Smedegaard <dr@jones.dk>
 Last-Update: 2017-10-01
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/t/100_low/07_timeout.t
-+++ b/t/100_low/07_timeout.t
-@@ -73,7 +73,7 @@
+Index: libfurl-perl/t/100_low/07_timeout.t
+===================================================================
+--- libfurl-perl.orig/t/100_low/07_timeout.t
++++ libfurl-perl/t/100_low/07_timeout.t
+@@ -73,7 +73,7 @@ test_tcp(
                  $content_size_mb *= 2;
              }
              is $code, 500, "request()/$_";
diff --git a/debian/patches/1002_unset_http_proxy.patch b/debian/patches/1002_unset_http_proxy.patch
index ef611d3..9cad06f 100644
--- a/debian/patches/1002_unset_http_proxy.patch
+++ b/debian/patches/1002_unset_http_proxy.patch
@@ -3,9 +3,11 @@ Author: Jonas Smedegaard <dr@jones.dk>
 Last-Update: 2017-10-01
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/t/100_low/08_proxy.t
-+++ b/t/100_low/08_proxy.t
-@@ -104,6 +104,7 @@
+Index: libfurl-perl/t/100_low/08_proxy.t
+===================================================================
+--- libfurl-perl.orig/t/100_low/08_proxy.t
++++ libfurl-perl/t/100_low/08_proxy.t
+@@ -104,6 +104,7 @@ sub test_agent () {
  }
  
  local $ENV{'HTTP_PROXY'} = '';
@@ -13,9 +15,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  # Request target with non-default port
  
---- a/t/100_low/32_proxy_auth.t
-+++ b/t/100_low/32_proxy_auth.t
-@@ -23,6 +23,7 @@
+Index: libfurl-perl/t/100_low/32_proxy_auth.t
+===================================================================
+--- libfurl-perl.orig/t/100_low/32_proxy_auth.t
++++ libfurl-perl/t/100_low/32_proxy_auth.t
+@@ -23,6 +23,7 @@ my $verbose = 1;
  my $via = "VIA!VIA!VIA!";
  
  local $ENV{'HTTP_PROXY'} = '';
diff --git a/debian/patches/1003_proxy_localhost.patch b/debian/patches/1003_proxy_localhost.patch
index 8cd1e22..65d4390 100644
--- a/debian/patches/1003_proxy_localhost.patch
+++ b/debian/patches/1003_proxy_localhost.patch
@@ -16,9 +16,11 @@ Author: gregor herrmann <gregoa@debian.org>
 Last-Update: 2019-03-21
 Bug: https://github.com/tokuhirom/Furl/pull/116
 
---- a/t/100_low/08_proxy.t
-+++ b/t/100_low/08_proxy.t
-@@ -120,7 +120,7 @@
+Index: libfurl-perl/t/100_low/08_proxy.t
+===================================================================
+--- libfurl-perl.orig/t/100_low/08_proxy.t
++++ libfurl-perl/t/100_low/08_proxy.t
+@@ -120,7 +120,7 @@ test_tcp(
      },
      server => sub { # proxy server
          my $proxy_port = shift;
@@ -27,7 +29,7 @@ Bug: https://github.com/tokuhirom/Furl/pull/116
          $proxy->agent(test_agent);
          $proxy->start();
      },
-@@ -140,7 +140,7 @@
+@@ -140,7 +140,7 @@ test_tcp(
      },
      server => sub { # proxy server
          my $proxy_port = shift;
@@ -36,7 +38,7 @@ Bug: https://github.com/tokuhirom/Furl/pull/116
          $proxy->agent(test_agent);
          $proxy->agent->real_httpd_port($httpd->port);
          $proxy->start();
-@@ -183,7 +183,7 @@
+@@ -183,7 +183,7 @@ test_tcp(
      },
      server => sub { # proxy server
          my $proxy_port = shift;
@@ -45,9 +47,11 @@ Bug: https://github.com/tokuhirom/Furl/pull/116
          $proxy->start();
      },
  );
---- a/t/100_low/18_no_proxy.t
-+++ b/t/100_low/18_no_proxy.t
-@@ -70,7 +70,7 @@
+Index: libfurl-perl/t/100_low/18_no_proxy.t
+===================================================================
+--- libfurl-perl.orig/t/100_low/18_no_proxy.t
++++ libfurl-perl/t/100_low/18_no_proxy.t
+@@ -70,7 +70,7 @@ test_tcp(
      },
      server => sub { # proxy server
          my $proxy_port = shift;
@@ -56,9 +60,11 @@ Bug: https://github.com/tokuhirom/Furl/pull/116
          $proxy->start();
      },
  );
---- a/t/100_low/32_proxy_auth.t
-+++ b/t/100_low/32_proxy_auth.t
-@@ -79,7 +79,7 @@
+Index: libfurl-perl/t/100_low/32_proxy_auth.t
+===================================================================
+--- libfurl-perl.orig/t/100_low/32_proxy_auth.t
++++ libfurl-perl/t/100_low/32_proxy_auth.t
+@@ -79,7 +79,7 @@ test_tcp(
      },
      server => sub { # proxy server
          my $proxy_port = shift;
diff --git a/lib/Furl.pm b/lib/Furl.pm
index 8ed1b2d..b0da88b 100644
--- a/lib/Furl.pm
+++ b/lib/Furl.pm
@@ -301,7 +301,7 @@ Loads proxy settings from C<< $ENV{HTTP_PROXY} >> and C<< $ENV{NO_PROXY} >>.
 
 =item L<IO::Socket::SSL> preloading
 
-Furl interprets the C<timoeut> argument as the maximum time the module is permitted to spend before returning an error.
+Furl interprets the C<timeout> argument as the maximum time the module is permitted to spend before returning an error.
 
 The module also lazy-loads L<IO::Socket::SSL> when an HTTPS request is being issued for the first time. Loading the module usually takes ~0.1 seconds.