diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000..07dc608
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+github: [flok99]
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ff16393
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,43 @@
+# Courtesy github/gitignore
+
+# Prerequisites
+*.d
+
+# Object files
+*.o
+*.ko
+*.obj
+*.elf
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Libraries
+*.lib
+*.a
+*.la
+*.lo
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app
+*.i*86
+*.x86_64
+*.hex
+
+# Debug files
+*.dSYM/
+*.su
+*.o
+
+makefile.inc
+httping
+*.mo
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..0ac1f9c
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,9 @@
+from debian:stretch
+MAINTAINER ugurarpaci@gmail.com
+RUN apt-get update
+RUN apt-get install gcc make cmake gettext -y
+ADD . /opt/httping
+WORKDIR /opt/httping
+RUN make
+RUN mv httping /usr/local/bin && chmod +x /usr/local/bin/httping
+ENTRYPOINT ["httping"]
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..22fbe5d
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,339 @@
+GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    {description}
+    Copyright (C) {year}  {fullname}
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  {signature of Ty Coon}, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 46127f4..160cc17 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,9 @@ MKDIR=/bin/mkdir
 ARCHIVE=/bin/tar cf -
 COMPRESS=/bin/gzip -9
 
+ifneq ($(NO_GETTEXT),yes)
 TRANSLATIONS=nl.mo ru.mo
+endif
 
 OBJS=gen.o http.o io.o error.o utils.o main.o tcp.o res.o socks5.o kalman.o cookies.o help.o colors.o
 
@@ -118,10 +120,12 @@ install: $(TARGET) $(TRANSLATIONS)
 ifneq ($(DEBUG),yes)
 	$(STRIP) $(DESTDIR)/$(BINDIR)/$(TARGET)
 endif
+ifneq ($(NO_GETTEXT),yes)
 	mkdir -p $(DESTDIR)/$(PREFIX)/share/locale/nl/LC_MESSAGES
 	cp nl.mo $(DESTDIR)/$(PREFIX)/share/locale/nl/LC_MESSAGES/httping.mo
 	mkdir -p $(DESTDIR)/$(PREFIX)/share/locale/ru/LC_MESSAGES
 	cp ru.mo $(DESTDIR)/$(PREFIX)/share/locale/ru/LC_MESSAGES/httping.mo
+endif
 
 
 makefile.inc:
