diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index dbe3078..2a0c25b 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -10,6 +10,7 @@
           * on_new_stream - executes after a new stream is created
           * on_test_start - executes right before the test begins
           * on_test_finish - executes after the test is finished
+  * Added early support for verbose mode (-V)
 
 == iperf 3.0b2 2010-07-15 ==
 
diff --git a/src/Makefile.am b/src/Makefile.am
index d744e61..eb98078 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 lib_LIBRARIES           = libiperf.a                                    # Build and install a static iperf library
 bin_PROGRAMS            = iperf3                                        # Build and install an iperf binary
 noinst_PROGRAMS         = t_timer t_units t_uuid iperf3_profile         # Build, but don't install the test programs and a profiled version of iperf3
-include_HEADERS         = iperf_api.h iperf_server_api.h                # Defines the headers that get installed with the program
+include_HEADERS         = iperf_api.h iperf_error.h iperf_client_api.h iperf_server_api.h # Defines the headers that get installed with the program
 
 
 # Specify the source files and flags for the iperf library
@@ -11,6 +11,8 @@
                         iperf_api.h \
                         iperf_error.c \
                         iperf_error.h \
+						iperf_client_api.c \
+					    iperf_client_api.h \
                         iperf_server_api.c \
                         iperf_server_api.h \
                         iperf_tcp.c \
@@ -62,7 +64,7 @@
 # Specify the sources and various flags for the test cases
 t_timer_SOURCES         = t_timer.c
 t_timer_CFLAGS          = -g -Wall
-t_timer_LDFLAGS         =
+t_timer_LDFLAGS         = iperf_error.o
 t_timer_LDADD           = libiperf.a
 
 t_units_SOURCES         = t_units.c
diff --git a/src/Makefile.in b/src/Makefile.in
index 1fcca7e..b5072e2 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -63,10 +63,10 @@
 libiperf_a_AR = $(AR) $(ARFLAGS)
 libiperf_a_LIBADD =
 am_libiperf_a_OBJECTS = iperf_api.$(OBJEXT) iperf_error.$(OBJEXT) \
-	iperf_server_api.$(OBJEXT) iperf_tcp.$(OBJEXT) \
-	iperf_udp.$(OBJEXT) iperf_util.$(OBJEXT) locale.$(OBJEXT) \
-	net.$(OBJEXT) tcp_info.$(OBJEXT) tcp_window_size.$(OBJEXT) \
-	timer.$(OBJEXT) units.$(OBJEXT)
+	iperf_client_api.$(OBJEXT) iperf_server_api.$(OBJEXT) \
+	iperf_tcp.$(OBJEXT) iperf_udp.$(OBJEXT) iperf_util.$(OBJEXT) \
+	locale.$(OBJEXT) net.$(OBJEXT) tcp_info.$(OBJEXT) \
+	tcp_window_size.$(OBJEXT) timer.$(OBJEXT) units.$(OBJEXT)
 libiperf_a_OBJECTS = $(am_libiperf_a_OBJECTS)
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
@@ -78,6 +78,7 @@
 	$(iperf3_LDFLAGS) $(LDFLAGS) -o $@
 am__objects_1 = iperf3_profile-iperf_api.$(OBJEXT) \
 	iperf3_profile-iperf_error.$(OBJEXT) \
+	iperf3_profile-iperf_client_api.$(OBJEXT) \
 	iperf3_profile-iperf_server_api.$(OBJEXT) \
 	iperf3_profile-iperf_tcp.$(OBJEXT) \
 	iperf3_profile-iperf_udp.$(OBJEXT) \
@@ -246,7 +247,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 lib_LIBRARIES = libiperf.a                                    # Build and install a static iperf library
-include_HEADERS = iperf_api.h iperf_server_api.h                # Defines the headers that get installed with the program
+include_HEADERS = iperf_api.h iperf_error.h iperf_client_api.h iperf_server_api.h # Defines the headers that get installed with the program
 
 # Specify the source files and flags for the iperf library
 libiperf_a_SOURCES = \
@@ -255,6 +256,8 @@
                         iperf_api.h \
                         iperf_error.c \
                         iperf_error.h \
+						iperf_client_api.c \
+					    iperf_client_api.h \
                         iperf_server_api.c \
                         iperf_server_api.h \
                         iperf_tcp.c \
@@ -301,7 +304,7 @@
 # Specify the sources and various flags for the test cases
 t_timer_SOURCES = t_timer.c
 t_timer_CFLAGS = -g -Wall
-t_timer_LDFLAGS = 
+t_timer_LDFLAGS = iperf_error.o
 t_timer_LDADD = libiperf.a
 t_units_SOURCES = t_units.c
 t_units_CFLAGS = -g -Wall
@@ -455,6 +458,7 @@
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iperf3-main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iperf3_profile-iperf_api.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iperf3_profile-iperf_client_api.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iperf3_profile-iperf_error.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iperf3_profile-iperf_server_api.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iperf3_profile-iperf_tcp.Po@am__quote@
@@ -468,6 +472,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iperf3_profile-timer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iperf3_profile-units.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iperf_api.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iperf_client_api.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iperf_error.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iperf_server_api.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iperf_tcp.Po@am__quote@
@@ -560,6 +565,20 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(iperf3_profile_CFLAGS) $(CFLAGS) -c -o iperf3_profile-iperf_error.obj `if test -f 'iperf_error.c'; then $(CYGPATH_W) 'iperf_error.c'; else $(CYGPATH_W) '$(srcdir)/iperf_error.c'; fi`
 
+iperf3_profile-iperf_client_api.o: iperf_client_api.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(iperf3_profile_CFLAGS) $(CFLAGS) -MT iperf3_profile-iperf_client_api.o -MD -MP -MF $(DEPDIR)/iperf3_profile-iperf_client_api.Tpo -c -o iperf3_profile-iperf_client_api.o `test -f 'iperf_client_api.c' || echo '$(srcdir)/'`iperf_client_api.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/iperf3_profile-iperf_client_api.Tpo $(DEPDIR)/iperf3_profile-iperf_client_api.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iperf_client_api.c' object='iperf3_profile-iperf_client_api.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(iperf3_profile_CFLAGS) $(CFLAGS) -c -o iperf3_profile-iperf_client_api.o `test -f 'iperf_client_api.c' || echo '$(srcdir)/'`iperf_client_api.c
+
+iperf3_profile-iperf_client_api.obj: iperf_client_api.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(iperf3_profile_CFLAGS) $(CFLAGS) -MT iperf3_profile-iperf_client_api.obj -MD -MP -MF $(DEPDIR)/iperf3_profile-iperf_client_api.Tpo -c -o iperf3_profile-iperf_client_api.obj `if test -f 'iperf_client_api.c'; then $(CYGPATH_W) 'iperf_client_api.c'; else $(CYGPATH_W) '$(srcdir)/iperf_client_api.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/iperf3_profile-iperf_client_api.Tpo $(DEPDIR)/iperf3_profile-iperf_client_api.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iperf_client_api.c' object='iperf3_profile-iperf_client_api.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(iperf3_profile_CFLAGS) $(CFLAGS) -c -o iperf3_profile-iperf_client_api.obj `if test -f 'iperf_client_api.c'; then $(CYGPATH_W) 'iperf_client_api.c'; else $(CYGPATH_W) '$(srcdir)/iperf_client_api.c'; fi`
+
 iperf3_profile-iperf_server_api.o: iperf_server_api.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(iperf3_profile_CFLAGS) $(CFLAGS) -MT iperf3_profile-iperf_server_api.o -MD -MP -MF $(DEPDIR)/iperf3_profile-iperf_server_api.Tpo -c -o iperf3_profile-iperf_server_api.o `test -f 'iperf_server_api.c' || echo '$(srcdir)/'`iperf_server_api.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/iperf3_profile-iperf_server_api.Tpo $(DEPDIR)/iperf3_profile-iperf_server_api.Po