diff --git a/README b/README
new file mode 100644
index 0000000..de12f35
--- /dev/null
+++ b/README
@@ -0,0 +1,3 @@
+Folkert van Heusden
+folkert@vanheusden.com
+httping
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..914849d
--- /dev/null
+++ b/README.md
@@ -0,0 +1,9 @@
+httping
+=======
+
+Ping with HTTP requests, see http://www.vanheusden.com/httping/
+
+
+[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=flok&url=https://github.com/flok99/httping&title=httping&language=&tags=github&category=software)
+
+[![Support the development of this project](https://pledgie.com/campaigns/28612.png?skin_name=chrome)](https://pledgie.com/campaigns/28612)
diff --git a/changes b/changes
new file mode 100644
index 0000000..fd3202a
--- /dev/null
+++ b/changes
@@ -0,0 +1,2 @@
+- added OPTIONAL ncurses interface
+- added adaptive interval
diff --git a/cookies.c b/cookies.c
index 6597ceb..7c23441 100644
--- a/cookies.c
+++ b/cookies.c
@@ -1,5 +1,6 @@
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "utils.h"
 
diff --git a/debian/changelog b/debian/changelog
index 6352edc..9b7bc78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+httping (2.5+git20200730.1.fa72809-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Fri, 16 Apr 2021 09:52:39 -0000
+
 httping (2.5-5.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/error.c b/error.c
index acf78d6..b1fc801 100644
--- a/error.c
+++ b/error.c
@@ -11,6 +11,8 @@
 
 char last_error[4096] = { 0 };
 
+extern char json_output;
+
 void error_exit(char *format, ...)
 {
 	int e = errno;
@@ -20,6 +22,10 @@ void error_exit(char *format, ...)
 	(void)vfprintf(stderr, format, ap);
 	va_end(ap);
 
+	if (json_output) {
+	  printf("\n]\n");
+	}
+
 	fprintf(stderr, gettext("\n\nerrno=%d which means %s (if applicable)\n"), e, strerror(e));
 
 	exit(1);
diff --git a/example_show_json.php b/example_show_json.php
new file mode 100644
index 0000000..79faabd
--- /dev/null
+++ b/example_show_json.php
@@ -0,0 +1,40 @@
+<HTML>
+<BODY>
+<TABLE BORDER='1'>
+<TR><TH>sequence</TH><TH>data</TH></TR>
+<?
+	$handle = popen('./httping -c 3 www.google.com -F -M', 'r');
+	$read = '';
+	while($line = fgets($handle))
+		$read .= ' '.$line;
+	fclose($handle);
+
+	$fields = json_decode($read);
+
+	for($index=0; $index<count($fields); $index++)
+	{
+		?><TR><?
+		?><TD><? print $index + 1; ?></TD><?
+		?><TD><? ?></TD><?
+		?></TR><?
+
+		?><TR><?
+		?><TD><? ?></TD><?
+		?><TD><?
+			?><TABLE><?
+			?><TR><TH>key</TH><TH>value</TH></TR><?
+			foreach($fields[$index] as $key => $value)
+			{
+				?><TR><?
+				?><TD><? print $key; ?></TD><?
+				?><TD><? print $value; ?></TD><?
+				?></TR><?
+			}
+			?></TABLE><?
+		?></TD><?
+		?></TR><?
+	}
+?>
+</TABLE>
+</BODY>
+</HTML>
diff --git a/help.c b/help.c
index 84db8ed..1d97bb4 100644
--- a/help.c
+++ b/help.c
@@ -74,7 +74,7 @@ void new_version_alert(void)
 
 void version(void)
 {
-	fprintf(stderr, gettext("HTTPing v" VERSION ", (C) 2003-2016 folkert@vanheusden.com\n"));
+	fprintf(stderr, gettext("HTTPing v" VERSION ", (C) 2003-2017 folkert@vanheusden.com\n"));
 #ifndef NO_SSL
 	fprintf(stderr, gettext(" * SSL support included (-l)\n"));
 #endif
@@ -245,7 +245,7 @@ void usage(const char *me)
 	/* output settings */
 	fprintf(stderr, gettext(" *** output settings ***\n"));
 	format_help("-s", "--show-statuscodes", gettext("show statuscodes"));
-	format_help("-S", "--split-time", gettext("split measured time in its individual components (resolve, connect, send, etc."));
+	format_help("-S", "--split-time", gettext("split measured time in its individual components (resolve, connect, send, receive, disconnect)"));
 	format_help(NULL, "--threshold-red", gettext("from what ping value to show the value in red (must be bigger than yellow), only in color mode (-Y)"));
 	format_help(NULL, "--threshold-yellow", gettext("from what ping value to show the value in yellow"));
 	format_help(NULL, "--threshold-show", gettext("from what ping value to show the results"));
@@ -253,6 +253,7 @@ void usage(const char *me)
 	format_help(NULL, "--aggregate x[,y[,z]]", gettext("show an aggregate each x[/y[/z[/etc]]] seconds"));
 #ifndef NO_SSL
 	format_help("-z", "--show-fingerprint", gettext("show fingerprint (SSL)"));
+	format_help(NULL, "--ca-path", gettext("path to ca certificates (SSL)"));
 #endif
 	format_help("-v", NULL, gettext("verbose mode"));
 	fprintf(stderr, gettext("\n"));
@@ -274,7 +275,7 @@ void usage(const char *me)
 	format_help("-o rc,rc,...", "--ok-result-codes", gettext("what http results codes indicate 'ok' comma separated WITHOUT spaces inbetween default is 200, use with -e"));
 	format_help("-e x", "--result-string", gettext("string to display when http result code doesn't match"));
 	format_help("-n warn,crit", "--nagios-mode-1 / --nagios-mode-2", gettext("Nagios-mode: return 1 when avg. response time >= warn, 2 if >= crit, otherwhise return 0"));
-	format_help("-N x", NULL, gettext("Nagios mode 2: return 0 when all fine, 'x' when anything failes"));
+	format_help("-N x", NULL, gettext("Nagios mode 2: return 0 when all fine, 'x' when anything fails"));
 	format_help("-C cookie=value", "--cookie", gettext("add a cookie to the request"));
 	format_help("-Y", "--colors", gettext("add colors"));
 	format_help("-a", "--audible-ping", gettext("audible ping"));
diff --git a/httping.1 b/httping.1
index f35fce5..1e64896 100644
--- a/httping.1
+++ b/httping.1
@@ -106,7 +106,7 @@ Use a persistent connection, i.e. reuse the same TCP connection for multiple HTT
 Only resolve the hostname once: this takes the resolving out of the loop so that the latency of the DNS is not measured. Also useful when you want to measure only 1 webserver while the DNS returns a different ip-address for each resolve ('roundrobin').
 .TP
 .B "\-S"
-Split measured latency in time to connect and time to exchange a request with the HTTP server.
+Split measured latency in time to connect and time to exchange a request with the HTTP server. Split are returned in the following order: Resolve, Connect, Send, Receive, Disconnect.
 .TP
 .B "\-s"
 When a successfull transaction was done, show the HTTP statuscode (200, 404, etc.).
diff --git a/kalman.c b/kalman.c
index 766f1a7..41fdb4b 100644
--- a/kalman.c
+++ b/kalman.c
@@ -45,7 +45,7 @@ double kalman_do(double z_measured)
 
 #ifdef _TEST
 	printf("Ideal    position: %6.3f \n",z_real);
-	printf("Mesaured position: %6.3f [diff:%.3f]\n",z_measured,fabs(z_real-z_measured));
+	printf("Measured position: %6.3f [diff:%.3f]\n",z_measured,fabs(z_real-z_measured));
 	printf("Kalman   position: %6.3f [diff:%.3f]\n",x_est,fabs(z_real - x_est));
 #endif
 
diff --git a/main.c b/main.c
index ec455f1..972f22a 100644
--- a/main.c
+++ b/main.c
@@ -175,8 +175,10 @@ void emit_json(char ok, int seq, double start_ts, stats_t *t_resolve, stats_t *t
 		printf("\"connect_ms\" : \"%e\", ", t_connect -> cur);
 	else
 		printf("\"connect_ms\" : \"%e\", ",-1.0);
-	printf("\"request_ms\" : \"%e\", ", t_request -> cur);
-	printf("\"total_ms\" : \"%e\", ", t_total -> cur);
+	if (t_request != NULL)
+		printf("\"request_ms\" : \"%e\", ", t_request -> cur);
+	if (t_total != NULL)
+		printf("\"total_ms\" : \"%e\", ", t_total -> cur);
 	printf("\"http_code\" : \"%d\", ", http_code);
 	printf("\"msg\" : \"%s\", ", msg);
 	printf("\"header_size\" : \"%d\", ", header_size);
@@ -186,13 +188,15 @@ void emit_json(char ok, int seq, double start_ts, stats_t *t_resolve, stats_t *t
 	printf("\"ssl_fingerprint\" : \"%s\", ", ssl_fp ? ssl_fp : "");
 	printf("\"time_offset\" : \"%f\", ", toff_diff_ts);
 	printf("\"tfo_success\" : \"%s\", ", tfo_success ? "true" : "false");
-	if (t_ssl -> cur_valid)
+	if (t_ssl != NULL && t_ssl -> cur_valid)
 		printf("\"ssl_ms\" : \"%e\", ", t_ssl -> cur);
 	printf("\"tfo_succes\" : \"%s\", ", tfo_success ? "true" : "false");
 	if (t_ssl !=NULL && t_ssl -> cur_valid)
 		printf("\"ssl_ms\" : \"%e\", ", t_ssl -> cur);
-	printf("\"write\" : \"%e\", ", t_write -> cur);
-	printf("\"close\" : \"%e\", ", t_close -> cur);
+	if (t_write != NULL)
+		printf("\"write\" : \"%e\", ", t_write -> cur);
+	if (t_close != NULL)
+		printf("\"close\" : \"%e\", ", t_close -> cur);
 	printf("\"cookies\" : \"%d\", ", n_cookies);
 	if (stats_to != NULL && stats_to -> cur_valid)
 		printf("\"to\" : \"%e\", ", stats_to -> cur);
@@ -944,6 +948,7 @@ int main(int argc, char *argv[])
 #ifndef NO_SSL
 	SSL_CTX *client_ctx = NULL;
 #endif
+	const char *ca_path = NULL;
 	struct sockaddr_in6 addr;
 	struct addrinfo *ai = NULL, *ai_use = NULL;
 	struct addrinfo *ai_proxy = NULL, *ai_use_proxy = NULL;
@@ -1018,6 +1023,7 @@ int main(int argc, char *argv[])
 		{"priority", 1, NULL, 23 },
 		{"tos", 1, NULL, 24 },
 		{"header", 1, NULL, 25 },
+		{"ca-path", 1, NULL, 26 },
 #ifdef NC
 		{"ncurses",	0, NULL, 'K' },
 		{"gui",	0, NULL, 'K' },
@@ -1060,6 +1066,10 @@ int main(int argc, char *argv[])
 	{
 		switch(c)
 		{
+			case 26:
+				ca_path = optarg;
+				break;
+
 			case 25:
 				add_header(&additional_headers, &n_additional_headers, optarg);
 				break;
@@ -1478,7 +1488,7 @@ int main(int argc, char *argv[])
 #ifndef NO_SSL
 	if (use_ssl)
 	{
-		client_ctx = initialize_ctx(ask_compression);
+		client_ctx = initialize_ctx(ask_compression, ca_path);
 		if (!client_ctx)
 		{
 			set_error(gettext("problem creating SSL context"));
@@ -1743,7 +1753,6 @@ persistent_loop:
 
 			if (fd < 0)
 			{
-				emit_error(verbose, curncount, dstart);
 				fd = -1;
 			}
 
@@ -1759,7 +1768,7 @@ persistent_loop:
 #ifndef NO_SSL
 				if (use_ssl && ssl_h == NULL)
 				{
-					int rc = connect_ssl(fd, client_ctx, &ssl_h, &s_bio, timeout, &ssl_handshake);
+					int rc = connect_ssl(fd, client_ctx, &ssl_h, &s_bio, timeout, &ssl_handshake, hostname);
 					if (rc == 0)
 						update_statst(&t_ssl, ssl_handshake);
 					else
@@ -1819,7 +1828,7 @@ persistent_loop:
 			   e.g. until the transmitbuffers are empty and the data was
 			   sent to the next hop
 			 */
-#ifndef __CYGWIN__
+#ifdef linux
 			for(;;)
 			{
 				int bytes_left = 0;
@@ -1836,7 +1845,7 @@ persistent_loop:
 				 * I know of no other way to wait for the kernel to
 				 * finish the transmission
 				 */
-				usleep(write_sleep);
+				myusleep(write_sleep);
 			}
 #endif
 
@@ -2371,7 +2380,7 @@ persistent_loop:
 					cur_sleep = wait - interval_left;
 			}
 
-			usleep((useconds_t)(cur_sleep * 1000000.0));
+			myusleep((useconds_t)(cur_sleep * 1000000.0));
 		}
 
 		reset_statst_cur(&t_resolve);
diff --git a/mssl.c b/mssl.c
index fdcd410..df803fb 100644
--- a/mssl.c
+++ b/mssl.c
@@ -185,7 +185,7 @@ int WRITE_SSL(SSL *const ssl_h, const char *wherefrom, int len, const double tim
 	return cnt;
 }
 
-int connect_ssl(const int fd, SSL_CTX *const client_ctx, SSL **const ssl_h, BIO **const s_bio, const double timeout, double *const ssl_handshake)
+int connect_ssl(const int fd, SSL_CTX *const client_ctx, SSL **const ssl_h, BIO **const s_bio, const double timeout, double *const ssl_handshake, char *const hostname)
 {
 	double dstart = get_ts();
 	double end = get_ts() + timeout;
@@ -209,6 +209,10 @@ int connect_ssl(const int fd, SSL_CTX *const client_ctx, SSL **const ssl_h, BIO
 	}
 
 	*ssl_h = SSL_new(client_ctx);
+	SSL_set_tlsext_host_name(*ssl_h, hostname);
+
+	X509_VERIFY_PARAM *param = SSL_get0_param(*ssl_h);
+	X509_VERIFY_PARAM_set1_host(param, hostname, 0);
 
 	*s_bio = BIO_new_socket(fd, BIO_NOCLOSE);
 	SSL_set_bio(*ssl_h, *s_bio, *s_bio);
@@ -256,6 +260,16 @@ int connect_ssl(const int fd, SSL_CTX *const client_ctx, SSL **const ssl_h, BIO
 	}
 	while (!SSL_is_init_finished(*ssl_h) && !got_sigquit);
 
+	X509 *cert = SSL_get_peer_certificate(*ssl_h);
+	if (cert)
+		X509_free(cert);
+	else
+		set_error(gettext("SSL no peer certificate"));
+
+	long v = SSL_get_verify_result(*ssl_h);
+	if (v != X509_V_OK)
+		set_error(gettext("SSL certificate validation failed: %s"), X509_verify_cert_error_string(v));
+
 	if (got_sigquit)
 		return -1;
 
@@ -267,7 +281,7 @@ int connect_ssl(const int fd, SSL_CTX *const client_ctx, SSL **const ssl_h, BIO
 	return 0;
 }
 
-SSL_CTX * initialize_ctx(const char ask_compression)
+SSL_CTX * initialize_ctx(const char ask_compression, const char *ca_path)
 {
 	const SSL_METHOD *meth = NULL;
 	SSL_CTX *ctx = NULL;
@@ -286,6 +300,15 @@ SSL_CTX * initialize_ctx(const char ask_compression)
 	meth = SSLv23_method();
 	ctx = SSL_CTX_new(meth);
 
+	if (ca_path == NULL)
+#if defined(__NetBSD__)
+		ca_path = "/etc/openssl/certs";
+#else
+		ca_path = "/etc/ssl/certs";
+#endif
+
+	SSL_CTX_load_verify_locations(ctx, NULL, ca_path);
+
 #ifdef SSL_OP_NO_COMPRESSION
 	if (!ask_compression)
 		SSL_CTX_set_options(ctx, SSL_OP_NO_COMPRESSION);
diff --git a/mssl.h b/mssl.h
index 9abf72d..1f50fbc 100644
--- a/mssl.h
+++ b/mssl.h
@@ -9,7 +9,7 @@ void shutdown_ssl(void);
 int close_ssl_connection(SSL *const ssl_h);
 int READ_SSL(SSL *const ssl_h, char *whereto, int len, const double timeout);
 int WRITE_SSL(SSL *const ssl_h, const char *whereto, int len, const double timeout);
-int connect_ssl(const int fd, SSL_CTX *const client_ctx, SSL **const ssl_h, BIO **const s_bio, const double timeout, double *const ssl_handshake);
-SSL_CTX * initialize_ctx(const char ask_compression);
+int connect_ssl(const int fd, SSL_CTX *const client_ctx, SSL **const ssl_h, BIO **const s_bio, const double timeout, double *const ssl_handshake, char *const hostname);
+SSL_CTX * initialize_ctx(const char ask_compression, const char *ca_path);
 char * get_fingerprint(SSL *const ssl_h);
 int connect_ssl_proxy(const int fd, struct addrinfo *const ai, const double timeout, const char *const proxy_user, const char *const proxy_password, const char *const hostname, const int portnr, char *const tfo);
diff --git a/plot-json.py b/plot-json.py
new file mode 100755
index 0000000..082a69d
--- /dev/null
+++ b/plot-json.py
@@ -0,0 +1,78 @@
+#! /usr/bin/python
+
+import sys
+import json
+import os
+import math
+
+fin = sys.argv[1]
+
+print "Loading from %s" % (fin)
+
+fh = open(fin)
+json_data = json.load(fh)
+
+print "Number of rows: %d" % (len(json_data))
+
+fdata = fin + ".dat"
+print "Writing data to %s" % (fdata)
+
+data_fh = open(fdata, "w")
+
+host='?'
+
+total=0
+total_sd=0
+n=0
+avg=0
+sd=0
+minp = 999999999
+maxp = -minp
+
+for row in json_data:
+	if row['status'] == '1':
+		val = float(row['total_s'])
+		data_fh.write("%f %f\n" % (float(row['start_ts']), val))
+		host=row['host']
+		total += val
+		total_sd += val * val
+		n += 1
+		if val > maxp:
+			maxp = val
+		if val < minp:
+			minp = val
+
+print "Rows ignored: %d" % (len(json_data) - n)
+
+data_fh.close()
+
+if n > 0:
+	avg = total / n
+	sd = math.sqrt((total_sd / n) - math.pow(avg, 2.0))
+
+print "Average ping time: %fs (%d pings)" % (avg, n)
+print "Standard deviation: %fs" % (sd)
+print "Minimum ping value: %fs" % (minp)
+print "Maximum ping value: %fs" % (maxp)
+
+fscript = fin + ".sh"
+print "Writing script to %s" % (fscript)
+
+fpng = fin + ".png"
+
+script_fh = open(fscript, "w")
+
+script_fh.write("#! /bin/sh\n\n")
+script_fh.write("gnuplot <<EOF > " + fpng + "\n")
+script_fh.write("set term png size 800,600 tiny\n")
+script_fh.write("set autoscale\n")
+script_fh.write("set timefmt \"%s\"\n")
+script_fh.write("set xdata time\n")
+script_fh.write("set format x \"%H:%M:%S\"\n")
+script_fh.write("plot \"" + fdata + "\" using 1:2 with lines title \"" + host + "\"\n")
+script_fh.write("EOF\n")
+
+os.chmod(fscript, 0755)
+script_fh.close()
+
+print "Now invoke %s to generate %s" % (fscript, fpng)
diff --git a/utils.c b/utils.c
index 59cfc52..f2feb6e 100644
--- a/utils.c
+++ b/utils.c
@@ -115,3 +115,15 @@ char * format_value(double value, int digits_sig, int digits_nsig, char abbrevia
 
 	return out;
 }
+
+void myusleep(useconds_t v)
+{
+	int s = v / 1000000;
+
+	if (s)
+		sleep(s);
+
+	v %= 1000000;
+	if (v)
+		usleep(v);
+}
diff --git a/utils.h b/utils.h
index 97a33bb..0ea1137 100644
--- a/utils.h
+++ b/utils.h
@@ -15,3 +15,5 @@ char * format_value(double value, int digits_sig, int digits_nsig, char abbrevia
 
 #define min(x, y)	((x) < (y) ? (x) : (y))
 #define max(x, y)	((x) > (y) ? (x) : (y))
+
+void myusleep(useconds_t v);
diff --git a/valgrind.sh b/valgrind.sh
new file mode 100755
index 0000000..6bc2d23
--- /dev/null
+++ b/valgrind.sh
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+valgrind --show-reachable=yes --leak-check=full --read-var-info=yes --track-origins=yes --malloc-fill=93 --free-fill=b9 --error-limit=no ./httping --graph-limit 250 -K -i 0.1 -W --aggregate 3,5,7 -Q belle
diff --git a/version b/version
index 451b5b1..3ddc369 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-VERSION=2.5
+VERSION=2.6