diff -Naur ns-3.17/AUTHORS ns-3.18/AUTHORS
--- ns-3.17/AUTHORS	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/AUTHORS	2013-10-26 07:07:30.615364408 -0700
@@ -2,6 +2,7 @@
 Rohit Agarwal (mindprince@gmail.com)
 Kirill Andreev (andreev@iitp.ru)
 Dean Armstrong (deanarm@gmail.com)
+Ghada Badawy (gbadawy@gmail.com)
 Nicola Baldo (nbaldo@cttc.es)
 Mirko Banchi (mk.banchi@gmail.com)
 Peter D. Barnes, Jr. (barnes26@llnl.gov)
@@ -27,6 +28,7 @@
 Craig Dowell (craigdo@ee.washington.edu)
 Denis Fakhriev (fakhriev@iitp.ru)
 Jahanzeb Farooq (Jahanzeb.Farooq@inria.fr, Jahanzeb.Farooq@gmail.com)
+Pedro Fortuna (pedro.fortuna@inescporto.pt)
 Juliana Freitag Borin (juliana.freitag@gmail.com)
 Eric Gamess (egamess@gmail.com)
 Thomas Geithner (thomas.geithner@dai-labor.de)
diff -Naur ns-3.17/bindings/python/ns3modulegen_core_customizations.py ns-3.18/bindings/python/ns3modulegen_core_customizations.py
--- ns-3.17/bindings/python/ns3modulegen_core_customizations.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/bindings/python/ns3modulegen_core_customizations.py	2013-10-26 07:07:30.615364408 -0700
@@ -177,8 +177,11 @@
     }
     virtual ~%s()
     {
+        PyGILState_STATE __py_gil_state;
+        __py_gil_state = (PyEval_ThreadsInitialized() ? PyGILState_Ensure() : (PyGILState_STATE) 0);
         Py_DECREF(m_callback);
         m_callback = NULL;
+        PyGILState_Release(__py_gil_state);
     }
 
     virtual bool IsEqual(ns3::Ptr<const ns3::CallbackImplBase> other_base) const
diff -Naur ns-3.17/bindings/python/wscript ns-3.18/bindings/python/wscript
--- ns-3.17/bindings/python/wscript	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/bindings/python/wscript	2013-10-26 07:07:30.615364408 -0700
@@ -13,7 +13,7 @@
 # after = TaskGen.after
 
 ## https://launchpad.net/pybindgen/
-REQUIRED_PYBINDGEN_VERSION = (0, 16, 0, 825)
+REQUIRED_PYBINDGEN_VERSION = (0, 16, 0, 831)
 REQUIRED_PYGCCXML_VERSION = (0, 9, 5)
 
 
diff -Naur ns-3.17/CHANGES.html ns-3.18/CHANGES.html
--- ns-3.17/CHANGES.html	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/CHANGES.html	2013-10-26 07:07:30.611364407 -0700
@@ -51,6 +51,116 @@
 us a note on ns-developers mailing list.</p>
 
 <hr>
+<h1>Changes from ns-3.17 to ns-3.18</h1>
+
+<h2>New API:</h2>
+<ul>
+  <li>New features have been added to the LTE module:
+  <ul>
+    <li>PHY support for UE measurements (RSRP and RSRQ)</li>
+    <li>RRC support for UE measurements (configuration, execution, reporting)</li>
+    <li>Automatic Handover trigger based on RRC UE measurement reports</li>
+  </ul>
+  <li>Data collection components have been added in the 'src/stats' module.
+      Data collection includes a Probe class that attaches to ns-3 trace
+      sources to filter their output, and two Aggregator classes for 
+      marshaling probed data into text files or gnuplot plots.  The ns-3
+      tutorial has been extended to illustrate basic functionality. </li>
+  <li>In 'src/wifi', several changes were made to enable partial 802.11n support:
+    <ul>
+      <li>A new helper (HtWifiMacHelper) was added to set up a high throughput (HT) MAC entity</li>
+      <li>New attributes were added to help the user setup a high throughpt (HT) PHY entity. These attributes can be set using the YansWifiPhyHelper</li>
+      <li>A new standard value has been added that enables the new 11n data rates.</li>
+      <li>New 11n preambles has been added (Mixed format and greenfield). To be able to change Tx duration according to the preamble used, a new class TxVector has been added to carry the transmission parameters (mode, preamble, stbc,..).  Several functions have been updated to allow the passage of TxVector instead of WifiMode in MacLow, WifiRemoteStationManager, WifiPhy, YansWifiPhy,.. </li>
+      <li>A new information element has been added:  HTCapabilities. This information element is added to the MAC frame header if the node is an HT node. This HTCapabilites information element is used to advertise the HT capabilites of the node to other nodes in the network</li>
+    </ul>
+  <li>InternetStackHelper has two new functions:<tt>SetIpv4ArpJitter (bool enable)</tt>
+      and <tt>SetIpv6NsRsJitter (bool enable)</tt> to enable/disable
+      the random jitter on the tranmission of IPv4 ARP Request and IPv6 NS/RS. </li>
+  <li>Bounds on valid time inputs for time attributes can now be enabled.  
+      See <tt>attribute-test-suite.cc</tt> for an example.</li>
+  <li>New generic hash function interface provided in the simulation core.  
+      Two hash functions are provided: murmur3 (default), and the venerable 
+      FNV1a.  See the Hash Functions section in the ns-3 manual.</li>
+  <li>New Mac16Address has been added. It can be used with IPv6 to make
+      an Autoconfigured address.</li>
+  <li>Mac64Address support has been extended. It can now be used with 
+      IPv6 to make an Autoconfigured address.</li>
+  <li>IPv6 can now detect and use Path-MTU. See 
+      <tt>examples/ipv6/fragmentation-ipv6-two-MTU.cc</tt> for an example.</li>
+  <li>Radvd application has a new Helper. See the updated 
+      <tt>examples/ipv6/radvd.cc</tt> for an example.</li>
+</ul>
+
+<h2>Changes to existing API:</h2>
+<ul>
+  <li> The Ipv6InterfaceContainer functions to set a node in forwarding state (i.e., a router) 
+  and to install a default router in a group of nodes have been extensively changed.
+  The old function <tt>void Ipv6InterfaceContainer::SetRouter (uint32_t i, bool router)</tt>
+  is now DEPRECATED.
+  </li>
+  <li> The documentation's IPv6 addresses (2001:db8::/32, RFC 3849) are now
+  dropped by routers.
+  </li>
+  <li> The 'src/tools' module has been removed, and most files migrated to
+  'src/stats'.  For users of these programs (the statistics-processing 
+  in average.h, or the gnuplot support), the main change is likely to be
+  replacing the inclusion of "tools-module.h" with "stats-module.h".
+  Users of the event garbage collector, previously in tools, will now 
+  include it from the core module.
+  </li>
+  <li> The Ipv6 UnicastForwardCallback and  MulticastForwardCallback 
+  have a new parameter, the NetDevice the packet has been received from.
+  Existing Ipv6RoutingProtocols should update their RouteInput function
+  accordingly, e.g., from <tt>ucb (rtentry, p, header);</tt> to <tt>ucb (idev, rtentry, p, header);</tt>
+  </li>
+  <li> The previous buildings module relied on a specific MobilityModel called
+    BuildingsMobilityModel, which supported buildings but only allowed
+    static positions. This mobility model has been removed. Now, the
+    Buildings module instead relies on a new class called
+    MobilityBuildingInfo which can be aggregated to any MobilityModel. This
+    allows having moving nodes in presence of buildings with any of
+    the existing MobilityModels. 
+  </li>
+  <li>All functions in WifiRemoteStationManager named GetXxxMode have been changed to GetXxxTxVector </li>
+</ul>
+
+<h2>Changes to build system:</h2>
+<ul>
+  <li> Make references to bug id's in doxygen comments with
+    <tt>\bugid{num}</tt>, where <tt>num</tt> is the bug id number.  This
+    form will generate a link to the bug in the bug database.
+  </li>
+</ul>
+
+<h2>Changed behavior:</h2>
+<ul>
+  <li> Now it is possible to request printing command line arguments to the
+desired output stream using PrintHelp or operator &lt;&lt;
+<pre>
+  CommandLine cmd;
+  cmd.Parse (argc, argv);
+...
+
+  std::cerr << cmd;
+</pre>
+or
+<pre>
+  cmd.PrintHelp (std::cerr);
+</pre>
+  </li>
+  <li>Command line boolean arguments specified with no integer value (e.g. <tt>"--boolArg"</tt>) will toggle the value from the default, instead of always setting the value to true.
+  </li>
+  <li>IPv4's ARP Request and IPv6's NS/RS are now transmitted with a random delay.
+      The delay is, by default, a uniform random variable in time between 0 and 10ms.
+      This is aimed at preventing reception errors due to collisions during wifi broadcasts when the sending behavior is synchronized (e.g. due to applications starting at the same time on several different nodes).
+      This behaviour can be modified by using ArpL3Protocol's 
+      <tt>RequestJitter</tt> and Icmpv6L4Protocol's <tt>SolicitationJitter</tt>
+      attributes or by using the new InternetStackHelper functions.
+  </li>
+  <li>AODV Hellos are disabled by default. The performance with Hellos enabled and disabled are almost identical. With Hellos enabled, AODV will suppress hellos from transmission, if any recent broadcast such as RREQ was transmitted. The attribute <tt>ns3::aodv::RoutingProtocol::EnableHello</tt> can be used to enable/disable Hellos.
+</ul>
+
 <h1>Changes from ns-3.16 to ns-3.17</h1>
 
 <h2>New API:</h2>
diff -Naur ns-3.17/doc/doxygen.conf ns-3.18/doc/doxygen.conf
--- ns-3.17/doc/doxygen.conf	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/doxygen.conf	2013-10-26 07:07:29.443364378 -0700
@@ -193,9 +193,20 @@
 # will result in a user-defined paragraph with heading "Side Effects:".
 # You can put \n's in the value part of an alias to insert newlines.
 
-ALIASES                = \
-    "intern=\internal \par \b Internal:" \
-    "pname{1}=<span class=\"params\"><span class=\"paramname\">\1</span></span>"
+ALIASES                = 
+
+# Link to bug tracker
+ALIASES               += bugid{1}="<a href=\"http://www.nsnam.org/bugzilla/show_bug.cgi?id=\1\">Bug \1</a>"
+
+# Set off \internal docs
+ALIASES               += internal="\par \b Internal:"
+
+# Typeset parameter name in docs as in the "Parameters:" list
+# Usage:     /** \param [in/out] tag If found, \pname{tag} is ... */
+ALIASES               += pname{1}="<span class=\"params\"><span class=\"paramname\">\1</span></span>"
+
+# Link to RFC's
+ALIASES               += RFC{1}="<a href=\"http://datatracker.ietf.org/doc/rfc\1/\">RFC \1</a>"
 
 # This tag can be used to specify a number of word-keyword mappings (TCL only).
 # A mapping has the form "name=value". For example adding
@@ -285,7 +296,7 @@
 # member in the group (if any) for the other members of the group. By default
 # all members of a group must be documented explicitly.
 
-DISTRIBUTE_GROUP_DOC   = NO
+DISTRIBUTE_GROUP_DOC   = YES
 
 # Set the SUBGROUPING tag to YES (the default) to allow class member groups of
 # the same type (for instance a group of public functions) to be put as a
@@ -660,6 +671,7 @@
 INPUT                  = doc/modules \
                          doc/main.h \
                          doc/introspected-doxygen.h \
+                         examples \
                          utils \
                          src
 
@@ -727,14 +739,18 @@
 
 EXAMPLE_PATH           = src/aodv/examples \
                          src/bridge/examples \
+                         src/brite/examples \
+                         src/buildings/examples \
                          src/click/examples \
                          src/config-store/examples \
                          src/core/examples \
                          src/csma/examples \
                          src/csma-layout/examples \
                          src/dsdv/examples \
+                         src/dsr/examples \
                          src/emu/examples \
                          src/energy/examples \
+                         src/fd-net-device/examples \
                          src/flow-monitor/examples \
                          src/internet/examples \
                          src/lte/examples \
@@ -749,8 +765,8 @@
                          src/point-to-point/examples \
                          src/propagation/examples \
                          src/spectrum/examples \
+                         src/stats/examples \
                          src/tap-bridge/examples \
-                         src/tools/examples \
                          src/topology-read/examples \
                          src/uan/examples \
                          src/virtual-net-device/examples \
@@ -777,7 +793,12 @@
 # the \image command).
 
 IMAGE_PATH             = doc/ns3_html_theme/static \
-                         src/mesh/doc/
+                         src/lte/doc/source/figures \
+                         src/lte/test/reference \
+                         src/mesh/doc \
+                         src/netanim/doc/figures \
+                         src/stats/doc \
+                         src/visualizer/visualizer/resource
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
diff -Naur ns-3.17/doc/doxygen.warnings.report.sh ns-3.18/doc/doxygen.warnings.report.sh
--- ns-3.17/doc/doxygen.warnings.report.sh	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/doxygen.warnings.report.sh	2013-10-26 07:07:29.451364379 -0700
@@ -2,7 +2,7 @@
 
 # Process doxygen.warnings.log to generate sorted list of top offenders
 
-# Flag to skip running doxygen
+# Flag to skip the build and running doxygen, and just analyze the log
 skipdoxy=${1:-""}
 
 DIR=`dirname $0`
@@ -16,6 +16,9 @@
 
 if [ "$skipdoxy" == "" ]; then
 
+    # Run introspection, which may require a build
+    cd $(hg root) && ./waf --run print-introspected-doxygen >doc/introspected-doxygen.h
+
     conf=$DIR/doxygen.conf
 
     sed -i.bak -E '/^EXTRACT_ALL |^HAVE_DOT |^WARNINGS /s/YES/no/' $conf
@@ -91,6 +94,9 @@
     sort -k 2               \
     )
 
+# Sorted by number, decreasing
+undocsort=$(echo "$undocfiles" | sort -r )
+
 # Total number of files
 filecount=$(                        \
     echo "$undocfiles"            | \
@@ -117,7 +123,7 @@
 printf "%6d directories with warnings\n" $modcount
 echo
 echo
-echo "Warnings by file"
+echo "Warnings by file (alphabetical)"
 echo
 echo "Count File" 
 echo "----- ----------------------------------"
@@ -126,8 +132,19 @@
 printf "%6d files with warnings\n" $filecount
 echo
 echo
+echo "Warnings by file (numerical)"
+echo
+echo "Count File" 
+echo "----- ----------------------------------"
+echo "$undocsort"
+echo "----------------------------------------"
+printf "%6d files with warnings\n" $filecount
+echo
+echo
 echo "Doxygen Warnings Summary"
 echo "----------------------------------------"
 printf "%6d directories\n" $modcount
 printf "%6d files\n" $filecount
 printf "%6d warnings\n" $warncount
+
+
diff -Naur ns-3.17/doc/main.h ns-3.18/doc/main.h
--- ns-3.17/doc/main.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/main.h	2013-10-26 07:07:29.471364379 -0700
@@ -57,7 +57,6 @@
  *     - stats
  *     - tap-bridge
  *     - test
- *     - tools
  *     - topology-read
  *     - uan
  *     - virtual-net-device
diff -Naur ns-3.17/doc/manual/Makefile ns-3.18/doc/manual/Makefile
--- ns-3.17/doc/manual/Makefile	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/manual/Makefile	2013-10-26 07:07:29.455364378 -0700
@@ -2,38 +2,99 @@
 DIA = dia
 CONVERT = convert
 
-FIGURES = figures
-VPATH = $(FIGURES)
+SRC = ../../src
+# Temporary source directory, for build
+SOURCETEMP = source-temp
+FIGURES = $(SOURCETEMP)/figures
+#VPATH = $(FIGURES)
+
+# list all manual .rst files that need to be copied to $SOURCETEMP
+SOURCES = \
+	source/conf.py \
+	source/_static \
+	source/index.rst \
+	source/replace.txt \
+	source/attributes.rst \
+	source/callbacks.rst \
+	source/enable-modules.rst \
+	source/enable-tests.rst \
+	source/events.rst \
+	source/gnuplot.rst \
+	source/hash-functions.rst \
+	source/helpers.rst \
+	source/how-to-write-tests.rst \
+	source/logging.rst \
+	source/new-models.rst \
+	source/new-modules.rst \
+	source/object-model.rst \
+	source/object-names.rst \
+	source/organization.rst \
+	source/python.rst \
+	source/random-variables.rst \
+	source/realtime.rst \
+	source/support.rst \
+	source/test-background.rst \
+	source/test-framework.rst \
+	source/test-overview.rst \
+	source/tests.rst \
+	source/tracing.rst \
+	source/troubleshoot.rst \
+	${SRC}/stats/doc/data-collection.rst \
+	${SRC}/stats/doc/data-collection-overview.rst \
+	${SRC}/stats/doc/statistics.rst \
+	${SRC}/stats/doc/data-collection-helpers.rst \
+	${SRC}/stats/doc/probe.rst \
+	${SRC}/stats/doc/collector.rst \
+	${SRC}/stats/doc/aggregator.rst \
+	${SRC}/stats/doc/adaptor.rst \
+	${SRC}/stats/doc/scope-and-limitations.rst \
+
+# list all manual figure files that need to be copied to 
+# $SOURCETEMP/figures.  For each figure to be included in all
+# documentation formats (html, latex...) the following formats are supported: 
+#  1) a single .dia file (preferred option, because it can be edited)
+#  2) a single .eps file
+#  3) both a .pdf and .png file
+
+SOURCEFIGS = \
+        figures/software-organization.dia \
+	figures/plot-2d.png \
+	figures/plot-2d-with-error-bars.png \
+	figures/plot-3d.png \
+	${SRC}/stats/doc/Stat-framework-arch.png \
+	${SRC}/stats/doc/Wifi-default.png \
+	${SRC}/stats/doc/dcf-overview.dia \
+	${SRC}/stats/doc/dcf-overview-with-aggregation.dia \
+	${SRC}/stats/doc/gnuplot-example.png \
+	${SRC}/stats/doc/file-example.png \
+	${SRC}/stats/doc/seventh-packet-byte-count.png \
+	${SRC}/stats/doc/gnuplot-helper-example.png \
+	${SRC}/stats/doc/gnuplot-aggregator.png \
 
+# specify figures from which .png and .pdf figures need to be
+# generated (all dia and eps figures)
 IMAGES_EPS = \
 	$(FIGURES)/software-organization.eps \
+	$(FIGURES)/dcf-overview.eps \
+	$(FIGURES)/dcf-overview-with-aggregation.eps \
 
 # rescale pdf figures as necessary
 $(FIGURES)/software-organization.pdf_width = 5in
 
-# Do not delete/clean these png images upon make clean
-IMAGES_PNG_SAVED = \
-	$(FIGURES)/plot-2d.png \
-	$(FIGURES)/plot-2d-with-error-bars.png \
-	$(FIGURES)/plot-3d.png \
-
-IMAGES_PNG_CONVERTED = \
-	${IMAGES_EPS:.eps=.png}
-
-IMAGES_PNG = $(IMAGES_PNG_SAVED) $(IMAGES_PNG_CONVERTED)
+IMAGES_PNG = $(IMAGES_EPS:.eps=.png)
 
 IMAGES_PDF = ${IMAGES_EPS:.eps=.pdf}
 
 IMAGES = $(IMAGES_EPS) $(IMAGES_PNG) $(IMAGES_PDF)
 
-IMAGES_TO_CLEAN = $(IMAGES_PNG_CONVERTED) $(IMAGES_PDF) $(IMAGES_EPS)
+RESCALE = $(shell hg root)/utils/rescale-pdf.sh
 
 %.eps : %.dia; $(DIA) -t eps $< -e $@
 %.png : %.dia; $(DIA) -t png $< -e $@
 %.png : %.eps; $(CONVERT) $< $@
 %.pdf : %.eps;
 	$(EPSTOPDF) $< -o=$@
-	if test x$($@_width) != x; then ./rescale-pdf.sh $($@_width) $@ ; fi
+	if test x$($@_width) != x; then $(RESCALE) $($@_width) $@ ; fi
 
 
 # You can set these variables from the command line.
@@ -45,7 +106,7 @@
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
 PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(SOURCETEMP)
 
 .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest
 
@@ -70,47 +131,54 @@
 	@echo "  linkcheck  to check all external links for integrity"
 	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
 
+copy-sources:  $(SOURCES)
+	@rm -rf $(SOURCETEMP)
+	@mkdir -p $(SOURCETEMP) 
+	@mkdir -p $(FIGURES) 
+	@cp -r $(SOURCES) $(SOURCETEMP)
+	@cp -r $(SOURCEFIGS) $(FIGURES)
+
 clean:
 	-rm -rf $(BUILDDIR)
-	-rm -rf $(IMAGES_TO_CLEAN)
+	-rm -rf $(SOURCETEMP)
 
 frag: pickle
 	@if test ! -d $(BUILDDIR)/frag; then mkdir $(BUILDDIR)/frag; fi
 	pushd $(BUILDDIR)/frag && ../../pickle-to-xml.py ../pickle/index.fpickle  > navigation.xml && popd
 	cp -r $(BUILDDIR)/pickle/_images $(BUILDDIR)/frag
 
-html: $(IMAGES)
+html: copy-sources $(IMAGES)
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
 
-dirhtml: $(IMAGES)
+dirhtml: copy-sources $(IMAGES)
 	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
 
-singlehtml: $(IMAGES)
+singlehtml: copy-sources $(IMAGES)
 	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
 	@echo
 	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
 
-pickle: $(IMAGES)
+pickle: copy-sources $(IMAGES)
 	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
 	@echo
 	@echo "Build finished; now you can process the pickle files."
 
-json: $(IMAGES)
+json: copy-sources $(IMAGES)
 	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
 	@echo
 	@echo "Build finished; now you can process the JSON files."
 
-htmlhelp: $(IMAGES)
+htmlhelp: copy-sources $(IMAGES)
 	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
 	@echo
 	@echo "Build finished; now you can run HTML Help Workshop with the" \
 	      ".hhp project file in $(BUILDDIR)/htmlhelp."
 
-qthelp: $(IMAGES)
+qthelp: copy-sources $(IMAGES)
 	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
 	@echo
 	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
@@ -119,7 +187,7 @@
 	@echo "To view the help file:"
 	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/ns-3.qhc"
 
-devhelp: $(IMAGES)
+devhelp: copy-sources $(IMAGES)
 	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
 	@echo
 	@echo "Build finished."
@@ -128,46 +196,46 @@
 	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/ns-3"
 	@echo "# devhelp"
 
-epub: $(IMAGES)
+epub: copy-sources $(IMAGES)
 	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
 	@echo
 	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
 
-latex: $(IMAGES)
+latex: copy-sources $(IMAGES)
 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
 	@echo
 	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
 	@echo "Run \`make' in that directory to run these through (pdf)latex" \
 	      "(use \`make latexpdf' here to do that automatically)."
 
-latexpdf: $(IMAGES)
+latexpdf: copy-sources $(IMAGES)
 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
 	@echo "Running LaTeX files through pdflatex..."
 	make -C $(BUILDDIR)/latex all-pdf
 	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
 
-text: $(IMAGES)
+text: copy-sources $(IMAGES)
 	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
 	@echo
 	@echo "Build finished. The text files are in $(BUILDDIR)/text."
 
-man: $(IMAGES)
+man: copy-sources $(IMAGES)
 	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
 	@echo
 	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
 
-changes: $(IMAGES)
+changes: copy-sources $(IMAGES)
 	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
 	@echo
 	@echo "The overview file is in $(BUILDDIR)/changes."
 
-linkcheck: $(IMAGEs)
+linkcheck: copy-sources $(IMAGES)
 	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
 	@echo
 	@echo "Link check complete; look for any errors in the above output " \
 	      "or in $(BUILDDIR)/linkcheck/output.txt."
 
-doctest: $(IMAGES)
+doctest: copy-sources $(IMAGES)
 	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
 	@echo "Testing of doctests in the sources finished, look at the " \
 	      "results in $(BUILDDIR)/doctest/output.txt."
diff -Naur ns-3.17/doc/manual/rescale-pdf.sh ns-3.18/doc/manual/rescale-pdf.sh
--- ns-3.17/doc/manual/rescale-pdf.sh	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/manual/rescale-pdf.sh	1969-12-31 16:00:00.000000000 -0800
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-TMPDIR=/tmp
-
-TMPFILE=`mktemp`
-
-echo "\documentclass{book}
-\usepackage{pdfpages}
-\begin{document}
-\includepdf[width=${1},fitpaper]{${2}}
-\end{document}" >${TMPFILE}.tex
-pdflatex -output-directory /tmp ${TMPFILE}.tex >/dev/null 2>/dev/null
-cp ${TMPFILE}.pdf ${2}
-rm -f ${TMPFILE}{,.{tex,aux,log,pdf}}
diff -Naur ns-3.17/doc/manual/source/attributes.rst ns-3.18/doc/manual/source/attributes.rst
--- ns-3.17/doc/manual/source/attributes.rst	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/manual/source/attributes.rst	2013-10-26 07:07:29.455364378 -0700
@@ -1,4 +1,6 @@
 .. include:: replace.txt
+.. highlight:: cpp
+
 
 .. _Attributes:
 
@@ -405,7 +407,9 @@
 Another way to get at the attribute is to use the object name service facility.
 Here, this attribute is found using a name string. This approach is useful if
 one doesn't have access to the underlying pointers and it is difficult to
-determine the required concrete configuration namespaced path.::
+determine the required concrete configuration namespaced path.
+
+::
 
     Names::Add ("server", serverNode);
     Names::Add ("server/eth0", serverDevice);
@@ -414,7 +418,7 @@
 
     Config::Set ("/Names/server/eth0/TxQueue/MaxPackets", UintegerValue (25));
 
-:ref:`Object-names` for a fuller treatment of the |ns3| configuration namespace.
+See :ref:`Object-names` for a fuller treatment of the |ns3| configuration namespace.
 
 Setting through constructors helper classes
 +++++++++++++++++++++++++++++++++++++++++++
@@ -426,7 +430,7 @@
 
 or from the higher-level helper APIs, such as:::
 
-    mobility.SetPositionAllocator ("GridPositionAllocator",
+    mobility.SetPositionAllocator ("ns3::GridPositionAllocator",
                                    "MinX", DoubleValue (-100.0),
                                    "MinY", DoubleValue (-100.0),
                                    "DeltaX", DoubleValue (5.0),
@@ -737,7 +741,9 @@
     
       Simulator::Destroy ();
     
-After running, you can open the output-attributes.txt file and see:::
+After running, you can open the output-attributes.txt file and see:
+
+.. sourcecode:: text
 
     default ns3::RealtimeSimulatorImpl::SynchronizationMode "BestEffort"
     default ns3::RealtimeSimulatorImpl::HardLimit "+100000000.0ns"
@@ -769,7 +775,9 @@
 in the configuration namespace is shown.  In a real ns-3 program, many
 more models, attributes, and defaults would be shown.
 
-An XML version also exists in ``output-attributes.xml``:::
+An XML version also exists in ``output-attributes.xml``:
+
+.. sourcecode:: xml
 
     <?xml version="1.0" encoding="UTF-8"?>
     <ns3>
@@ -858,13 +866,17 @@
 presentation.
 
 To use this feature, one must install libgtk and libgtk-dev; an example
-Ubuntu installation command is:::
+Ubuntu installation command is:
 
-  sudo apt-get install libgtk2.0-0 libgtk2.0-dev
+.. sourcecode:: bash
 
-To check whether it is configured or not, check the output of the step:::
+  $ sudo apt-get install libgtk2.0-0 libgtk2.0-dev
 
-  ./waf configure --enable-examples --enable-tests
+To check whether it is configured or not, check the output of the step:
+
+.. sourcecode:: bash
+
+  $ ./waf configure --enable-examples --enable-tests
 
   ---- Summary of optional NS-3 features:
   Python Bindings               : enabled
@@ -873,10 +885,12 @@
   GtkConfigStore                : not enabled (library 'gtk+-2.0 >= 2.12' not found)
 
 In the above example, it was not enabled, so it cannot be used until a suitable
-version is installed and::
+version is installed and:
 
-  ./waf configure --enable-examples --enable-tests
-  ./waf
+.. sourcecode:: bash
+
+  $ ./waf configure --enable-examples --enable-tests
+  $ ./waf
 
 is rerun.
 
@@ -895,6 +909,7 @@
 Future work
 +++++++++++
 There are a couple of possible improvements:
+
 * save a unique version number with date and time at start of file
 * save rng initial seed somewhere.
 * make each RandomVariable serialize its own initial seed and re-read it later
diff -Naur ns-3.17/doc/manual/source/callbacks.rst ns-3.18/doc/manual/source/callbacks.rst
--- ns-3.17/doc/manual/source/callbacks.rst	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/manual/source/callbacks.rst	2013-10-26 07:07:29.455364378 -0700
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight:: cpp
 
 Callbacks
 ---------
@@ -364,11 +365,11 @@
 callback-- this is important.  We can pass in any such properly-typed function 
 to this callback.  Let's look at this more closely::
 
-  static double CbOne (double a, double b) {}
-            ^           ^          ^
-            |        ---|    ------|
-            |        |       | 
-  Callback<double, double, double> one;
+  static   double CbOne (double a, double b) {}
+             ^             ^         ^
+             |             |         |
+             |             |         | 
+  Callback<double,       double,   double> one;
 
 You can only bind a function to a callback if they have the matching signature.
 The first template argument is the return type, and the additional template 
@@ -537,6 +538,30 @@
 
   (*m_p.*m_pmi)(m_boundArg, arg);
 
+It's possible to bind two or three arguments as well.  Say we have a function with
+signature::
+
+  static void NotifyEvent (Ptr<A> a, Ptr<B> b, MyEventType e);
+
+One can create bound callback binding first two arguments like::
+
+  MakeBoundCallback (&NotifyEvent, a1, b1);
+
+assuming `a1` and `b1` are objects of type `A` and `B` respectively.  Similarly for
+three arguments one would have function with a signature::
+
+  static void NotifyEvent (Ptr<A> a, Ptr<B> b, MyEventType e);
+
+Binding three arguments in done with::
+
+  MakeBoundCallback (&NotifyEvent, a1, b1, c1);
+
+again assuming `a1`, `b1` and `c1` are objects of type `A`, `B` and `C` respectively.
+
+This kind of binding can be used for exchanging information between objects in
+simulation; specifically, bound callbacks can be used as traced callbacks, which will
+be described in the next section.
+
 Traced Callbacks
 ****************
 *Placeholder subsection*
diff -Naur ns-3.17/doc/manual/source/conf.py ns-3.18/doc/manual/source/conf.py
--- ns-3.17/doc/manual/source/conf.py	2013-05-14 07:35:20.000000000 -0700
+++ ns-3.18/doc/manual/source/conf.py	2013-10-26 07:07:29.459364378 -0700
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = 'ns-3.17'
+version = 'ns-3.18'
 # The full version, including alpha/beta/rc tags.
-release = 'ns-3.17'
+release = 'ns-3.18'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -197,7 +197,7 @@
 #latex_show_urls = False
 
 # Additional stuff for the LaTeX preamble.
-#latex_preamble = ''
+latex_preamble = '\usepackage{amssymb}'
 
 # Documents to append as an appendix to all manuals.
 #latex_appendices = []
diff -Naur ns-3.17/doc/manual/source/enable-modules.rst ns-3.18/doc/manual/source/enable-modules.rst
--- ns-3.17/doc/manual/source/enable-modules.rst	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/manual/source/enable-modules.rst	2013-10-26 07:07:29.459364378 -0700
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight:: bash
 
 Enabling Subsets of |ns3| Modules
 ---------------------------------
@@ -10,11 +11,15 @@
 How to enable a subset of |ns3|'s modules
 *****************************************
 
-If shared libraries are being built, then enabling a module will cause at least one library to be built: ::
+If shared libraries are being built, then enabling a module will cause at least one library to be built:
+
+.. sourcecode:: text
 
   libns3-modulename.so
 
-If the module has a test library and test libraries are being built, then ::
+If the module has a test library and test libraries are being built, then
+
+.. sourcecode:: text
 
   libns3-modulename-test.so
 
@@ -31,29 +36,37 @@
 To enable only the core module with example and tests, for example,
 try these commands: ::
 
-  ./waf clean
-  ./waf configure --enable-examples --enable-tests --enable-modules=core
-  ./waf build
-  cd build/debug/
-  ls
+  $ ./waf clean
+  $ ./waf configure --enable-examples --enable-tests --enable-modules=core
+  $ ./waf build
+  $ cd build/debug/
+  $ ls
+
+and the following libraries should be present:
 
-and the following libraries should be present: ::
+.. sourcecode:: text
 
   bindings  libns3-core.so       ns3      scratch  utils
   examples  libns3-core-test.so  samples  src
 
 Note the ``./waf clean`` step is done here only to make it more obvious which module libraries were built.  You don't have to do ``./waf clean`` in order to enable subsets of modules.
 
-Running test.py will cause only those tests that depend on module core to be run: ::
+Running test.py will cause only those tests that depend on module core to be run:
  
+.. sourcecode:: text
+
   24 of 24 tests passed (24 passed, 0 skipped, 0 failed, 0 crashed, 0 valgrind errors)
 
-Repeat the above steps for the "network" module instead of the "core" module, and the following will be built, since network depends on core: ::
+Repeat the above steps for the "network" module instead of the "core" module, and the following will be built, since network depends on core:
+
+.. sourcecode:: text
 
   bindings  libns3-core.so       libns3-network.so       ns3      scratch  utils
   examples  libns3-core-test.so  libns3-network-test.so  samples  src
 
-Running test.py will cause those tests that depend on only the core and network modules to be run: ::
+Running test.py will cause those tests that depend on only the core and network modules to be run:
+
+.. sourcecode:: text
 
   31 of 31 tests passed (31 passed, 0 skipped, 0 failed, 0 crashed, 0 valgrind errors)
 
@@ -74,9 +87,11 @@
 
 Assuming that you are in the top level |ns3| directory, you can get a copy of the .ns3rc file that is in the ``utils`` directory as follows: ::
 
-    cp utils/.ns3rc .
+    $ cp utils/.ns3rc .
 
-The .ns3rc file should now be in your top level |ns3| directory, and it contains the following: ::
+The .ns3rc file should now be in your top level |ns3| directory, and it contains the following:
+
+.. sourcecode:: python
 
   #! /usr/bin/env python
   
@@ -92,7 +107,9 @@
   # Set this equal to true if you want tests to be run.
   tests_enabled = False
 
-Use your favorite editor to modify the .ns3rc file to only enable the core module with examples and tests like this: ::
+Use your favorite editor to modify the .ns3rc file to only enable the core module with examples and tests like this:
+
+.. sourcecode:: python
 
   #! /usr/bin/env python
   
@@ -110,28 +127,36 @@
 
 Only the core module will be enabled now if you try these commands: ::
 
-  ./waf clean
-  ./waf configure
-  ./waf build
-  cd build/debug/
-  ls
+  $ ./waf clean
+  $ ./waf configure
+  $ ./waf build
+  $ cd build/debug/
+  $ ls
+
+and the following libraries should be present:
 
-and the following libraries should be present: ::
+.. sourcecode:: text
 
   bindings  libns3-core.so       ns3      scratch  utils
   examples  libns3-core-test.so  samples  src
 
 Note the ``./waf clean`` step is done here only to make it more obvious which module libraries were built.  You don't have to do ``./waf clean`` in order to enable subsets of modules.
 
-Running test.py will cause only those tests that depend on module core to be run: ::
+Running test.py will cause only those tests that depend on module core to be run:
  
+.. sourcecode:: text
+
   24 of 24 tests passed (24 passed, 0 skipped, 0 failed, 0 crashed, 0 valgrind errors)
 
-Repeat the above steps for the "network" module instead of the "core" module, and the following will be built, since network depends on core: ::
+Repeat the above steps for the "network" module instead of the "core" module, and the following will be built, since network depends on core:
+
+.. sourcecode:: text
 
   bindings  libns3-core.so       libns3-network.so       ns3      scratch  utils
   examples  libns3-core-test.so  libns3-network-test.so  samples  src
 
-Running test.py will cause those tests that depend on only the core and network modules to be run: ::
+Running test.py will cause those tests that depend on only the core and network modules to be run:
+
+.. sourcecode:: text
 
   31 of 31 tests passed (31 passed, 0 skipped, 0 failed, 0 crashed, 0 valgrind errors)
diff -Naur ns-3.17/doc/manual/source/enable-tests.rst ns-3.18/doc/manual/source/enable-tests.rst
--- ns-3.17/doc/manual/source/enable-tests.rst	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/manual/source/enable-tests.rst	2013-10-26 07:07:29.455364378 -0700
@@ -1,4 +1,6 @@
 .. include:: replace.txt
+.. highlight:: bash
+
 
 Enabling/disabling |ns3| Tests and Examples
 -------------------------------------------
@@ -26,18 +28,22 @@
 From the ns-3-allinone directory, you can build |ns3| without any
 examples or tests simply by doing: ::
 
-  ./build.py
+  $ ./build.py
 
-Running test.py in the top level |ns3| directory now will cause no examples or tests to be run: ::
+Running test.py in the top level |ns3| directory now will cause no examples or tests to be run:
  
+.. sourcecode:: text
+
   0 of 0 tests passed (0 passed, 0 skipped, 0 failed, 0 crashed, 0 valgrind errors)
 
 If you would like build |ns3| with examples and tests, then do the following from the ns-3-allinone directory: ::
 
-  ./build.py --enable-examples --enable-tests
+  $ ./build.py --enable-examples --enable-tests
 
-Running test.py in the top level |ns3| directory will cause all of the examples and tests to be run: ::
+Running test.py in the top level |ns3| directory will cause all of the examples and tests to be run:
  
+.. sourcecode:: text
+
   170 of 170 tests passed (170 passed, 0 skipped, 0 failed, 0 crashed, 0 valgrind errors)
 
 Enable/disable examples and tests using waf
@@ -50,20 +56,24 @@
 From the top level |ns3| directory, you can build |ns3| without any
 examples or tests simply by doing: ::
 
-  ./waf configure
-  ./waf build
+  $ ./waf configure
+  $ ./waf build
 
-Running test.py now will cause no examples or tests to be run: ::
+Running test.py now will cause no examples or tests to be run:
  
+.. sourcecode:: text
+
   0 of 0 tests passed (0 passed, 0 skipped, 0 failed, 0 crashed, 0 valgrind errors)
 
 If you would like build |ns3| with examples and tests, then do the following from the top level |ns3| directory: ::
 
-  ./waf configure --enable-examples --enable-tests
-  ./waf build
+  $ ./waf configure --enable-examples --enable-tests
+  $ ./waf build
 
-Running test.py will cause all of the examples and tests to be run: ::
+Running test.py will cause all of the examples and tests to be run:
  
+.. sourcecode:: text
+
   170 of 170 tests passed (170 passed, 0 skipped, 0 failed, 0 crashed, 0 valgrind errors)
 
 Enable/disable examples and tests using the |ns3| configuration file
@@ -84,9 +94,11 @@
 
 Assuming that you are in the top level |ns3| directory, you can get a copy of the .ns3rc file that is in the ``utils`` directory as follows: ::
 
-    cp utils/.ns3rc .
+  $ cp utils/.ns3rc .
 
-The .ns3rc file should now be in your top level |ns3| directory, and it contains the following: ::
+The .ns3rc file should now be in your top level |ns3| directory, and it contains the following:
+
+.. sourcecode:: python
 
   #! /usr/bin/env python
   
@@ -105,16 +117,20 @@
 From the top level |ns3| directory, you can build |ns3| without any
 examples or tests simply by doing: ::
 
-  ./waf configure
-  ./waf build
+  $ ./waf configure
+  $ ./waf build
 
-Running test.py now will cause no examples or tests to be run: ::
+Running test.py now will cause no examples or tests to be run:
  
+.. sourcecode:: text
+
   0 of 0 tests passed (0 passed, 0 skipped, 0 failed, 0 crashed, 0 valgrind errors)
 
 If you would like build |ns3| with examples and tests, use your
 favorite editor to change the values in the .ns3rc file for
-examples_enabled and tests_enabled file to be True: ::
+examples_enabled and tests_enabled file to be True:
+
+.. sourcecode:: python
 
   #! /usr/bin/env python
   
@@ -133,9 +149,11 @@
 From the top level |ns3| directory, you can build |ns3| with examples
 and tests simply by doing: ::
 
-  ./waf configure
-  ./waf build
+  $ ./waf configure
+  $ ./waf build
 
-Running test.py will cause all of the examples and tests to be run: ::
+Running test.py will cause all of the examples and tests to be run:
  
+.. sourcecode:: text
+
   170 of 170 tests passed (170 passed, 0 skipped, 0 failed, 0 crashed, 0 valgrind errors)
diff -Naur ns-3.17/doc/manual/source/events.rst ns-3.18/doc/manual/source/events.rst
--- ns-3.17/doc/manual/source/events.rst	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/manual/source/events.rst	2013-10-26 07:07:29.459364378 -0700
@@ -1,4 +1,6 @@
 .. include:: replace.txt
+.. highlight:: cpp
+
 
 .. heading hierarchy:
    ------------- Chapter
@@ -42,7 +44,7 @@
 The Simulator class is the public entry point to access event scheduling
 facilities. Once a couple of events have been scheduled to start the
 simulation, the user can start to execute them by entering the simulator
-main loop (call Simulator::Run). Once the main loop starts running, it
+main loop (call ``Simulator::Run``). Once the main loop starts running, it
 will sequentially execute all scheduled events in order from oldest to
 most recent until there are either no more events left in the event
 queue or Simulator::Stop has been called.
@@ -70,7 +72,7 @@
 
 Which will output:
 
-::
+.. sourcecode:: text
 
    handler called with argument arg0=10 and arg1=5
 
diff -Naur ns-3.17/doc/manual/source/gnuplot.rst ns-3.18/doc/manual/source/gnuplot.rst
--- ns-3.17/doc/manual/source/gnuplot.rst	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/manual/source/gnuplot.rst	2013-10-26 07:07:29.459364378 -0700
@@ -1,5 +1,6 @@
 .. include:: replace.txt
-
+.. highlight:: cpp
+ 
 Making Plots using the Gnuplot Class
 ------------------------------------
 
@@ -25,39 +26,51 @@
 An Example Program that Uses the Gnuplot Class
 **********************************************
 
-An example program that uses |ns3|'s Gnuplot class can be found here: ::
+An example program that uses |ns3|'s Gnuplot class can be found here:
+
+.. sourcecode:: bash
+
+  src/stats/examples/gnuplot-example.cc
+
+In order to run this example, do the following:
 
-  src/tools/examples/gnuplot-example.cc
+.. sourcecode:: bash
 
-In order to run this example, do the following: ::
+  $ ./waf shell
+  $ cd build/debug/src/stats/examples
+  $ ./gnuplot-example 
 
-  ./waf shell
-  cd build/debug/src/tools/examples
-  ./gnuplot-example 
+This should produce the following gnuplot control files in the directory where the example is located:
 
-This should produce the following gnuplot control files in the directory where the example is located: ::
+.. sourcecode:: text
 
   plot-2d.plt 
   plot-2d-with-error-bars.plt
   plot-3d.plt 
 
-In order to process these gnuplot control files, do the following: ::
+In order to process these gnuplot control files, do the following:
 
-  gnuplot plot-2d.plt 
-  gnuplot plot-2d-with-error-bars.plt
-  gnuplot plot-3d.plt 
+.. sourcecode:: bash
 
-This should produce the following graphics files in the directory where the example is located: ::
+  $ gnuplot plot-2d.plt 
+  $ gnuplot plot-2d-with-error-bars.plt
+  $ gnuplot plot-3d.plt 
+
+This should produce the following graphics files in the directory where the example is located:
+
+.. sourcecode:: text
 
   plot-2d.png 
   plot-2d-with-error-bars.png
   plot-3d.png 
 
-You can view these graphics files in your favorite graphics viewer.  If you have gimp installed on your machine, for example, you can do this: ::
+You can view these graphics files in your favorite graphics viewer.  If you have gimp installed on your machine, for example, you can do this:
+
+.. sourcecode:: bash
 
-  gimp plot-2d.png 
-  gimp plot-2d-with-error-bars.png
-  gimp plot-3d.png 
+  $ gimp plot-2d.png 
+  $ gimp plot-2d-with-error-bars.png
+  $ gimp plot-3d.png 
 
 An Example 2-Dimensional Plot
 *****************************
diff -Naur ns-3.17/doc/manual/source/hash-functions.rst ns-3.18/doc/manual/source/hash-functions.rst
--- ns-3.17/doc/manual/source/hash-functions.rst	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/doc/manual/source/hash-functions.rst	2013-10-26 07:07:29.459364378 -0700
@@ -0,0 +1,118 @@
+.. include:: replace.txt
+.. highlight:: cpp
+
+Hash Functions
+----------------
+
+|ns3| provides a generic interface to general purpose hash functions.
+In the simplest usage, the hash function returns the 32-bit or 64-bit
+hash of a data buffer or string.  The default underlying hash function
+is murmur3_, chosen because it has good hash function properties and
+offers a 64-bit version.  The venerable FNV1a_ hash is also available.
+
+There is a straight-forward mechanism to
+add (or provide at run time) alternative hash function implementations.
+
+.. _murmur3: http://code.google.com/p/smhasher/wiki/MurmurHash3
+.. _FNV1a:   http://isthe.com/chongo/tech/comp/fnv/
+
+Basic Usage
+***********
+
+The simplest way to get a hash value of a data buffer or string is just::
+
+  #include "ns3/hash.h"
+
+  using namespace ns3;
+
+  char * buffer = ...
+  size_t buffer_size = ...
+  
+  uint32_t  buffer_hash = Hash32 ( buffer, buffer_size);
+
+  std::string s;
+  uint32_t  string_hash = Hash32 (s);
+
+Equivalent functions are defined for 64-bit hash values.
+
+Incremental Hashing
+*******************
+
+In some situations it's useful to compute the hash of multiple buffers,
+as if they had been joined together.  (For example, you might want
+the hash of a packet stream, but not want to assemble a single buffer
+with the combined contents of all the packets.)
+
+This is almost as straight-forward as the first example::
+
+  #include "ns3/hash.h"
+
+  using namespace ns3;
+
+  char * buffer;
+  size_t buffer_size;
+
+  Hasher hasher;  // Use default hash function
+
+  for (<every buffer>)
+    {
+	buffer = get_next_buffer ();
+	hasher (buffer, buffer_size);
+    }
+  uint32_t combined_hash = hasher.GetHash32 ();
+
+By default ``Hasher`` preserves internal state to enable incremental
+hashing.  If you want to reuse a ``Hasher`` object (for example
+because it's configured with a non-default hash function), but don't
+want to add to the previously computed hash, you need to ``clear()``
+first::
+
+  hasher.clear ().GetHash32 (buffer, buffer_size);
+
+This reinitializes the internal state before hashing the buffer.
+
+
+Using an Alternative Hash Function
+**********************************
+
+The default hash function is murmur3_.  FNV1a_ is also available.  To specify
+the hash function explicitly, use this contructor::
+
+  Hasher hasher = Hasher ( Create<Hash::Function::Fnv1a> () );
+
+
+Adding New Hash Function Implementations
+****************************************
+
+To add the hash function ``foo``, follow the ``hash-murmur3.h``/``.cc`` pattern:
+
+ * Create a class declaration (``.h``) and definition (``.cc``) inheriting
+   from ``Hash::Implementation``.
+ * ``include`` the declaration in ``hash.h`` (at the point where
+   ``hash-murmur3.h`` is included.
+ * In your own code, instantiate a ``Hasher`` object via the constructor
+   ``Hasher (Ptr<Hash::Function::Foo> ())``
+   
+
+If your hash function is a single function, e.g. ``hashf``, you don't
+even need to create a new class derived from HashImplementation::
+
+  Hasher hasher =
+    Hasher ( Create<Hash::Function::Hash32> (&hashf) );
+
+For this to compile, your ``hashf`` has to match one of the function pointer
+signatures::
+
+  typedef uint32_t (*Hash32Function_ptr) (const char *, const size_t);
+  typedef uint64_t (*Hash64Function_ptr) (const char *, const size_t);
+
+
+Sources for Hash Functions
+**************************
+
+Sources for other hash function implementations include:
+
+ * Peter Kankowski: http://www.strchr.com
+ * Arash Partow:    http://www.partow.net/programming/hashfunctions/index.html
+ * SMHasher:        http://code.google.com/p/smhasher/
+ * Sanmayce:        http://www.sanmayce.com/Fastest_Hash/index.html
diff -Naur ns-3.17/doc/manual/source/helpers.rst ns-3.18/doc/manual/source/helpers.rst
--- ns-3.17/doc/manual/source/helpers.rst	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/manual/source/helpers.rst	2013-10-26 07:07:29.459364378 -0700
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight:: cpp
 
 Helpers
 -------
diff -Naur ns-3.17/doc/manual/source/how-to-write-tests.rst ns-3.18/doc/manual/source/how-to-write-tests.rst
--- ns-3.17/doc/manual/source/how-to-write-tests.rst	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/manual/source/how-to-write-tests.rst	2013-10-26 07:07:29.455364378 -0700
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight:: cpp
 
 How to write tests
 ------------------
@@ -46,7 +47,7 @@
 You also need to add a block into your wscript to get this test to
 compile:
 
-::
+.. sourcecode:: python
 
     module_test.source = [
         'test/router-test-suite.cc',
@@ -64,13 +65,13 @@
 
 Try this command:
 
-::
+.. sourcecode:: bash
 
-  ./test.py -s router
+  $ ./test.py -s router
 
 Output such as below should be produced:
 
-::
+.. sourcecode:: text
 
   PASS: TestSuite router
   1 of 1 tests passed (1 passed, 0 skipped, 0 failed, 0 crashed, 0 valgrind errors)
diff -Naur ns-3.17/doc/manual/source/index.rst ns-3.18/doc/manual/source/index.rst
--- ns-3.17/doc/manual/source/index.rst	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/manual/source/index.rst	2013-10-26 07:07:29.459364378 -0700
@@ -18,6 +18,7 @@
 
    organization
    random-variables
+   hash-functions
    events
    callbacks
    object-model
@@ -25,6 +26,8 @@
    object-names
    logging
    tracing
+   data-collection
+   statistics
    realtime
    helpers
    gnuplot
diff -Naur ns-3.17/doc/manual/source/logging.rst ns-3.18/doc/manual/source/logging.rst
--- ns-3.17/doc/manual/source/logging.rst	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/manual/source/logging.rst	2013-10-26 07:07:29.459364378 -0700
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight:: cpp
 
 .. heading hierarchy:
    ------------- Chapter
@@ -71,7 +72,7 @@
 
 This section still needs documentation; bug 1496 is open on this:
 
-::
+.. sourcecode:: bash
 
    $ NS_LOG="*=all|prefix_all" ./waf --run scratch-simulator
    Scratch Simulator
@@ -88,16 +89,16 @@
 There are two ways that users typically control logging output.  The
 first is by setting an ``NS_LOG`` environment variable; e.g.:
 
-::
+.. sourcecode:: bash
 
-   NS_LOG="*" ./waf --run first
+   $ NS_LOG="*" ./waf --run first
 
 will run the first tutorial program with all logging output.  This can
 be made more granular by selecting individual components:
 
-::
+.. sourcecode:: bash
 
-   NS_LOG="Ipv4L3Protocol" ./waf --run first
+   $ NS_LOG="Ipv4L3Protocol" ./waf --run first
   
 The second way to enable this is to use explicit statements in your
 program, such as in the first tutorial program:
diff -Naur ns-3.17/doc/manual/source/new-models.rst ns-3.18/doc/manual/source/new-models.rst
--- ns-3.17/doc/manual/source/new-models.rst	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/manual/source/new-models.rst	2013-10-26 07:07:29.459364378 -0700
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight:: cpp
 
 Creating a new ns-3 model
 -------------------------
@@ -408,7 +409,7 @@
 
 ::
 
-    point-to-point-net-device.h
+    /* point-to-point-net-device.h */
       class ErrorModel;
       
       /**
@@ -473,7 +474,7 @@
 
 ::
 
-    simple-error-model.cc
+    /* simple-error-model.cc */
 
       // Error model
       // We want to add an error model to node 3's NetDevice
diff -Naur ns-3.17/doc/manual/source/new-modules.rst ns-3.18/doc/manual/source/new-modules.rst
--- ns-3.17/doc/manual/source/new-modules.rst	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/manual/source/new-modules.rst	2013-10-26 07:07:29.455364378 -0700
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight:: cpp
 
 Adding a New Module to |ns3|
 ----------------------------
@@ -20,7 +21,9 @@
   src/spectrum
 
 A prototypical module has the following directory structure and
-required files: ::
+required files:
+
+.. sourcecode:: text
 
   src/
         module-name/
@@ -39,29 +42,39 @@
 Step 2 - Create your new module based on the template module
 ************************************************************
 
-A python program is provided in the source directory that will create a skeleton for a new module ::
+A python program is provided in the source directory that will create a skeleton for a new module
+
+.. sourcecode:: bash
+
+  $ src/create-module.py
+
+For the purposes of this discussion we will assume that your new module is called "new-module".  From the ``src`` directory, do the following to create the new module:
 
-  src/create-module.py
+.. sourcecode:: bash
 
-For the purposes of this discussion we will assume that your new module is called "new-module".  From the ``src`` directory, do the following to create the new module: ::
+  $ ./create-module.py new-module
 
-  ./create-module.py new-module
+Next, cd into ``new-module``; you will find this directory layout:
 
-Next, cd into ``new-module``; you will find this directory layout: ::
+.. sourcecode:: text
 
-  examples  helper  model  test  wscript
+  $ examples  helper  model  test  wscript
 
 We next walk through how to customize this module.  All |ns3| modules
 depend on the 'core' module and usually on other modules.  This 
 dependency is specified in the wscript file.  
 Let's assume that 'new-module' depends on the internet,
 mobility, and aodv modules.  Then the call to the function that will
-create this module should look like this before editing: ::
+create this module should look like this before editing:
+
+.. sourcecode:: python
 
   def build(bld):
       module = bld.create_ns3_module('new-module', ['core'])
 
-and after editing: ::
+and after editing:
+
+.. sourcecode:: python
 
   def build(bld):
       module = bld.create_ns3_module('new-module', ['internet', 'mobility', 'aodv'])
@@ -82,18 +95,24 @@
 *********************************************
 
 If your new module has model and/or helper source files, then they
-must be specified in your  ::
+must be specified in your
+
+.. sourcecode:: text
 
   src/new-module/wscript
 
 file by modifying it with your text editor.
 
 As an example, the source files for the spectrum module are specified
-in ::
+in
+
+.. sourcecode:: text
 
   src/spectrum/wscript
 
-with the following list of source files: ::
+with the following list of source files:
+
+.. sourcecode:: python
 
     module.source = [
         'model/spectrum-model.cc',
@@ -112,20 +131,26 @@
 *******************************************
 
 If your new module has model and/or helper header files, then they
-must be specified in your  ::
+must be specified in your
+
+.. sourcecode:: text
 
   src/new-module/wscript
 
 file by modifying it with your text editor.
 
 As an example, the header files for the spectrum module are specified
-in  ::
+in
+
+.. sourcecode:: text
 
   src/spectrum/wscript
 
 with the following function call, module name, and list of header
 files.  Note that the argument for the function new_task_gen() tells
-waf to install this module's headers with the other |ns3| headers: ::
+waf to install this module's headers with the other |ns3| headers:
+
+.. sourcecode:: python
 
     headers = bld.new_task_gen(features=['ns3header'])
 
@@ -147,17 +172,23 @@
 Step 5 - Specify your module's tests
 ************************************
 
-If your new module has tests, then they must be specified in your ::
+If your new module has tests, then they must be specified in your
+
+.. sourcecode:: text
 
   src/new-module/wscript
 
 file by modifying it with your text editor.
 
-As an example, the tests for the spectrum module are specified in ::
+As an example, the tests for the spectrum module are specified in
+
+.. sourcecode:: text
 
   src/spectrum/wscript
 
-with the following function call and list of test suites: ::
+with the following function call and list of test suites:
+
+.. sourcecode:: python
 
     module_test = bld.create_ns3_module_test_library('spectrum')
 
@@ -170,20 +201,26 @@
 Step 6 - Specify your module's examples
 ***************************************
 
-If your new module has examples, then they must be specified in your ::
+If your new module has examples, then they must be specified in your
+
+.. sourcecode:: text
 
   src/new-module/examples/wscript
 
 file by modifying it with your text editor.
 
-As an example, the examples for the core module are specified in ::
+As an example, the examples for the core module are specified in
+
+.. sourcecode:: text
 
   src/core/examples/wscript
 
 The core module's C++ examples are specified using the following
 function calls and source file names.  Note that the second argument
 for the function ``create_ns3_program()`` is the list of modules that the
-program being created depends on: ::
+program being created depends on:
+
+.. sourcecode:: python
 
     obj = bld.create_ns3_program('main-callback', ['core'])
     obj.source = 'main-callback.cc'
@@ -194,7 +231,9 @@
 The core module's Python examples are specified using the following
 function call.  Note that the second argument for the function
 register_ns3_script() is the list of modules that the Python example
-depends on: ::
+depends on:
+
+.. sourcecode:: python
 
     bld.register_ns3_script('sample-simulator.py', ['core'])
 
@@ -207,11 +246,15 @@
 that exists in each module's test directory can control the invocation
 of the examples when the test framework runs.
 
-As an example, the examples that are run by ``test.py`` for the core module are specified in  ::
+As an example, the examples that are run by ``test.py`` for the core module are specified in
+
+.. sourcecode:: text
 
   src/core/test/examples-to-run.py
 
-using the following two lists of C++ and Python examples: ::
+using the following two lists of C++ and Python examples:
+
+.. sourcecode:: python
 
   # A list of C++ examples to run in order to ensure that they remain
   # buildable and runnable over time.  Each tuple in the list contains
@@ -238,7 +281,9 @@
       ("sample-simulator.py", "True"),
   ]
 
-Each tuple in the C++ list of examples to run contains ::
+Each tuple in the C++ list of examples to run contains
+
+.. sourcecode:: python
 
     (example_name, do_run, do_valgrind_run)
 
@@ -249,11 +294,15 @@
 some tests when they are run under valgrind.
 
 Note that the two conditions are Python statements that
-can depend on waf configuration variables.  For example, ::
+can depend on waf configuration variables.  For example,
+
+.. sourcecode:: python
 
     ("tcp-nsc-lfn", "NSC_ENABLED == True", "NSC_ENABLED == False"),
 
-Each tuple in the Python list of examples to run contains ::
+Each tuple in the Python list of examples to run contains
+
+.. sourcecode:: python
 
     (example_name, do_run)
 
@@ -261,12 +310,16 @@
 do_run is a condition under which to run the example.
 
 Note that the condition is a Python statement that can
-depend on waf configuration variables.  For example, ::
+depend on waf configuration variables.  For example,
+
+.. sourcecode:: python
 
     ("realtime-udp-echo.py", "ENABLE_REAL_TIME == False"),
 
 If your new module has examples, then you must specify which of them
-should be run in your ::
+should be run in your
+
+.. sourcecode:: text
 
   src/new-module/test/examples-to-run.py
 
@@ -276,10 +329,12 @@
 Step 8 - Build and test your new module
 ***************************************
 
-You can now build and test your module as normal: ::
+You can now build and test your module as normal:
+
+.. sourcecode:: bash
 
-  ./waf configure --enable-examples --enable-tests
-  ./waf build
-  ./test.py
+  $ ./waf configure --enable-examples --enable-tests
+  $ ./waf build
+  $ ./test.py
 
 and look for your new module's test suite (and example programs, if enabled) in the test output.
diff -Naur ns-3.17/doc/manual/source/object-model.rst ns-3.18/doc/manual/source/object-model.rst
--- ns-3.17/doc/manual/source/object-model.rst	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/manual/source/object-model.rst	2013-10-26 07:07:29.459364378 -0700
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight:: cpp
 
 .. _Object-model:
 
diff -Naur ns-3.17/doc/manual/source/object-names.rst ns-3.18/doc/manual/source/object-names.rst
--- ns-3.17/doc/manual/source/object-names.rst	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/manual/source/object-names.rst	2013-10-26 07:07:29.455364378 -0700
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight:: cpp
 
 .. _Object-names:
 
diff -Naur ns-3.17/doc/manual/source/organization.rst ns-3.18/doc/manual/source/organization.rst
--- ns-3.17/doc/manual/source/organization.rst	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/manual/source/organization.rst	2013-10-26 07:07:29.459364378 -0700
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight:: cpp
 
 
 Organization
diff -Naur ns-3.17/doc/manual/source/python.rst ns-3.18/doc/manual/source/python.rst
--- ns-3.17/doc/manual/source/python.rst	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/manual/source/python.rst	2013-10-26 07:07:29.459364378 -0700
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight:: python
 
 Using Python to Run |ns3|
 -------------------------
@@ -74,30 +75,30 @@
 
 waf contains some options that automatically update the python path to find the ns3 module.  To run example programs, there are two ways to use waf to take care of this.  One is to run a waf shell; e.g.:
 
-::
+.. sourcecode:: bash
 
- ./waf --shell
- python examples/mixed-wireless.py
+  $ ./waf --shell
+  $ python examples/wireless/mixed-wireless.py
 
 and the other is to use the --pyrun option to waf:
 
-::
+.. sourcecode:: bash
 
- ./waf --pyrun examples/mixed-wireless.py
+  $ ./waf --pyrun examples/wireless/mixed-wireless.py
 
 To run a python script under the C debugger:
 
-::
+.. sourcecode:: bash
 
- ./waf --shell
- gdb --args python examples/mixed-wireless.py
+  $ ./waf --shell
+  $ gdb --args python examples/wireless/mixed-wireless.py
 
 To run your own Python script that calls |ns3| and that has this path, ``/path/to/your/example/my-script.py``, do the following:
 
-::
+.. sourcecode:: bash
 
- ./waf --shell
- python /path/to/your/example/my-script.py
+  $ ./waf --shell
+  $ python /path/to/your/example/my-script.py
 
 Caveats
 *******
@@ -118,9 +119,9 @@
 Conversion Constructors
 +++++++++++++++++++++++
 
-Conversion constructors (http://publib.boulder.ibm.com/infocenter/compbgpl/v9v111/topic/com.ibm.xlcpp9.bg.doc/language_ref/cplr384.htm) are not fully supported yet by PyBindGen, and they always act as explicit constructors when translating an API into Python.  For example, in C++ you can do this:
+`Conversion constructors <http://publib.boulder.ibm.com/infocenter/compbgpl/v9v111/topic/com.ibm.xlcpp9.bg.doc/language_ref/cplr384.htm>`_ are not fully supported yet by PyBindGen, and they always act as explicit constructors when translating an API into Python.  For example, in C++ you can do this:
 
-::
+.. sourcecode:: cpp
 
  Ipv4AddressHelper ipAddrs;
  ipAddrs.SetBase ("192.168.0.0", "255.255.255.0");
@@ -188,9 +189,9 @@
 If you really care about Python bindings on Windows, try building with mingw and native
 python instead.  Or else, to build without python bindings, disable python bindings in the configuration stage:  
 
-::
+.. sourcecode:: bash
 
-  ./waf configure --disable-python
+  $ ./waf configure --disable-python
 
 Working with Python Bindings
 ****************************
@@ -211,9 +212,9 @@
 
 If something goes wrong with compiling Python bindings and you just want to ignore them and move on with C++, you can disable Python with:
 
-::
+.. sourcecode:: bash
 
- ./waf --disable-python
+  $ ./waf --disable-python
 
 Instructions for Handling New Files or Changed API's
 ****************************************************
@@ -230,9 +231,9 @@
 
 To scan the monolithic Python bindings do the following:
 
-::
+.. sourcecode:: bash
 
-  ./waf --python-scan  
+  $ ./waf --python-scan  
 
 Organization of the Monolithic Python Bindings
 ++++++++++++++++++++++++++++++++++++++++++++++
@@ -269,15 +270,15 @@
 
 To scan the modular Python bindings for the core module, for example, do the following:
 
-::
+.. sourcecode:: bash
 
-  ./waf --apiscan=core
+  $ ./waf --apiscan=core
 
 To scan the modular Python bindings for all of the modules, do the following:
 
-::
+.. sourcecode:: bash
 
-  ./waf --apiscan=all
+  $ ./waf --apiscan=all
 
 Creating a New Module
 +++++++++++++++++++++
@@ -311,5 +312,4 @@
 More Information for Developers
 *******************************
 
-If you are a developer and need more information on |ns3|'s Python bindings, please see the Python Bindings wiki page at
-`<http://www.nsnam.org/wiki/index.php/NS-3_Python_Bindings>`_.
+If you are a developer and need more information on |ns3|'s Python bindings, please see the `Python Bindings wiki page <http://www.nsnam.org/wiki/index.php/NS-3_Python_Bindings>`_.
diff -Naur ns-3.17/doc/manual/source/random-variables.rst ns-3.18/doc/manual/source/random-variables.rst
--- ns-3.17/doc/manual/source/random-variables.rst	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/manual/source/random-variables.rst	2013-10-26 07:07:29.459364378 -0700
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight:: cpp
 
 Random Variables
 ----------------
@@ -125,7 +126,7 @@
 before any random variables are created; e.g::
 
   RngSeedManager::SetSeed (3);  // Changes seed from default of 1 to 3
-  RngSeedManager::SetRun (7);  // Changes run number from default of 1 to 7
+  RngSeedManager::SetRun (7);   // Changes run number from default of 1 to 7
   // Now, create random variables
   Ptr<UniformRandomVariable> x = CreateObject<UniformRandomVariable> ();
   Ptr<ExponentialRandomVariable> y = CreateObject<ExponentialRandomVarlable> ();
@@ -143,18 +144,24 @@
 
 For ease of use, it is not necessary to control the seed and run number from
 within the program; the user can set the ``NS_GLOBAL_VALUE`` environment
-variable as follows::
+variable as follows:
 
-  NS_GLOBAL_VALUE="RngRun=3" ./waf --run program-name
+.. sourcecode:: bash
+
+  $ NS_GLOBAL_VALUE="RngRun=3" ./waf --run program-name
 
 Another way to control this is by passing a command-line argument; since this is
-an |ns3| GlobalValue instance, it is equivalently done such as follows::
+an |ns3| GlobalValue instance, it is equivalently done such as follows:
+
+.. sourcecode:: bash
 
-  ./waf --command-template="%s --RngRun=3" --run program-name
+  $ ./waf --command-template="%s --RngRun=3" --run program-name
 
-or, if you are running programs directly outside of waf::
+or, if you are running programs directly outside of waf:
 
-  ./build/optimized/scratch/program-name --RngRun=3
+.. sourcecode:: bash
+
+  $ ./build/optimized/scratch/program-name --RngRun=3
 
 The above command-line variants make it easy to run lots of different
 runs from a shell script by just passing a different RngRun index.
@@ -177,7 +184,9 @@
 *********************
 
 Below are excerpted a few public methods of class :cpp:class:`RandomVariableStream`
-that access the next value in the substream.::
+that access the next value in the substream.
+
+::
 
   /**
    * \brief Returns a random double from the underlying distribution
@@ -226,7 +235,7 @@
 
 RandomVariableStream instances can also be used in |ns3| attributes, which means
 that values can be set for them through the |ns3| attribute system.
-An example is in the propagation models for WifiNetDevice:::
+An example is in the propagation models for WifiNetDevice::
 
     TypeId
     RandomPropagationDelayModel::GetTypeId (void)
@@ -278,20 +287,20 @@
 
 By partitioning the existing sequence of streams from before:
 
-::
+.. sourcecode:: text
 
    <-------------------------------------------------------------------------->
-   stream 0                                                     stream (2^64 - 1)
+   stream 0                                                   stream (2^64 - 1)
 
 into two equal-sized sets:
 
-::
+.. sourcecode:: text
 
-   <--------------------------------------------------------------------------->
-    ^                             ^^                                    ^
-    |                             ||                                    |
-   stream 0       stream (2^63 - 1) stream 2^63          stream (2^64 - 1)
-   <- automatically assigned -----><-------- assigned by user----------->
+   <--------------------------------------------------------------------------> 
+   ^                                    ^^                                    ^
+   |                                    ||                                    |
+   stream 0            stream (2^63 - 1)  stream 2^63         stream (2^64 - 1)
+   <- automatically assigned -----------><- assigned by user ----------------->
 
 The first 2^63 streams continue to be automatically assigned, while
 the last 2^63 are given stream indices starting with zero up to
diff -Naur ns-3.17/doc/manual/source/realtime.rst ns-3.18/doc/manual/source/realtime.rst
--- ns-3.17/doc/manual/source/realtime.rst	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/manual/source/realtime.rst	2013-10-26 07:07:29.459364378 -0700
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight:: cpp
 
 RealTime
 --------
@@ -61,9 +62,11 @@
     StringValue ("ns3::RealtimeSimulatorImpl"));
 
 There is a script in ``examples/realtime/realtime-udp-echo.cc`` that
-has an example of how to configure the realtime behavior.  Try: ::
+has an example of how to configure the realtime behavior.  Try:
 
-    ./waf --run realtime-udp-echo
+.. sourcecode:: bash
+
+    $ ./waf --run realtime-udp-echo
 
 Whether the simulator will work in a best effort or hard limit policy fashion is
 governed by the attributes explained in the previous section.
diff -Naur ns-3.17/doc/manual/source/replace.txt ns-3.18/doc/manual/source/replace.txt
--- ns-3.17/doc/manual/source/replace.txt	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/manual/source/replace.txt	2013-10-26 07:07:29.455364378 -0700
@@ -1,3 +1,5 @@
 .. |ns3| replace:: *ns-3*
 
 .. |ns2| replace:: *ns-2*
+
+.. |check| replace:: :math:`\checkmark`
diff -Naur ns-3.17/doc/manual/source/test-framework.rst ns-3.18/doc/manual/source/test-framework.rst
--- ns-3.17/doc/manual/source/test-framework.rst	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/manual/source/test-framework.rst	2013-10-26 07:07:29.459364378 -0700
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight::  bash
 
 Testing framework
 -----------------
@@ -27,7 +28,9 @@
 Users (and developers) typically will not interact with the buildbot system other 
 than to read its messages regarding test results.  If a failure is detected in 
 one of the automated build and test jobs, the buildbot will send an email to the
-*ns-developers* mailing list.  This email will look something like::
+*ns-developers* mailing list.  This email will look something like
+
+.. sourcecode:  text
 
   The Buildbot has detected a new failure of osx-ppc-g++-4.2 on NsNam.
   Full details are available at:
@@ -69,20 +72,20 @@
 
 ::
 
-  ./waf configure --enable-examples --enable-tests
-  ./waf
+  $ ./waf configure --enable-examples --enable-tests
+  $ ./waf
 
 By default, ``test.py`` will run all available tests and report status
 back in a very concise form.  Running the command
 
 ::
 
-  ./test.py
+  $ ./test.py
 
 will result in a number of ``PASS``, ``FAIL``, ``CRASH`` or ``SKIP``
 indications followed by the kind of test that was run and its display name.
  
-::
+.. sourcecode:: text
 
   Waf: Entering directory `/home/craigdo/repos/ns-3-allinone-test/ns-3-dev/build'
   Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone-test/ns-3-dev/build'
@@ -103,7 +106,7 @@
 There are a number of options available to control the behavior of ``test.py``.
 if you run ``test.py --help`` you should see a command summary like:
 
-::
+.. sourcecode:: text
 
   Usage: test.py [options]
   
@@ -145,7 +148,7 @@
 
 ::
 
-  ./test.py --html=nightly.html
+  $ ./test.py --html=nightly.html
 
 In this case, an HTML file named ''nightly.html'' would be created with a pretty
 summary of the testing done.  A ''human readable'' format is available for users
@@ -153,7 +156,7 @@
 
 ::
 
-  ./test.py --text=results.txt
+  $ ./test.py --text=results.txt
 
 In the example above, the test suite checking the |ns3| wireless
 device propagation loss models failed.  By default no further information is
@@ -164,17 +167,17 @@
 
 ::
 
-  ./test.py --suite=ns3-wifi-propagation-loss-models
+  $ ./test.py --suite=ns3-wifi-propagation-loss-models
 
 or equivalently
 
 ::
 
-  ./test.py -s ns3-wifi-propagation-loss-models
+  $ ./test.py -s ns3-wifi-propagation-loss-models
 
 results in that single test suite being run.
 
-::
+.. sourcecode:: text
 
   FAIL: TestSuite ns3-wifi-propagation-loss-models
 
@@ -182,13 +185,14 @@
 of output desired.  For example, most people will probably be interested in
 a text file::
 
-  ./test.py --suite=ns3-wifi-propagation-loss-models --text=results.txt
+  $ ./test.py --suite=ns3-wifi-propagation-loss-models --text=results.txt
 
 This will result in that single test suite being run with the test status written to 
 the file ''results.txt''.
 
-You should find something similar to the following in that file::
+You should find something similar to the following in that file
 
+.. sourcecode:: text
 
   FAIL: Test Suite ''ns3-wifi-propagation-loss-models'' (real 0.02 user 0.01 system 0.00)
   PASS: Test Case "Check ... Friis ... model ..." (real 0.01 user 0.00 system 0.00)
@@ -222,21 +226,23 @@
 the types of tests being run to a particular class of tests.  The following
 command will result in only the unit tests being run::
 
-  ./test.py --constrain=unit
+  $ ./test.py --constrain=unit
 
 Similarly, the following command will result in only the example smoke tests
 being run::
 
-  ./test.py --constrain=unit
+  $ ./test.py --constrain=unit
 
 To see a quick list of the legal kinds of constraints, you can ask for them
 to be listed.  The following command
 
 ::
 
-  ./test.py --kinds
+  $ ./test.py --kinds
 
-will result in the following list being displayed::
+will result in the following list being displayed:
+
+.. sourcecode:: text
 
   Waf: Entering directory `/home/craigdo/repos/ns-3-allinone-test/ns-3-dev/build'
   Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone-test/ns-3-dev/build'
@@ -256,9 +262,11 @@
 
 ::
 
-  ./test.py --list
+  $ ./test.py --list
+
+will result in a list of the test suite being displayed, similar to
 
-will result in a list of the test suite being displayed, similar to::
+.. sourcecode:: text
 
   Waf: Entering directory `/home/craigdo/repos/ns-3-allinone-test/ns-3-dev/build'
   Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone-test/ns-3-dev/build'
@@ -291,11 +299,11 @@
 
 ::
 
-  ./test.py --example=udp-echo
+  $ ./test.py --example=udp-echo
 
 results in that single example being run.
 
-::
+.. sourcecode:: text
 
   PASS: Example examples/udp/udp-echo
 
@@ -304,7 +312,7 @@
 
 ::
 
-  ./test.py --buildpath=/home/craigdo/repos/ns-3-allinone-test/ns-3-dev/build/debug --example=wifi-simple-adhoc
+  $ ./test.py --buildpath=/home/craigdo/repos/ns-3-allinone-test/ns-3-dev/build/debug --example=wifi-simple-adhoc
 
 One can run a single Python example program using the ``--pyexample``
 option.  Note that the relative path for the example must be included
@@ -312,11 +320,11 @@
 
 ::
 
-  ./test.py --pyexample=examples/tutorial/first.py
+  $ ./test.py --pyexample=examples/tutorial/first.py
 
 results in that single example being run.
 
-::
+.. sourcecode:: text
 
   PASS: Example examples/tutorial/first.py
 
@@ -344,9 +352,11 @@
 
 ::
 
-  ./test.py --list --nowaf
+  $ ./test.py --list --nowaf
+
+will result in a list of the currently built test suites being displayed, similar to:
 
-will result in a list of the currently built test suites being displayed, similar to::
+.. sourcecode:: text
 
   ns3-wifi-propagation-loss-models
   ns3-tcp-cwnd
@@ -366,7 +376,7 @@
 
 ::
 
-  ./test.py --grind
+  $ ./test.py --grind
 
 As it runs, ``test.py`` and the programs that it runs indirectly, generate large
 numbers of temporary files.  Usually, the content of these files is not interesting,
@@ -378,7 +388,7 @@
 
 ::
 
-  ./test.py --retain
+  $ ./test.py --retain
 
 Finally, ``test.py`` provides a ``--verbose`` option which will print
 large amounts of information about its progress.  It is not expected that this
@@ -386,13 +396,13 @@
 access to the standard output and standard error reported by running test suites
 and examples.  Select verbose in the following way::
 
-  ./test.py --verbose
+  $ ./test.py --verbose
 
 All of these options can be mixed and matched.  For example, to run all of the 
 ns-3 core test suites under valgrind, in verbose mode, while generating an HTML
 output file, one would do::
 
-  ./test.py --verbose --grind --constrain=core --html=results.html 
+  $ ./test.py --verbose --grind --constrain=core --html=results.html 
 
 TestTaxonomy
 ************
@@ -480,7 +490,7 @@
 
 ::
 
-   ./waf --configure --enable-examples --enable-tests
+   $ ./waf --configure --enable-examples --enable-tests
 
 Then, build ns-3, and after it is built, just run ``test.py``.  ``test.py -h``
 will show a number of configuration options that modify the behavior
@@ -501,9 +511,11 @@
 In order to execute the test-runner, you run it like any other ns-3 executable
 -- using ``waf``.  To get a list of available options, you can type::
 
-  ./waf --run "test-runner --help"
+  $ ./waf --run "test-runner --help"
 
-You should see something like the following::
+You should see something like the following
+
+.. sourcecode:: text
 
   Waf: Entering directory `/home/craigdo/repos/ns-3-allinone-test/ns-3-dev/build'
   Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone-test/ns-3-dev/build'
@@ -537,10 +549,10 @@
 
 ::
 
-  ./waf shell
-  cd build/debug/utils
-  gdb test-runner
-  run --suite=global-value --assert
+  $ ./waf shell
+  $ cd build/debug/utils
+  $ gdb test-runner
+  $ run --suite=global-value --assert
 
 If an error is then found in the global-value test suite, a segfault would be 
 generated and the (source level) debugger would stop at the ``NS_TEST_ASSERT_MSG``
@@ -556,7 +568,7 @@
 using ``waf``, you will need to specify the test suite to run along with 
 the base directory.  So you could use the shell and do::
 
-  ./waf --run "test-runner --basedir=`pwd` --suite=pcap-file-object"
+  $ ./waf --run "test-runner --basedir=`pwd` --suite=pcap-file-object"
 
 Note the ''backward'' quotation marks on the ``pwd`` command.  
 
@@ -601,7 +613,7 @@
 
 ::
 
-   ./test.py -r
+   $ ./test.py -r
 
 and test output can be found in the ``testpy-output/`` directory.
 
@@ -619,11 +631,11 @@
 
 ::
 
-  ./waf --run "test-runner --basedir=`pwd` --suite=pcap-file-object --out=myfile.xml"
+  $ ./waf --run "test-runner --basedir=`pwd` --suite=pcap-file-object --out=myfile.xml"
 
 If you look at the file ``myfile.xml`` you should see something like,
 
-::
+.. sourcecode:: xml
 
   <TestSuite>
     <SuiteName>pcap-file-object</SuiteName>
@@ -669,7 +681,9 @@
 Debugging test suite failures
 +++++++++++++++++++++++++++++
 
-To debug test crashes, such as::
+To debug test crashes, such as
+
+.. sourcecode:: text
 
   CRASH: TestSuite ns3-wifi-interference
 
@@ -677,7 +691,7 @@
 then pass the "--basedir=`pwd`" argument to run (you can also pass other
 arguments as needed, but basedir is the minimum needed)::
 
-  ./waf --command-template="gdb %s" --run "test-runner"
+  $ ./waf --command-template="gdb %s" --run "test-runner"
   Waf: Entering directory `/home/tomh/hg/sep09/ns-3-allinone/ns-3-dev-678/build'
   Waf: Leaving directory `/home/tomh/hg/sep09/ns-3-allinone/ns-3-dev-678/build'
   'build' finished successfully (0.380s)
@@ -699,7 +713,7 @@
 
   VALGR: TestSuite devices-mesh-dot11s-regression
 
-  ./waf --command-template="valgrind %s --basedir=`pwd` --suite=devices-mesh-dot11s-regression" --run test-runner
+  $ ./waf --command-template="valgrind %s --basedir=`pwd` --suite=devices-mesh-dot11s-regression" --run test-runner
 
 Class TestRunner
 ****************
@@ -736,7 +750,7 @@
 The following code will define a new class that can be run by ``test.py``
 as a ''unit'' test with the display name, ``my-test-suite-name``.
 
-::
+.. sourcecode:: cpp
 
   class MySuite : public TestSuite
   {
@@ -766,7 +780,7 @@
 from the  ``TestCase`` base class, override the constructor to give the test 
 case a name and override the ``DoRun`` method to run the test.
 
-::
+.. sourcecode:: cpp
 
   class MyTestCase : public TestCase
   {
diff -Naur ns-3.17/doc/manual/source/tracing.rst ns-3.18/doc/manual/source/tracing.rst
--- ns-3.17/doc/manual/source/tracing.rst	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/manual/source/tracing.rst	2013-10-26 07:07:29.455364378 -0700
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight:: cpp
 
 Tracing
 -------
@@ -269,7 +270,7 @@
 indicates a ``GetObject`` call should be made looking for the type that follows.
 When a node is initialized by an ``InternetStackHelper`` a number of interfaces
 are aggregated to the node. One of these is the TCP level four protocol. The
-runtime type of this protocol object is "ns3::TcpL4Protocol". When the
+runtime type of this protocol object is ``ns3::TcpL4Protocol''. When the
 ``GetObject`` is executed, it returns a pointer to the object of this type.
 
 The ``TcpL4Protocol`` class defines an Attribute called "SocketList" which is a
@@ -342,14 +343,15 @@
 The trace helpers therefore fall naturally into a two-dimensional taxonomy.
 There are subtleties that prevent all four classes from behaving identically,
 but we do strive to make them all work as similarly as possible; and whenever
-possible there are analogs for all methods in all classes.::
+possible there are analogs for all methods in all classes.
 
-                   | pcap | ascii |
-  -----------------+------+-------|
-  Device Helper    |      |       |
-  -----------------+------+-------|
-  Protocol Helper  |      |       |
-  -----------------+------+-------|
+  +-----------------+---------+---------+
+  |                 |  pcap   |  ascii  |
+  +=================+=========+=========+
+  | Device Helper   | |check| | |check| |
+  +-----------------+---------+---------+
+  | Protocol Helper | |check| | |check| |
+  +-----------------+---------+---------+
 
 We use an approach called a ``mixin`` to add tracing functionality to our helper
 classes. A ``mixin`` is a class that provides functionality to that is
@@ -393,11 +395,16 @@
 
 ::
 
-  void EnablePcap (std::string prefix, Ptr<NetDevice> nd, bool promiscuous = false, bool explicitFilename = false);
-  void EnablePcap (std::string prefix, std::string ndName, bool promiscuous = false, bool explicitFilename = false);
-  void EnablePcap (std::string prefix, NetDeviceContainer d, bool promiscuous = false);
-  void EnablePcap (std::string prefix, NodeContainer n, bool promiscuous = false);
-  void EnablePcap (std::string prefix, uint32_t nodeid, uint32_t deviceid, bool promiscuous = false);
+  void EnablePcap (std::string prefix, Ptr<NetDevice> nd,
+                   bool promiscuous = false, bool explicitFilename = false);
+  void EnablePcap (std::string prefix, std::string ndName,
+                   bool promiscuous = false, bool explicitFilename = false);
+  void EnablePcap (std::string prefix, NetDeviceContainer d,
+                   bool promiscuous = false);
+  void EnablePcap (std::string prefix, NodeContainer n,
+                   bool promiscuous = false);
+  void EnablePcap (std::string prefix, uint32_t nodeid, uint32_t deviceid,
+                   bool promiscuous = false);
   void EnablePcapAll (std::string prefix, bool promiscuous = false);
 
 In each of the methods shown above, there is a default parameter called
diff -Naur ns-3.17/doc/manual/source/troubleshoot.rst ns-3.18/doc/manual/source/troubleshoot.rst
--- ns-3.17/doc/manual/source/troubleshoot.rst	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/manual/source/troubleshoot.rst	2013-10-26 07:07:29.455364378 -0700
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight:: bash
 
 Troubleshooting
 ---------------
@@ -22,18 +23,20 @@
 
 Here is an example of what might occur:::
 
-    ns-old:~/ns-3-nsc$ ./waf --run tcp-point-to-point
-    Entering directory `/home/tomh/ns-3-nsc/build'
+    $ ./waf --run tcp-point-to-point
+    Entering directory '/home/tomh/ns-3-nsc/build'
     Compilation finished successfully 
     Command ['/home/tomh/ns-3-nsc/build/debug/examples/tcp-point-to-point'] exited with code -11 
 
 The error message says that the program terminated unsuccessfully, but it is
 not clear from this information what might be wrong. To examine more
 closely, try running it under the `gdb debugger
-<http://sources.redhat.com/gdb/>`_:::
+<http://sources.redhat.com/gdb/>`_:
 
-    ns-old:~/ns-3-nsc$ ./waf --run tcp-point-to-point --command-template="gdb %s"
-    Entering directory `/home/tomh/ns-3-nsc/build'
+.. sourcecode:: bash
+
+    $ ./waf --run tcp-point-to-point --command-template="gdb %s"
+    Entering directory '/home/tomh/ns-3-nsc/build'
     Compilation finished successfully 
     GNU gdb Red Hat Linux (6.3.0.0-1.134.fc5rh)
     Copyright 2004 Free Software Foundation, Inc.
@@ -66,7 +69,9 @@
 This tells us that there was an attempt to dereference a null pointer
 socketFactory.
 
-Let's look around line 136 of tcp-point-to-point, as gdb suggests:::
+Let's look around line 136 of tcp-point-to-point, as gdb suggests:
+
+.. sourcecode:: cpp
 
   Ptr<SocketFactory> socketFactory = n2->GetObject<SocketFactory> (Tcp::iid);
   Ptr<Socket> localSocket = socketFactory->CreateSocket ();
@@ -77,6 +82,6 @@
 
 Sometimes you may need to use the `valgrind memory checker
 <http://valgrind.org>`_ for more subtle errors. Again, you invoke the use of
-valgrind similarly:::
+valgrind similarly::
 
-    ns-old:~/ns-3-nsc$ ./waf --run tcp-point-to-point --command-template="valgrind %s"
+    $ ./waf --run tcp-point-to-point --command-template="valgrind %s"
diff -Naur ns-3.17/doc/models/Makefile ns-3.18/doc/models/Makefile
--- ns-3.17/doc/models/Makefile	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/models/Makefile	2013-10-26 07:07:29.451364379 -0700
@@ -65,6 +65,7 @@
 	$(SRC)/wimax/doc/wimax.rst \
 	$(SRC)/uan/doc/uan.rst \
 	$(SRC)/topology-read/doc/topology.rst \
+	$(SRC)/spectrum/doc/spectrum.rst \
 	$(SRC)/stats/doc/statistics.rst \
 	$(SRC)/netanim/doc/animation.rst \
 	$(SRC)/flow-monitor/doc/flow-monitor.rst \
@@ -129,12 +130,34 @@
 	$(SRC)/lte/doc/source/figures/lte-rlc-data-retx-ul.eps \
 	$(SRC)/lte/doc/source/figures/lte-epc-x2-handover-seq-diagram.eps \
 	$(SRC)/lte/doc/source/figures/lte-epc-x2-entity-saps.eps \
-	$(SRC)/lte/doc/source/figures/fading_pedestrian.png \
-	$(SRC)/lte/doc/source/figures/fading_vehicular.png \
-	$(SRC)/lte/doc/source/figures/fading_urban_3kmph.png \
+	$(SRC)/lte/doc/source/figures/lte-phy-interference.pdf \
+	$(SRC)/lte/doc/source/figures/lte-phy-interference.png \
+	$(SRC)/lte/doc/source/figures/helpers.pdf \
+	$(SRC)/lte/doc/source/figures/helpers.png \
+	$(SRC)/lte/doc/source/figures/mac-random-access-contention.pdf \
+	$(SRC)/lte/doc/source/figures/mac-random-access-contention.png \
+	$(SRC)/lte/doc/source/figures/mac-random-access-noncontention.pdf \
+	$(SRC)/lte/doc/source/figures/mac-random-access-noncontention.png \
+	$(SRC)/lte/doc/source/figures/rrc-connection-establishment.pdf \
+	$(SRC)/lte/doc/source/figures/rrc-connection-establishment.png \
+	$(SRC)/lte/doc/source/figures/rrc-connection-reconfiguration.pdf \
+	$(SRC)/lte/doc/source/figures/rrc-connection-reconfiguration.png \
+	$(SRC)/lte/doc/source/figures/rrc-connection-reconfiguration-handover.pdf \
+	$(SRC)/lte/doc/source/figures/rrc-connection-reconfiguration-handover.png \
+	$(SRC)/lte/doc/source/figures/nas-attach.pdf \
+	$(SRC)/lte/doc/source/figures/nas-attach.png \
+	$(SRC)/lte/doc/source/figures/lte-enb-rrc-states.pdf \
+	$(SRC)/lte/doc/source/figures/lte-enb-rrc-states.png \
+	$(SRC)/lte/doc/source/figures/lte-ue-rrc-states.pdf \
+	$(SRC)/lte/doc/source/figures/lte-ue-rrc-states.png \
+	$(SRC)/lte/doc/source/figures/lte-handover-algorithm.pdf \
+	$(SRC)/lte/doc/source/figures/lte-handover-algorithm.png \
 	$(SRC)/lte/doc/source/figures/fading_pedestrian.pdf \
+	$(SRC)/lte/doc/source/figures/fading_pedestrian.png \
 	$(SRC)/lte/doc/source/figures/fading_vehicular.pdf \
+	$(SRC)/lte/doc/source/figures/fading_vehicular.png \
 	$(SRC)/lte/doc/source/figures/fading_urban_3kmph.pdf \
+	$(SRC)/lte/doc/source/figures/fading_urban_3kmph.png \
 	$(SRC)/lte/doc/source/figures/MCS_1_4.pdf \
 	$(SRC)/lte/doc/source/figures/MCS_1_4.png \
 	$(SRC)/lte/doc/source/figures/MCS_5_8.pdf \
@@ -159,26 +182,6 @@
 	$(SRC)/lte/doc/source/figures/MCS_16_test.pdf \
 	$(SRC)/lte/doc/source/figures/miesm_scheme.pdf \
 	$(SRC)/lte/doc/source/figures/miesm_scheme.png \
-	$(SRC)/lte/doc/source/figures/lte-phy-interference.png \
-	$(SRC)/lte/doc/source/figures/helpers.png \
-	$(SRC)/lte/doc/source/figures/mac-random-access-contention.png \
-	$(SRC)/lte/doc/source/figures/mac-random-access-noncontention.png \
-	$(SRC)/lte/doc/source/figures/rrc-connection-establishment.png \
-	$(SRC)/lte/doc/source/figures/rrc-connection-reconfiguration.png \
-	$(SRC)/lte/doc/source/figures/rrc-connection-reconfiguration-handover.png \
-	$(SRC)/lte/doc/source/figures/nas-attach.png \
-	$(SRC)/lte/doc/source/figures/lte-phy-interference.pdf \
-	$(SRC)/lte/doc/source/figures/helpers.pdf \
-	$(SRC)/lte/doc/source/figures/mac-random-access-contention.pdf \
-	$(SRC)/lte/doc/source/figures/mac-random-access-noncontention.pdf \
-	$(SRC)/lte/doc/source/figures/rrc-connection-establishment.pdf \
-	$(SRC)/lte/doc/source/figures/rrc-connection-reconfiguration.pdf \
-	$(SRC)/lte/doc/source/figures/rrc-connection-reconfiguration-handover.pdf \
-	$(SRC)/lte/doc/source/figures/nas-attach.pdf \
-	$(SRC)/lte/doc/source/figures/lte-enb-rrc-states.png \
-	$(SRC)/lte/doc/source/figures/lte-ue-rrc-states.png \
-	$(SRC)/lte/doc/source/figures/lte-enb-rrc-states.pdf \
-	$(SRC)/lte/doc/source/figures/lte-ue-rrc-states.pdf \
 	$(SRC)/uan/doc/auvmobility-classes.dia \
 	$(SRC)/stats/doc/Stat-framework-arch.png \
 	$(SRC)/stats/doc/Wifi-default.png \
@@ -210,11 +213,11 @@
 IMAGES_EPS = \
 	$(FIGURES)/testbed.eps \
 	$(FIGURES)/emulated-channel.eps \
+	$(FIGURES)/antenna-coordinate-system.eps \
 	$(FIGURES)/packet.eps \
 	$(FIGURES)/node.eps \
 	$(FIGURES)/buffer.eps \
 	$(FIGURES)/sockets-overview.eps \
-	$(FIGURES)/antenna-coordinate-system.eps \
 	$(FIGURES)/internet-node-send.eps \
 	$(FIGURES)/internet-node-recv.eps \
 	$(FIGURES)/routing.eps \
@@ -277,17 +280,28 @@
 $(FIGURES)/routing-specialization.pdf_width = 5in
 $(FIGURES)/snir.pdf_width = 3in
 $(FIGURES)/lte-interference-test-scenario.pdf_width = 3in
+$(FIGURES)/epc-ctrl-arch.pdf_width = 8cm
 $(FIGURES)/epc-topology.pdf_width = 4in
+$(FIGURES)/epc-topology-x2-enhanced.pdf_width = 14cm
 $(FIGURES)/lte-arch-data-rrc-pdcp-rlc.pdf_width = 3in
 $(FIGURES)/lte-epc-e2e-data-protocol-stack.pdf_width = 15cm
 $(FIGURES)/ff-mac-saps.pdf_width = 5in
 $(FIGURES)/ff-example.pdf_width = 5in
+$(FIGURES)/lte-arch-enb-data.pdf_width = 6cm 
+$(FIGURES)/lte-arch-enb-ctrl.pdf_width = 10cm
+$(FIGURES)/lte-arch-ue-data.pdf_width = 6cm
+$(FIGURES)/lte-arch-ue-ctrl.pdf_width = 10cm
 $(FIGURES)/lte-rlc-implementation-model.pdf_width = 20in
 $(FIGURES)/lte-rlc-data-txon-dl.pdf_width = 10cm
 $(FIGURES)/lte-rlc-data-txon-ul.pdf_width = 10cm
 $(FIGURES)/lte-rlc-data-retx-ul.pdf_width = 10cm
 $(FIGURES)/lte-phy-interference.pdf_width = 12cm
 $(FIGURES)/lte-subframe-structure.pdf_width = 2in
+$(FIGURES)/mac-random-access-contention.pdf_width = 10cm
+$(FIGURES)/mac-random-access-noncontention.pdf_width = 15cm
+$(FIGURES)/lte-ue-rrc-states.pdf_width = 7cm
+$(FIGURES)/lte-handover-algorithm.pdf_width = 10cm
+$(FIGURES)/helpers.pdf_width = 8cm
 $(FIGURES)/auvmobility-classes.pdf_width = 10cm
 
 IMAGES_PNG = ${IMAGES_EPS:.eps=.png}
@@ -295,12 +309,14 @@
 
 IMAGES = $(IMAGES_EPS) $(IMAGES_PNG) $(IMAGES_PDF)
 
+RESCALE = $(shell hg root)/utils/rescale-pdf.sh
+
 %.eps : %.dia; $(DIA) -t eps $< -e $@
 %.png : %.dia; $(DIA) -t png $< -e $@
 %.png : %.eps; $(CONVERT) $< $@
 %.pdf : %.eps
 	$(EPSTOPDF) $< -o=$@
-	if test x$($@_width) != x; then ./rescale-pdf.sh $($@_width) $@ ; fi
+	@if test x$($@_width) != x; then $(RESCALE) $($@_width) $@ ; fi
 
 # You can set these variables from the command line.
 SPHINXOPTS    =
diff -Naur ns-3.17/doc/models/rescale-pdf.sh ns-3.18/doc/models/rescale-pdf.sh
--- ns-3.17/doc/models/rescale-pdf.sh	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/models/rescale-pdf.sh	1969-12-31 16:00:00.000000000 -0800
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-TMPDIR=/tmp
-
-TMPFILE=`mktemp`
-
-echo "\documentclass{book}
-\usepackage{pdfpages}
-\begin{document}
-\includepdf[width=${1},fitpaper]{${2}}
-\end{document}" >${TMPFILE}.tex
-pdflatex -output-directory /tmp ${TMPFILE}.tex >/dev/null 2>/dev/null
-cp ${TMPFILE}.pdf ${2}
-rm -f ${TMPFILE}{,.{tex,aux,log,pdf}}
diff -Naur ns-3.17/doc/models/source/conf.py ns-3.18/doc/models/source/conf.py
--- ns-3.17/doc/models/source/conf.py	2013-05-14 07:34:56.000000000 -0700
+++ ns-3.18/doc/models/source/conf.py	2013-10-26 07:07:29.455364378 -0700
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = 'ns-3.17'
+version = 'ns-3.18'
 # The full version, including alpha/beta/rc tags.
-release = 'ns-3.17'
+release = 'ns-3.18'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff -Naur ns-3.17/doc/modules ns-3.18/doc/modules
--- ns-3.17/doc/modules	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/modules	2013-10-26 07:07:29.471364379 -0700
@@ -1,8 +1,8 @@
 /**
  * @anchor modules_anchor
  *
- * @defgroup constructs C++ Constructs Used by All Modules
- * \brief These are C++ constructs defined by the modules.
+ * @defgroup constructs Introspected Lists
+ * \brief These are lists of useful items found by examining the type system.
  *
  * @defgroup constants Constants
  * @brief Constants you can change
diff -Naur ns-3.17/doc/ns3_html_theme/get_version.sh ns-3.18/doc/ns3_html_theme/get_version.sh
--- ns-3.17/doc/ns3_html_theme/get_version.sh	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/ns3_html_theme/get_version.sh	2013-10-26 07:07:29.471364379 -0700
@@ -201,8 +201,9 @@
 # by Sphinx when rebuilding
 cd doc 2>&1 >/dev/null
 for d in {manual,models,tutorial{,-pt-br}}/build/{single,}html/_static/ ; do
-    # expect the copy to fail if the destination dir
-    # hasn't been created by a prior doc build
+    if [ ! -d $d ]; then
+	mkdir -p $d
+    fi
     cp ns3_html_theme/static/ns3_version.js $d
 done
 cd - 2>&1 >/dev/null
diff -Naur ns-3.17/doc/ns3_html_theme/static/ns3_stylesheet.css ns-3.18/doc/ns3_html_theme/static/ns3_stylesheet.css
--- ns-3.17/doc/ns3_html_theme/static/ns3_stylesheet.css	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/ns3_html_theme/static/ns3_stylesheet.css	2013-10-26 07:07:29.471364379 -0700
@@ -25,6 +25,11 @@
   background-image: url('nav_f.png');
 }
 
+/* Sphinx figure captions */
+p.caption {
+  font-weight: bold;
+}
+
 /* Doxygen side bar */
 #nav-tree {
   font-size: 12px;
diff -Naur ns-3.17/doc/release_steps.txt ns-3.18/doc/release_steps.txt
--- ns-3.17/doc/release_steps.txt	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/release_steps.txt	2013-10-26 07:07:29.471364379 -0700
@@ -164,7 +164,10 @@
 4. The main page http://www.nsnam.org should point to
 ns-3.x in the "Download" and "Documentation" boxes
 
-5. Create a blog entry to announce release 
+5. The releases page http://www.nsnam.org must be updated (including
+source tarball link)
+
+6. Create a blog entry to announce release 
 
 ns-3 wiki edits
 ---------------
diff -Naur ns-3.17/doc/tutorial/source/building-topologies.rst ns-3.18/doc/tutorial/source/building-topologies.rst
--- ns-3.17/doc/tutorial/source/building-topologies.rst	2013-05-13 06:16:04.000000000 -0700
+++ ns-3.18/doc/tutorial/source/building-topologies.rst	2013-10-26 07:07:29.451364379 -0700
@@ -1,5 +1,5 @@
 .. include:: replace.txt
-
+.. highlight:: cpp
 
 Building Topologies
 -------------------
@@ -337,10 +337,10 @@
 the ``first.cc`` example.  If you are in the top-level directory of the
 repository you just type,
 
-::
+.. sourcecode:: bash
 
-  cp examples/tutorial/second.cc scratch/mysecond.cc
-  ./waf
+  $ cp examples/tutorial/second.cc scratch/mysecond.cc
+  $ ./waf
 
 Warning:  We use the file ``second.cc`` as one of our regression tests to
 verify that it works exactly as we think it should in order to make your
@@ -353,15 +353,15 @@
 still have the NS_LOG variable set, so go ahead and clear that variable and
 run the program.
 
-::
+.. sourcecode:: bash
 
-  export NS_LOG=
-  ./waf --run scratch/mysecond
+  $ export NS_LOG=
+  $ ./waf --run scratch/mysecond
 
 Since we have set up the UDP echo applications to log just as we did in 
 ``first.cc``, you will see similar output when you run the script.
 
-::
+.. sourcecode:: text
 
   Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
   Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
@@ -381,7 +381,7 @@
 If you now go and look in the top level directory, you will find three trace 
 files:
 
-::
+.. sourcecode:: text
 
   second-0-0.pcap  second-1-0.pcap  second-2-0.pcap
 
@@ -403,13 +403,13 @@
 Now, let's follow the echo packet through the internetwork.  First, do a 
 tcpdump of the trace file for the leftmost point-to-point node --- node zero.
 
-::
+.. sourcecode:: bash
 
-  tcpdump -nn -tt -r second-0-0.pcap
+  $ tcpdump -nn -tt -r second-0-0.pcap
 
 You should see the contents of the pcap file displayed:
 
-::
+.. sourcecode:: text
 
   reading from file second-0-0.pcap, link-type PPP (PPP)
   2.000000 IP 10.1.1.1.49153 > 10.1.2.4.9: UDP, length 1024
@@ -422,14 +422,14 @@
 point-to-point link and be received by the point-to-point net device on node 
 one.  Let's take a look:
 
-::
+.. sourcecode:: bash
 
-  tcpdump -nn -tt -r second-1-0.pcap
+  $ tcpdump -nn -tt -r second-1-0.pcap
 
 You should now see the pcap trace output of the other side of the point-to-point
 link:
 
-::
+.. sourcecode:: text
 
   reading from file second-1-0.pcap, link-type PPP (PPP)
   2.003686 IP 10.1.1.1.49153 > 10.1.2.4.9: UDP, length 1024
@@ -444,13 +444,13 @@
 Remember that we selected node 2 as the promiscuous sniffer node for the CSMA
 network so let's then look at second-2-0.pcap and see if its there.
 
-::
+.. sourcecode:: bash
 
-  tcpdump -nn -tt -r second-2-0.pcap
+  $ tcpdump -nn -tt -r second-2-0.pcap
 
 You should now see the promiscuous dump of node two, device zero:
 
-::
+.. sourcecode:: text
 
   reading from file second-2-0.pcap, link-type EN10MB (Ethernet)
   2.003696 arp who-has 10.1.2.4 (ff:ff:ff:ff:ff:ff) tell 10.1.2.1
@@ -471,7 +471,7 @@
 
 This exchange is seen in the following lines,
 
-::
+.. sourcecode:: text
 
   2.003696 arp who-has 10.1.2.4 (ff:ff:ff:ff:ff:ff) tell 10.1.2.1
   2.003707 arp reply 10.1.2.4 is-at 00:00:00:00:00:06
@@ -479,7 +479,7 @@
 Then node one, device one goes ahead and sends the echo packet to the UDP echo
 server at IP address 10.1.2.4. 
 
-::
+.. sourcecode:: text
 
   2.003801 IP 10.1.1.1.49153 > 10.1.2.4.9: UDP, length 1024
 
@@ -490,40 +490,41 @@
 doesn't know the MAC address of the first CSMA node, so it has to ARP for it
 just like the first CSMA node had to do.
 
-::
+.. sourcecode:: text
 
   2.003811 arp who-has 10.1.2.1 (ff:ff:ff:ff:ff:ff) tell 10.1.2.4
   2.003822 arp reply 10.1.2.1 is-at 00:00:00:00:00:03
 
 The server then sends the echo back to the forwarding node.
 
-::
+.. sourcecode:: text
 
   2.003915 IP 10.1.2.4.9 > 10.1.1.1.49153: UDP, length 1024
 
 Looking back at the rightmost node of the point-to-point link,
 
-::
+.. sourcecode:: bash
 
-  tcpdump -nn -tt -r second-1-0.pcap
+  $ tcpdump -nn -tt -r second-1-0.pcap
 
 You can now see the echoed packet coming back onto the point-to-point link as
 the last line of the trace dump.
 
-::
+.. sourcecode:: text
 
   reading from file second-1-0.pcap, link-type PPP (PPP)
   2.003686 IP 10.1.1.1.49153 > 10.1.2.4.9: UDP, length 1024
   2.003915 IP 10.1.2.4.9 > 10.1.1.1.49153: UDP, length 1024
 
 Lastly, you can look back at the node that originated the echo
-::
 
-  tcpdump -nn -tt -r second-0-0.pcap
+.. sourcecode:: bash
+
+  $ tcpdump -nn -tt -r second-0-0.pcap
 
 and see that the echoed packet arrives back at the source at 2.007602 seconds,
 
-::
+.. sourcecode:: text
 
   reading from file second-0-0.pcap, link-type PPP (PPP)
   2.000000 IP 10.1.1.1.49153 > 10.1.2.4.9: UDP, length 1024
@@ -535,13 +536,13 @@
 ``first.cc`` example.  Try running the program with the number of "extra" 
 devices set to four:
 
-::
+.. sourcecode:: bash
 
-  ./waf --run "scratch/mysecond --nCsma=4"
+  $ ./waf --run "scratch/mysecond --nCsma=4"
 
 You should now see,
 
-::
+.. sourcecode:: text
 
   Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
   Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
@@ -602,20 +603,20 @@
 Let's clear the old trace files out of the top-level directory to avoid confusion
 about what is going on,
 
-::
+.. sourcecode:: bash
 
-  rm *.pcap
-  rm *.tr
+  $ rm *.pcap
+  $ rm *.tr
 
 If you build the new script and run the simulation setting ``nCsma`` to 100,
 
-::
+.. sourcecode:: bash
 
-  ./waf --run "scratch/mysecond --nCsma=100"
+  $ ./waf --run "scratch/mysecond --nCsma=100"
 
 you will see the following output:
 
-::
+.. sourcecode:: text
 
   Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
   Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
@@ -628,7 +629,7 @@
 having 100 "extra" CSMA nodes with the echo server on the last one.  If you
 list the pcap files in the top level directory you will see,
 
-::
+.. sourcecode:: text
 
   second-0-0.pcap  second-100-0.pcap  second-101-0.pcap
 
@@ -643,15 +644,15 @@
 also requested a non-promiscuous trace for the next-to-last node.  Go ahead and
 take a look at the ``tcpdump`` for ``second-100-0.pcap``.
 
-::
+.. sourcecode:: bash
 
-  tcpdump -nn -tt -r second-100-0.pcap
+  $ tcpdump -nn -tt -r second-100-0.pcap
 
 You can now see that node 100 is really a bystander in the echo exchange.  The
 only packets that it receives are the ARP requests which are broadcast to the
 entire CSMA network.
 
-::
+.. sourcecode:: text
 
   reading from file second-100-0.pcap, link-type EN10MB (Ethernet)
   2.003696 arp who-has 10.1.2.101 (ff:ff:ff:ff:ff:ff) tell 10.1.2.1
@@ -659,13 +660,13 @@
 
 Now take a look at the ``tcpdump`` for ``second-101-0.pcap``.
 
-::
+.. sourcecode:: bash
 
-  tcpdump -nn -tt -r second-101-0.pcap
+  $ tcpdump -nn -tt -r second-101-0.pcap
 
 You can now see that node 101 is really the participant in the echo exchange.
 
-::
+.. sourcecode:: text
 
   reading from file second-101-0.pcap, link-type EN10MB (Ethernet)
   2.003696 arp who-has 10.1.2.101 (ff:ff:ff:ff:ff:ff) tell 10.1.2.1
@@ -1180,16 +1181,16 @@
 the ``second.cc`` example.  If you are in the top-level directory of the
 repository you would type,
 
-::
+.. sourcecode:: bash
 
-  cp examples/third.cc scratch/mythird.cc
-  ./waf
-  ./waf --run scratch/mythird
+  $ cp examples/third.cc scratch/mythird.cc
+  $ ./waf
+  $ ./waf --run scratch/mythird
 
 Again, since we have set up the UDP echo applications just as we did in the 
 ``second.cc`` script, you will see similar output.
 
-::
+.. sourcecode:: text
 
   Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
   Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
@@ -1209,7 +1210,7 @@
 If you now go and look in the top level directory, you will find four trace 
 files from this simulation, two from node zero and two from node one:
 
-::
+.. sourcecode:: text
 
   third-0-0.pcap  third-0-1.pcap  third-1-0.pcap  third-1-1.pcap
 
@@ -1224,13 +1225,13 @@
 Since the echo client is on the Wifi network, let's start there.  Let's take
 a look at the promiscuous (monitor mode) trace we captured on that network.
 
-::
+.. sourcecode:: bash
 
-  tcpdump -nn -tt -r third-0-1.pcap
+  $ tcpdump -nn -tt -r third-0-1.pcap
 
 You should see some wifi-looking contents you haven't seen here before:
 
-::
+.. sourcecode:: text
 
   reading from file third-0-1.pcap, link-type IEEE802_11 (802.11)
   0.000025 Beacon (ns-3-ssid) [6.0* 9.0 12.0 18.0 24.0 36.0 48.0 54.0 Mbit] IBSS
@@ -1258,13 +1259,13 @@
 
 Now, look at the pcap file of the right side of the point-to-point link,
 
-::
+.. sourcecode:: bash
 
-  tcpdump -nn -tt -r third-0-0.pcap
+  $ tcpdump -nn -tt -r third-0-0.pcap
 
 Again, you should see some familiar looking contents:
 
-::
+.. sourcecode:: text
 
   reading from file third-0-0.pcap, link-type PPP (PPP)
   2.002160 IP 10.1.3.3.49153 > 10.1.2.4.9: UDP, length 1024
@@ -1275,13 +1276,13 @@
 
 Now, look at the pcap file of the right side of the point-to-point link,
 
-::
+.. sourcecode:: bash
 
-  tcpdump -nn -tt -r third-1-0.pcap
+  $ tcpdump -nn -tt -r third-1-0.pcap
 
 Again, you should see some familiar looking contents:
 
-::
+.. sourcecode:: text
 
   reading from file third-1-0.pcap, link-type PPP (PPP)
   2.005846 IP 10.1.3.3.49153 > 10.1.2.4.9: UDP, length 1024
@@ -1294,13 +1295,13 @@
 The echo server is on the CSMA network, let's look at the promiscuous trace 
 there:
 
-::
+.. sourcecode:: bash
 
-  tcpdump -nn -tt -r third-1-1.pcap
+  $ tcpdump -nn -tt -r third-1-1.pcap
 
 You should see some familiar looking contents:
 
-::
+.. sourcecode:: text
 
   reading from file third-1-1.pcap, link-type EN10MB (Ethernet)
   2.005846 ARP, Request who-has 10.1.2.4 (ff:ff:ff:ff:ff:ff) tell 10.1.2.1, length 50
@@ -1382,7 +1383,7 @@
 If you now run the simulation, you will see the course changes displayed as 
 they happen.
 
-::
+.. sourcecode:: text
 
   Build finished successfully (00:00:01)
   /NodeList/7/$ns3::MobilityModel/CourseChange x = 10, y = 0
diff -Naur ns-3.17/doc/tutorial/source/conceptual-overview.rst ns-3.18/doc/tutorial/source/conceptual-overview.rst
--- ns-3.17/doc/tutorial/source/conceptual-overview.rst	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/tutorial/source/conceptual-overview.rst	2013-10-26 07:07:29.451364379 -0700
@@ -1,5 +1,5 @@
 .. include:: replace.txt
-
+.. highlight:: cpp
 
 Conceptual Overview
 -------------------
@@ -153,7 +153,7 @@
 directory.  Change into that release directory, and you should find a 
 directory structure something like the following:
 
-::
+.. sourcecode:: bash
 
   AUTHORS       examples       scratch        utils      waf.bat*
   bindings      LICENSE        src            utils.py   waf-tools
@@ -250,16 +250,16 @@
 Since you are, of course, following this tutorial religiously, you will 
 already have done a
 
-::
+.. sourcecode:: bash
 
-  ./waf -d debug --enable-examples --enable-tests configure
+  $ ./waf -d debug --enable-examples --enable-tests configure
 
 in order to configure the project to perform debug builds that include 
 examples and tests.  You will also have done a
 
-::
+.. sourcecode:: bash
 
-  ./waf
+  $ ./waf
 
 to build the project.  So now if you look in the directory 
 ``../../build/debug/ns3`` you will find the four module include files shown 
@@ -340,6 +340,21 @@
 the first function run.  There is nothing at all special here.  Your 
 |ns3| script is just a C++ program.
 
+The next line sets the time resolution to one nanosecond, which happens
+to be the default value:
+
+::
+
+    Time::SetResolution (Time::NS);
+
+The resolution is the smallest time value that can be represented (as well as
+the smallest representable difference between two time values).
+You can change the resolution exactly once.  The mechanism enabling this
+flexibility is somewhat memory hungry, so once the resolution has been
+set explicitly we release the memory, preventing further updates.   (If
+you don't set the resolution explicitly, it will default to one nanosecond,
+and the memory will be released when the simulation starts.)
+
 The next two lines of the script are used to enable two logging components that
 are built into the Echo Client and Echo Server applications:
 
@@ -735,21 +750,21 @@
 built if you run Waf.  Let's try it.  Copy ``examples/tutorial/first.cc`` into 
 the ``scratch`` directory after changing back into the top level directory.
 
-::
+.. sourcecode:: bash
 
-  cd ../..
-  cp examples/tutorial/first.cc scratch/myfirst.cc
+  $ cd ../..
+  $ cp examples/tutorial/first.cc scratch/myfirst.cc
 
 Now build your first example script using waf:
 
-::
+.. sourcecode:: bash
 
-  ./waf
+  $ ./waf
 
 You should see messages reporting that your ``myfirst`` example was built
 successfully.
 
-::
+.. sourcecode:: bash
 
   Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
   [614/708] cxx: scratch/myfirst.cc -> build/debug/scratch/myfirst_3.o
@@ -760,13 +775,13 @@
 You can now run the example (note that if you build your program in the scratch
 directory you must run it out of the scratch directory):
 
-::
+.. sourcecode:: bash
 
-  ./waf --run scratch/myfirst
+  $ ./waf --run scratch/myfirst
 
 You should see some output:
 
-::
+.. sourcecode:: bash
 
   Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
   Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
@@ -794,14 +809,14 @@
 
 At the top of the page, you will see a number of links,
 
-::
+.. sourcecode:: text
 
   summary | shortlog | changelog | graph | tags | files 
 
 Go ahead and select the ``files`` link.  This is what the top-level of
 most of our *repositories* will look:
 
-::
+.. sourcecode:: text
 
   drwxr-xr-x                               [up]     
   drwxr-xr-x                               bindings python  files
diff -Naur ns-3.17/doc/tutorial/source/conf.py ns-3.18/doc/tutorial/source/conf.py
--- ns-3.17/doc/tutorial/source/conf.py	2013-05-14 07:34:00.000000000 -0700
+++ ns-3.18/doc/tutorial/source/conf.py	2013-10-26 07:07:29.451364379 -0700
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = 'ns-3.17'
+version = 'ns-3.18'
 # The full version, including alpha/beta/rc tags.
-release = 'ns-3.17'
+release = 'ns-3.18'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -197,7 +197,7 @@
 #latex_show_urls = False
 
 # Additional stuff for the LaTeX preamble.
-#latex_preamble = ''
+latex_preamble = '\usepackage{amssymb}'
 
 # Documents to append as an appendix to all manuals.
 #latex_appendices = []
diff -Naur ns-3.17/doc/tutorial/source/data-collection.rst ns-3.18/doc/tutorial/source/data-collection.rst
--- ns-3.17/doc/tutorial/source/data-collection.rst	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/doc/tutorial/source/data-collection.rst	2013-10-26 07:07:29.447364379 -0700
@@ -0,0 +1,446 @@
+.. include:: replace.txt
+.. highlight:: cpp
+.. role:: raw-role(raw)
+   :format: html latex
+
+Data Collection
+---------------
+
+Our final tutorial chapter introduces some components that were added
+to |ns3| in version 3.18, and that are still under development.  This
+tutorial section is also a work-in-progress.
+
+Motivation
+**********
+
+One of the main points of running simulations is to generate output data, 
+either for research purposes or simply to learn about the system.
+In the previous chapter, we introduced the tracing subsystem and
+the example ``sixth.cc``. from which PCAP or ASCII trace files are 
+generated.  These traces are valuable for data analysis using a
+variety of external tools, and for many users, such output data is
+a preferred means of gathering data (for analysis by external tools).
+
+However, there are also use cases for more than trace file generation,
+including the following:
+
+* generation of data that does not map well to PCAP or ASCII traces, such
+  as non-packet data (e.g. protocol state machine transitions),
+* large simulations for which the disk I/O requirements for generating
+  trace files is prohibitive or cumbersome, and
+* the need for *online*  data reduction or computation, during the course
+  of the simulation.  A good example of this is to define a termination
+  condition for the simulation, to tell it when to stop when it has 
+  received enough data to form a narrow-enough confidence interval around
+  the estimate of some parameter.
+
+The |ns3| data collection framework is designed to provide these
+additional capabilities beyond trace-based output.  We recommend
+that the reader interested in this topic consult the |ns3| Manual
+for a more detailed treatment of this framework; here, we summarize
+with an example program some of the developing capabilities. 
+
+Example Code
+************
+
+The tutorial example ``examples/tutorial/seventh.cc`` resembles the
+``sixth.cc`` example we previously reviewed, except for a few changes.
+First, it has been enabled for IPv6 support with a command-line option:
+
+::   
+
+  CommandLine cmd;
+  cmd.AddValue ("useIpv6", "Use Ipv6", useV6);
+  cmd.Parse (argc, argv);
+
+If the user specifies ``useIpv6``, option, the program will be run
+using IPv6 instead of IPv4.  The ``help`` option, available on all |ns3| 
+programs that support the CommandLine object as shown above, can
+be invoked as follows (please note the use of double quotes):
+
+::
+
+  ./waf --run "seventh --help"
+
+which produces:
+
+::
+
+  ns3-dev-seventh-debug [Program Arguments] [General Arguments]
+  
+  Program Arguments:
+      --useIpv6:  Use Ipv6 [false]
+  
+  General Arguments:
+      --PrintGlobals:              Print the list of globals.
+      --PrintGroups:               Print the list of groups.
+      --PrintGroup=[group]:        Print all TypeIds of group.
+      --PrintTypeIds:              Print all TypeIds.
+      --PrintAttributes=[typeid]:  Print all attributes of typeid.
+      --PrintHelp:                 Print this help message.
+
+This default (use of IPv4, since useIpv6 is false) can be changed by 
+toggling the boolean value as follows:
+
+::
+
+  ./waf --run "seventh --useIpv6=1"
+
+and have a look at the pcap generated, such as with ``tcpdump``:
+
+::
+
+  tcpdump -r seventh.pcap -nn -tt
+
+This has been a short digression into IPv6 support and the command line,
+which was also introduced earlier in this tutorial.  For a dedicated 
+example of command line usage, please see 
+``src/core/examples/command-line-example.cc``.
+
+Now back to data collection.  In the ``examples/tutorial/`` directory, 
+type the following command: ``diff -u sixth.cc seventh.cc``, and examine
+some of the new lines of this diff:
+
+::
+
+  +  std::string probeName;
+  +  std::string probeTrace;
+  +  if (useV6 == false)
+  +    {
+     ...
+  +      probeName = "ns3::Ipv4PacketProbe";
+  +      probeTrace = "/NodeList/*/$ns3::Ipv4L3Protocol/Tx";
+  +    }
+  +  else
+  +    {
+     ...
+  +      probeName = "ns3::Ipv6PacketProbe";
+  +      probeTrace = "/NodeList/*/$ns3::Ipv6L3Protocol/Tx";
+  +    }
+   ...
+  +   // Use GnuplotHelper to plot the packet byte count over time
+  +   GnuplotHelper plotHelper;
+  + 
+  +   // Configure the plot.  The first argument is the file name prefix
+  +   // for the output files generated.  The second, third, and fourth
+  +   // arguments are, respectively, the plot title, x-axis, and y-axis labels
+  +   plotHelper.ConfigurePlot ("seventh-packet-byte-count",
+  +                             "Packet Byte Count vs. Time",
+  +                             "Time (Seconds)",
+  +                             "Packet Byte Count");
+  + 
+  +   // Specify the probe type, probe path (in configuration namespace), and
+  +   // probe output trace source ("OutputBytes") to plot.  The fourth argument
+  +   // specifies the name of the data series label on the plot.  The last
+  +   // argument formats the plot by specifying where the key should be placed.
+  +   plotHelper.PlotProbe (probeName,
+  +                         probeTrace,
+  +                         "OutputBytes",
+  +                         "Packet Byte Count",
+  +                         GnuplotAggregator::KEY_BELOW);
+  + 
+  +   // Use FileHelper to write out the packet byte count over time
+  +   FileHelper fileHelper;
+  + 
+  +   // Configure the file to be written, and the formatting of output data.
+  +   fileHelper.ConfigureFile ("seventh-packet-byte-count",
+  +                             FileAggregator::FORMATTED);
+  + 
+  +   // Set the labels for this formatted output file.
+  +   fileHelper.Set2dFormat ("Time (Seconds) = %.3e\tPacket Byte Count = %.0f");
+  + 
+  +   // Specify the probe type, probe path (in configuration namespace), and
+  +   // probe output trace source ("OutputBytes") to write.
+  +   fileHelper.WriteProbe (probeName,
+  +                          probeTrace,
+  +                          "OutputBytes");
+  + 
+      Simulator::Stop (Seconds (20));
+      Simulator::Run ();
+      Simulator::Destroy ();
+  
+
+The careful reader will have noticed, when testing the IPv6 command
+line attribute, that ``seventh.cc`` had created a number of new output files:
+
+::
+
+  seventh-packet-byte-count-0.txt
+  seventh-packet-byte-count-1.txt
+  seventh-packet-byte-count.dat
+  seventh-packet-byte-count.plt
+  seventh-packet-byte-count.png
+  seventh-packet-byte-count.sh
+
+These were created by the additional statements introduced above; in
+particular, by a GnuplotHelper and a FileHelper.  This data was produced
+by hooking the data collection components to |ns3| trace sources, and
+marshaling the data into a formatted ``gnuplot`` and into a formatted
+text file.  In the next sections, we'll review each of these.
+
+GnuplotHelper
+*************
+
+The GnuplotHelper is an |ns3| helper object aimed at the production of
+``gnuplot`` plots with as few statements as possible, for common cases.
+It hooks |ns3| trace sources with data types supported by the 
+data collection system.  Not all |ns3| trace sources data types are 
+supported, but many of the common trace types are, including TracedValues 
+with plain old data (POD) types.
+
+Let's look at the output produced by this helper:
+
+::
+  
+  seventh-packet-byte-count.dat
+  seventh-packet-byte-count.plt
+  seventh-packet-byte-count.sh
+
+The first is a gnuplot data file with a series of space-delimited 
+timestamps and packet byte counts.  We'll cover how this particular
+data output was configured below, but let's continue with the output
+files.  The file ``seventh-packet-byte-count.plt`` is a gnuplot plot file,
+that can be opened from within gnuplot.  Readers who understand gnuplot
+syntax can see that this will produce a formatted output PNG file named
+``seventh-packet-byte-count.png``.   Finally, a small shell script
+``seventh-packet-byte-count.sh`` runs this plot file through gnuplot
+to produce the desired PNG (which can be viewed in an image editor); that
+is, the command:
+
+:: 
+
+  sh seventh-packet-byte-count.sh
+
+will yield ``seventh-packet-byte-count.png``.  Why wasn't this PNG
+produced in the first place?  The answer is that by providing the 
+plt file, the user can hand-configure the result if desired, before
+producing the PNG.
+
+The PNG image title states that this plot is a plot of 
+"Packet Byte Count vs. Time", and that it is plotting the probed data
+corresponding to the trace source path:
+
+::
+
+  /NodeList/*/$ns3::Ipv6L3Protocol/Tx
+
+Note the wild-card in the trace path.  In summary, what this plot is 
+capturing is the plot of packet bytes observed at the transmit trace
+source of the Ipv6L3Protocol object; largely 596-byte TCP segments
+in one direction, and 60-byte TCP acks in the other (two node
+trace sources were matched by this trace source).
+
+How was this configured?  A few statements need to be provided.  First,
+the GnuplotHelper object must be declared and configured:
+
+::
+  
+  +  // Use GnuplotHelper to plot the packet byte count over time
+  +  GnuplotHelper plotHelper;
+  +
+  +  // Configure the plot.  The first argument is the file name prefix
+  +  // for the output files generated.  The second, third, and fourth
+  +  // arguments are, respectively, the plot title, x-axis, and y-axis labels
+  +  plotHelper.ConfigurePlot ("seventh-packet-byte-count",
+  +                            "Packet Byte Count vs. Time",
+  +                            "Time (Seconds)",
+  +                            "Packet Byte Count");
+
+
+To this point, an empty plot has been configured.  The filename prefix
+is the first argument, the plot title is the second, the x-axis label
+the third, and the y-axis label the fourth argument.
+
+The next step is to configure the data, and here is where the trace
+source is hooked.  First, note above in the program we declared a few 
+variables for later use:
+
+::
+
+  +  std::string probeName;
+  +  std::string probeTrace;
+  +  probeName = "ns3::Ipv6PacketProbe";
+  +  probeTrace = "/NodeList/*/$ns3::Ipv6L3Protocol/Tx";
+
+We use them here:
+
+::
+   
+  +  // Specify the probe type, probe path (in configuration namespace), and
+  +  // probe output trace source ("OutputBytes") to plot.  The fourth argument
+  +  // specifies the name of the data series label on the plot.  The last
+  +  // argument formats the plot by specifying where the key should be placed.
+  +  plotHelper.PlotProbe (probeName,
+  +                        probeTrace,
+  +                        "OutputBytes",
+  +                        "Packet Byte Count",
+  +                        GnuplotAggregator::KEY_BELOW);
+
+The first two arguments are the name of the probe type and the probe trace.
+These two are probably the hardest to determine when you try to use
+this framework to plot other traces.  The probe trace here is the ``Tx``
+trace source of class ``Ipv6L3Protocol``.  When we examine this class
+implementation (``src/internet/model/ipv6-l3-protocol.cc``) we can
+observe:
+
+::
+
+    .AddTraceSource ("Tx", "Send IPv6 packet to outgoing interface.",
+                     MakeTraceSourceAccessor (&Ipv6L3Protocol::m_txTrace))
+
+This says that ``Tx`` is a name for variable ``m_txTrace``, which has
+a declaration of:
+
+::
+
+  /**
+   * \brief Callback to trace TX (transmission) packets.
+   */
+  TracedCallback<Ptr<const Packet>, Ptr<Ipv6>, uint32_t> m_txTrace;
+
+It turns out that this specific trace source signature is supported
+by a Probe class (what we need here) of class Ipv6PacketProbe.
+See the files ``src/internet/model/ipv6-packet-probe.{h,cc}``.
+
+So, in the PlotProbe statement above, we see that the statement is
+hooking the trace source (identified by path string) with a matching
+|ns3| Probe type of ``Ipv6PacketProbe``.  If we did not support
+this probe type (matching trace source signature), we could have not
+used this statement (although some more complicated lower-level statements
+could have been used, as described in the manual).
+
+The Ipv6PacketProbe exports, itself, some trace sources that extract
+the data out of the probed Packet object:
+
+::
+  
+  TypeId
+  Ipv6PacketProbe::GetTypeId ()
+  {
+    static TypeId tid = TypeId ("ns3::Ipv6PacketProbe")
+      .SetParent<Probe> ()
+      .AddConstructor<Ipv6PacketProbe> ()
+      .AddTraceSource ( "Output",
+                        "The packet plus its IPv6 object and interface that serve as the output for this probe",
+                        MakeTraceSourceAccessor (&Ipv6PacketProbe::m_output))
+      .AddTraceSource ( "OutputBytes",
+                        "The number of bytes in the packet",
+                        MakeTraceSourceAccessor (&Ipv6PacketProbe::m_outputBytes))
+    ;
+    return tid;
+  }
+  
+
+The third argument of our PlotProbe statement specifies that we are
+interested in the number of bytes in this packet; specifically, the
+"OutputBytes" trace source of Ipv6PacketProbe.
+Finally, the last two arguments of the statement provide the plot
+legend for this data series ("Packet Byte Count"), and an optional
+gnuplot formatting statement (GnuplotAggregator::KEY_BELOW) that we want 
+the plot key to be inserted below the plot.  Other options include
+NO_KEY, KEY_INSIDE, and KEY_ABOVE.
+
+
+Supported Trace Types
+*********************
+
+The following traced values are supported with Probes as of this writing:
+
+  +------------------+-------------------+------------------------------------+
+  | TracedValue type |   Probe type      |  File                              |
+  +==================+=========+=========+====================================+
+  | double           | DoubleProbe       | stats/model/double-probe.h         |
+  +------------------+-------------------+------------------------------------+
+  | uint8_t          | Uinteger8Probe    | stats/model/uinteger-8-probe.h     |
+  +------------------+-------------------+------------------------------------+
+  | uint16_t         | Uinteger16Probe   | stats/model/uinteger-16-probe.h    |
+  +------------------+-------------------+------------------------------------+
+  | uint32_t         | Uinteger32Probe   | stats/model/uinteger-32-probe.h    |
+  +------------------+-------------------+------------------------------------+
+  | bool             | BooleanProbe      | stats/model/uinteger-16-probe.h    |
+  +------------------+-------------------+------------------------------------+
+
+The following TraceSource types are supported by Probes as of this writing:
+
+  +------------------------------------------+------------------------+---------------+----------------------------------------------------+
+  | TracedSource type                        |   Probe type           | Probe outputs |  File                                              |
+  +==========================================+========================+===============+====================================================+
+  | Ptr<const Packet>                        | PacketProbe            | OutputBytes   | network/utils/packet-probe.h                       |
+  +------------------------------------------+------------------------+---------------+----------------------------------------------------+
+  | Ptr<const Packet>, Ptr<Ipv4>, uint32_t   | Ipv4PacketProbe        | OutputBytes   | internet/model/ipv4-packet-probe.h                 |
+  +------------------------------------------+------------------------+---------------+----------------------------------------------------+
+  | Ptr<const Packet>, Ptr<Ipv6>, uint32_t   | Ipv6PacketProbe        | OutputBytes   | internet/model/ipv6-packet-probe.h                 |
+  +------------------------------------------+------------------------+---------------+----------------------------------------------------+
+  | Ptr<const Packet>, Ptr<Ipv6>, uint32_t   | Ipv6PacketProbe        | OutputBytes   | internet/model/ipv6-packet-probe.h                 |
+  +------------------------------------------+------------------------+---------------+----------------------------------------------------+
+  | Ptr<const Packet>, const Address&        | ApplicationPacketProbe | OutputBytes   | applications/model/application-packet-probe.h      |
+  +------------------------------------------+------------------------+---------------+----------------------------------------------------+
+
+As can be seen, only a few trace sources are supported, and they are all 
+oriented towards outputting the Packet size (in bytes).  However,
+most of the fundamental data types available as TracedValues can be
+supported with these helpers.
+
+FileHelper
+**********
+
+The FileHelper class is just a variation of the previous GnuplotHelper
+example.  The example program provides formatted output of the
+same timestamped data, such as follows:
+
+::
+  
+  Time (Seconds) = 9.312e+00	Packet Byte Count = 596
+  Time (Seconds) = 9.312e+00	Packet Byte Count = 564
+
+Two files are provided, one for node "0" and one for node "1" as can
+be seen in the filenames.  Let's look at the code piece-by-piece:
+
+::
+
+  +   // Use FileHelper to write out the packet byte count over time
+  +   FileHelper fileHelper;
+  + 
+  +   // Configure the file to be written, and the formatting of output data.
+  +   fileHelper.ConfigureFile ("seventh-packet-byte-count",
+  +                             FileAggregator::FORMATTED);
+
+The file helper file prefix is the first argument, and a format specifier
+is next.
+Some other options for formatting include SPACE_SEPARATED, COMMA_SEPARATED,
+and TAB_SEPARATED.  Users are able to change the formatting (if
+FORMATTED is specified) with a format string such as follows:  
+
+::
+
+  + 
+  +   // Set the labels for this formatted output file.
+  +   fileHelper.Set2dFormat ("Time (Seconds) = %.3e\tPacket Byte Count = %.0f");
+
+Finally, the probe of interest must be hooked.  Again, the probeName and
+probeTrace variables in this example are used, and the probe's output
+trace source "OutputBytes" is hooked:
+
+::
+
+  + 
+  +   // Specify the probe type, probe path (in configuration namespace), and
+  +   // probe output trace source ("OutputBytes") to write.
+  +   fileHelper.WriteProbe (probeName,
+  +                          probeTrace,
+  +                          "OutputBytes");
+  + 
+
+The wildcard fields in this trace source specifier match two trace sources.
+Unlike the GnuplotHelper example, in which two data series were overlaid
+on the same plot, here, two separate files are written to disk. 
+
+Summary
+*******
+
+Data collection support is new as of ns-3.18, and basic support for
+providing time series output has been added.  The basic pattern described
+above may be replicated within the scope of support of the existing
+probes and trace sources.  More capabilities including statistics
+processing will be added in future releases. 
+
diff -Naur ns-3.17/doc/tutorial/source/getting-started.rst ns-3.18/doc/tutorial/source/getting-started.rst
--- ns-3.17/doc/tutorial/source/getting-started.rst	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/tutorial/source/getting-started.rst	2013-10-26 07:07:29.447364379 -0700
@@ -1,5 +1,5 @@
-	.. include:: replace.txt
-
+.. include:: replace.txt
+.. highlight:: bash
 
 Getting Started
 ---------------
@@ -89,11 +89,11 @@
 
 ::
 
-  cd
-  mkdir workspace
-  cd workspace
-  wget http://www.nsnam.org/releases/ns-allinone-3.17.tar.bz2
-  tar xjf ns-allinone-3.17.tar.bz2
+  $ cd
+  $ mkdir workspace
+  $ cd workspace
+  $ wget http://www.nsnam.org/releases/ns-allinone-3.17.tar.bz2
+  $ tar xjf ns-allinone-3.17.tar.bz2
 
 If you change into the directory ``ns-allinone-3.17`` you should see a
 number of files:
@@ -123,10 +123,10 @@
 
 ::
 
-  cd
-  mkdir workspace
-  cd workspace
-  hg clone http://code.nsnam.org/bake
+  $ cd
+  $ mkdir workspace
+  $ cd workspace
+  $ hg clone http://code.nsnam.org/bake
 
 As the hg (Mercurial) command executes, you should see something like the 
 following displayed,
@@ -191,9 +191,9 @@
 
 ::
 
-   export BAKE_HOME=`pwd`/bake
-   export PATH=$PATH:$BAKE_HOME
-   export PYTHONPATH=$PYTHONPATH:$BAKE_HOME
+  $ export BAKE_HOME=`pwd`/bake
+  $ export PATH=$PATH:$BAKE_HOME
+  $ export PYTHONPATH=$PYTHONPATH:$BAKE_HOME
 
 However, setting environment variables is not strictly necessary to
 complete this tutorial, so we'll call bake directly by specifying the path 
@@ -203,14 +203,14 @@
 
 ::
 
-  ./bake.py configure -e ns-3-dev
+  $ ./bake.py configure -e ns-3.17
 
 Next, we'l ask bake to check whether we have enough tools to download
 various components.  Type:
 
 ::
 
-  ./bake.py check
+  $ ./bake.py check
 
 You should see something like the following,
 
@@ -232,7 +232,9 @@
    > patch tool - OK
    > autoreconf tool - OK
 
-   > Path searched for tools: /usr/lib64/qt-3.3/bin /usr/lib64/ccache /usr/local/bin /bin /usr/bin /usr/local/sbin /usr/sbin /sbin /home/tomh/bin bin
+   > Path searched for tools: /usr/lib64/qt-3.3/bin /usr/lib64/ccache
+   /usr/local/bin /bin /usr/bin /usr/local/sbin /usr/sbin /sbin
+   /home/tomh/bin bin
 
 In particular, download tools such as Mercurial, CVS, GIT, and Bazaar
 are our principal concerns at this point, since they allow us to fetch
@@ -286,7 +288,7 @@
 
 ::
 
-  ./build.py --enable-examples --enable-tests
+  $ ./build.py --enable-examples --enable-tests
 
 Because we are working with examples and tests in this tutorial, and
 because they are not built by default in |ns3|, the arguments for
@@ -323,7 +325,7 @@
    brite                     click                     openflow                 
    visualizer               
 
-   Leaving directory `./ns-3.17`
+   Leaving directory `./ns-3.17'
 
 Regarding the portion about modules not built:
 
@@ -347,7 +349,7 @@
 
 ::
 
-  ./bake.py build
+  $ ./bake.py build
 
 and you should see something like:
 
@@ -364,7 +366,7 @@
 
 ::
 
-  ./bake.py show
+  $ ./bake.py show
 
 This will list out the various dependencies of the packages you are
 trying to build.
@@ -392,8 +394,8 @@
 
 ::
 
-  ./waf clean
-  ./waf -d optimized --enable-examples --enable-tests configure
+  $ ./waf clean
+  $ ./waf -d optimized --enable-examples --enable-tests configure
 
 This runs Waf out of the local directory (which is provided as a convenience
 for you).  The first command to clean out the previous build is not 
@@ -476,15 +478,15 @@
 
 ::
 
-  ./waf clean
-  ./waf -d debug --enable-examples --enable-tests configure
+  $ ./waf clean
+  $ ./waf -d debug --enable-examples --enable-tests configure
 
 The build system is now configured and you can build the debug versions of 
 the |ns3| programs by simply typing
 
 ::
 
-  ./waf
+  $ ./waf
 
 Okay, sorry, I made you build the |ns3| part of the system twice,
 but now you know how to change the configuration and build optimized code.
@@ -498,7 +500,7 @@
 
 ::
 
-  ./waf configure -d debug --enable-sudo --enable-examples --enable-tests
+  $ ./waf configure -d debug --enable-sudo --enable-examples --enable-tests
 
 If you do this, waf will have run sudo to change the socket creator programs of the
 emulation code to run as root.  There are many other configure- and build-time options
@@ -506,7 +508,7 @@
 
 ::
 
-  ./waf --help
+  $ ./waf --help
 
 We'll use some of the testing-related commands in the next section.
 
@@ -517,7 +519,7 @@
 
 ::
 
-  ./waf configure -d debug -o build/debug --enable-examples --enable-tests
+  $ ./waf configure -d debug -o build/debug --enable-examples --enable-tests
 
 This allows users to work with multiple builds rather than always
 overwriting the last build.
@@ -528,16 +530,16 @@
 
 ::
 
-  CXX="clang++" ./waf configure
-  ./waf build
+  $ CXX="clang++" ./waf configure
+  $ ./waf build
 
 One can also set up waf to do distributed compilation with ``distcc`` in
 a similar way:
 
 ::
 
-  CXX="distcc g++" ./waf configure
-  ./waf build
+  $ CXX="distcc g++" ./waf configure
+  $ ./waf build
 
 More info on distcc and distributed compilation can be found on it's
 `project page
@@ -552,7 +554,7 @@
 
 ::
 
-  ./test.py -c core
+  $ ./test.py -c core
 
 These tests are run in parallel by waf. You should eventually
 see a report saying that,
@@ -617,7 +619,7 @@
 
 ::
 
-  ./waf --run hello-simulator
+  $ ./waf --run hello-simulator
 
 Waf first checks to make sure that the program is built correctly and 
 executes a build if required.  Waf then executes the program, which 
@@ -644,7 +646,7 @@
 
 ::
 
-  ./waf configure -d debug --enable-examples --enable-tests
+  $ ./waf configure -d debug --enable-examples --enable-tests
 
 to tell ``waf`` to build the debug versions of the |ns3| 
 programs that includes the examples and tests.  You must still build 
@@ -652,7 +654,7 @@
 
 ::
 
-  ./waf
+  $ ./waf
 
 Now, if you run the ``hello-simulator`` program, you should see the 
 expected output.
diff -Naur ns-3.17/doc/tutorial/source/index.rst ns-3.18/doc/tutorial/source/index.rst
--- ns-3.17/doc/tutorial/source/index.rst	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/tutorial/source/index.rst	2013-10-26 07:07:29.451364379 -0700
@@ -23,4 +23,5 @@
    tweaking
    building-topologies
    tracing
+   data-collection
    conclusion
diff -Naur ns-3.17/doc/tutorial/source/introduction.rst ns-3.18/doc/tutorial/source/introduction.rst
--- ns-3.17/doc/tutorial/source/introduction.rst	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/tutorial/source/introduction.rst	2013-10-26 07:07:29.451364379 -0700
@@ -22,21 +22,55 @@
 
 A few key points are worth noting at the onset:
 
-* Ns-3 is not an extension of `ns-2
+* |ns3| is open-source, and the project strives to maintain an 
+  open environment for researchers to contribute and share their software.  
+* |ns3| is not a backwards-compatible extension of `ns-2
   <http://www.isi.edu/nsnam/ns>`_; 
   it is a new simulator.  The two simulators are both written in C++ but 
   |ns3| is a new simulator that does not support the |ns2| APIs.  Some 
   models from |ns2| have already been ported from |ns2| to |ns3|. The 
   project will continue to maintain |ns2| while |ns3| is being built,
   and will study transition and integration mechanisms.
-* |ns3| is open-source, and the project strives to maintain an 
-  open environment for researchers to contribute and share their software.  
 
+About |ns3|
+***********
+
+|ns3| has been developed to provide an open, extensible network simulation
+platform, for networking research and education.  In brief, |ns3| provides
+models of how packet data networks work and perform, and provides a
+simulation engine for users to conduct simulation experiments.  Some of the
+reasons to use |ns3| include to perform studies that are more difficult
+or not possible to perform with real systems, to study system behavior in
+a highly controllled, reproducible environment, and to learn about how
+networks work.  Users will note that the available model set in |ns3| 
+focuses on modeling how Internet protocols and networks work, but
+|ns3| is not limited to Internet systems; several users are using
+|ns3| to model non-Internet-based systems.
+
+Many simulation tools exist for network simulation studies.  Below are
+a few distinguishing features of |ns3| in contrast to other tools.
+
+* |ns3| is designed as a set of libraries that can be combined together
+  and also with other external software libraries.  While some simulation
+  platforms provide users with a single, integrated graphical user 
+  interface environment in which all tasks are carried out, |ns3| is 
+  more modular in this regard.  Several external animators and
+  data analysis and visualization tools can be used with |ns3|.  However,
+  users should expect to work at the command line and with C++ and/or
+  Python software development tools. 
+* |ns3| is primarily used on Linux systems, although support exists
+  for FreeBSD, Cygwin (for Windows), and native Windows Visual Studio
+  support is in the process of being developed. 
+* |ns3| is not an officially supported software product of any company.
+  Support for |ns3| is done on a best-effort basis on the 
+  ns-3-users mailing list.
+ 
  
 For |ns2| Users
 ***************
 
-For those familiar with |ns2|, the most visible outward change when moving to 
+For those familiar with |ns2| (a popular tool that preceded |ns3|), 
+the most visible outward change when moving to 
 |ns3| is the choice of scripting language.  Programs in |ns2| are 
 scripted in OTcl and results of simulations can be visualized using the 
 Network Animator nam.  It is not possible to run a simulation
@@ -57,17 +91,38 @@
 as we proceed in this tutorial.
 
 A question that we often hear is "Should I still use |ns2| or move to
-|ns3|?"  The answer is that it depends.  |ns3| does not have
-all of the models that |ns2| currently has, but on the other hand, |ns3|
-does have new capabilities (such as handling multiple interfaces on nodes 
-correctly, use of IP addressing and more alignment with Internet
-protocols and designs, more detailed 802.11 models, etc.).  |ns2|
-models can sometimes be ported to |ns3| (a porting guide is under
-development).  The support available on the user mailing list, and the
-developer and maintainer activity, is higher for |ns3|.  A good guideline
-would be to look at both simulators, and in particular the models available
-for your research, but when in doubt or when starting new simulation 
-projects, choose the tool that is under more active development (|ns3|).
+|ns3|?"  In this author's opinion, unless the user is somehow vested
+in |ns2| (either based on existing personal comfort with and knowledge
+of |ns2|, or based on a specific simulation model that is only available
+in |ns2|), a user will be more productive with |ns3| for the following
+reasons:
+
+* |ns3| is actively maintained with an active, responsive users mailing 
+  list, while |ns2| is only lightly maintained and has not seen
+  significant development in its main code tree for over a decade.
+* |ns3| provides features not available in |ns2|, such as a implementation
+  code execution environment (allowing users to run real implementation
+  code in the simulator)
+* |ns3| provides a lower base level of abstraction compared with |ns2|,
+  allowing it to align better with how real systems are put together.
+  Some limitations found in |ns2| (such as supporting multiple types of
+  interfaces on nodes correctly) have been remedied in |ns3|.
+
+|ns2| has a more diverse set of contributed modules than does |ns3|, owing to
+its long history.  However, |ns3| has more detailed models in several
+popular areas of research (including sophisticated LTE and WiFi models),
+and its support of implementation code admits a very wide spectrum
+of high-fidelity models.  Users may be surprised to learn that the
+whole Linux networking stack can be encapsulated in an |ns3| node,
+using the Direct Code Execution (DCE) framework.  |ns2|
+models can sometimes be ported to |ns3|, particularly if they have been
+implemented in C++.  
+
+If in doubt, a good guideline would be to look at both simulators (as
+well as other simulators), and in particular the models available
+for your research, but keep in mind that your experience may be better
+in using the tool that is being actively developed and 
+maintained (|ns3|).
 
 Contributing
 ************
diff -Naur ns-3.17/doc/tutorial/source/replace.txt ns-3.18/doc/tutorial/source/replace.txt
--- ns-3.17/doc/tutorial/source/replace.txt	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/tutorial/source/replace.txt	2013-10-26 07:07:29.447364379 -0700
@@ -1,3 +1,5 @@
 .. |ns3| replace:: *ns-3*
 
 .. |ns2| replace:: *ns-2*
+
+.. |check| replace:: :math:`\checkmark`
diff -Naur ns-3.17/doc/tutorial/source/tracing.rst ns-3.18/doc/tutorial/source/tracing.rst
--- ns-3.17/doc/tutorial/source/tracing.rst	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/tutorial/source/tracing.rst	2013-10-26 07:07:29.447364379 -0700
@@ -1,5 +1,7 @@
 .. include:: replace.txt
-
+.. highlight:: cpp
+.. role:: raw-role(raw)
+   :format: html latex
 
 Tracing
 -------
@@ -15,12 +17,13 @@
 the information wanted.
 
 Using pre-defined bulk output mechanisms has the advantage of not requiring any
-changes to |ns3|, but it does require programming.  Often, pcap or NS_LOG
+changes to |ns3|, but it may require writing scripts to parse and filter
+for data of interest.  Often, pcap or NS_LOG
 output messages are gathered during simulation runs and separately run through 
 scripts that use grep, sed or awk to parse the messages and reduce and transform
 the data to a manageable form.  Programs must be written to do the 
 transformation, so this does not come for free.  Of course, if the information
-of interest in does not exist in any of the pre-defined output mechanisms,
+of interest does not exist in any of the pre-defined output mechanisms,
 this approach fails.
 
 If you need to add some tidbit of information to the pre-defined bulk mechanisms,
@@ -256,11 +259,11 @@
 The ``operator()`` eventually wanders down into the system and does something
 remarkably like the indirect call you just saw.  It provides zero or more 
 parameters (the call to "pfi" above passed one parameter to the target function
-``MyFunction``.
+``MyFunction``).
 
 The important difference that the tracing system adds is that for each trace
 source there is an internal list of Callbacks.  Instead of just making one 
-indirect call, a trace source may invoke any number of Callbacks.  When a trace
+indirect call, a trace source may invoke multiple.  When a trace
 sink expresses interest in notifications from a trace source, it basically just
 arranges to add its own function to the callback list.
 
@@ -309,7 +312,8 @@
 
 The file, ``traced-value.h`` brings in the required declarations for tracing
 of data that obeys value semantics.  In general, value semantics just means that
-you can pass the object around, not an address.  In order to use value semantics
+you can pass the object itself around, rather than passing the address of the
+object.  In order to use value semantics
 at all you have to have an object with an associated copy constructor and 
 assignment operator available.  We extend the requirements to talk about the set
 of operators that are pre-defined for plain-old-data (POD) types.  Operator=, 
@@ -426,21 +430,20 @@
 
 If you now build and run this example,
 
-::
+.. sourcecode:: bash
 
-  ./waf --run fourth
+  $ ./waf --run fourth
 
 you will see the output from the ``IntTrace`` function execute as soon as the
 trace source is hit:
 
-::
+.. sourcecode:: bash
 
   Traced 0 to 1234
 
 When we executed the code, ``myObject->m_myInt = 1234;``, the trace source 
 fired and automatically provided the before and after values to the trace sink.
-The function ``IntTrace`` then printed this to the standard output.  No 
-problem.
+The function ``IntTrace`` then printed this to the standard output.  
 
 Using the Config Subsystem to Connect to Trace Sources
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -449,7 +452,7 @@
 actually very rarely used in the system.  More typically, the ``Config``
 subsystem is used to allow selecting a trace source in the system using what is
 called a *config path*.  We saw an example of this in the previous section
-where we hooked the "CourseChange" event when we were playing with 
+where we hooked the "CourseChange" event when we were experimenting with 
 ``third.cc``.
 
 Recall that we defined a trace sink to print course change information from the
@@ -679,9 +682,9 @@
 who has already figured it out,  You should always try to copy someone else's
 working code before you start to write your own.  Try something like:
 
-::
+.. sourcecode:: bash
 
-  find . -name '*.cc' | xargs grep CourseChange | grep Connect
+  $ find . -name '*.cc' | xargs grep CourseChange | grep Connect
 
 and you may find your answer along with working code.  For example, in this
 case, ``./ns-3-dev/examples/wireless/mixed-wireless.cc`` has something
@@ -732,7 +735,7 @@
 You are looking at the same information for the RandomWalk2dMobilityModel; and
 the information you want is now right there in front of you in the Doxygen:
 
-::
+.. sourcecode:: bash
 
   This object is accessible through the following paths with Config::Set and Config::Connect: 
 
@@ -756,7 +759,7 @@
 
 Look further down in the ``GetTypeId`` doxygen.  You will find,
 
-::
+.. sourcecode:: bash
 
   No TraceSources defined for this type.
   TraceSources defined in parent class ns3::MobilityModel:
@@ -788,9 +791,9 @@
 who has already figured it out,  You should always try to copy someone else's
 working code.  Try something like:
 
-::
+.. sourcecode:: bash
 
-  find . -name '*.cc' | xargs grep CourseChange | grep Connect
+  $ find . -name '*.cc' | xargs grep CourseChange | grep Connect
 
 and you may find your answer along with working code.  For example, in this
 case, ``./ns-3-dev/examples/wireless/mixed-wireless.cc`` has something
@@ -812,7 +815,7 @@
     ...
   }
 
-Take my Word for It
+Take My Word for It
 ~~~~~~~~~~~~~~~~~~~
 
 If there are no examples to work from, this can be, well, challenging to 
@@ -899,9 +902,9 @@
 we know this declaration is going to have to be in some kind of header file,
 so just grep for it using:
 
-::
+.. sourcecode:: bash
 
-  find . -name '*.h' | xargs grep TracedCallback
+  $ find . -name '*.h' | xargs grep TracedCallback
 
 You'll see 124 lines fly by (I piped this through wc to see how bad it was).
 Although that may seem like it, that's not really a lot.  Just pipe the output
@@ -943,7 +946,7 @@
 
 You will see a comment at the top of the file that should be comforting:
 
-::
+.. sourcecode:: text
 
   An ns3::TracedCallback has almost exactly the same API as a normal ns3::Callback but
   instead of forwarding calls to a single function (as an ns3::Callback normally does),
@@ -1019,7 +1022,7 @@
 incomprehensible template code.  You will eventually come to some Doxygen for
 the Callback template class, though.  Fortunately, there is some English:
 
-::
+.. sourcecode:: text
 
   This class template implements the Functor Design Pattern.
   It is used to declare the type of a Callback:
@@ -1179,7 +1182,7 @@
 in the |ns3| Doxygen in the "C++ Constructs Used by All Modules" Module section.  If you scroll
 through the list, you will eventually find:
 
-::
+.. sourcecode:: bash
 
   ns3::TcpNewReno
   CongestionWindow: The TCP connection's congestion window
@@ -1189,9 +1192,9 @@
 variants are in files such as ``src/internet/model/tcp-newreno.cc``.  
 If you don't know this a priori, you can use the recursive grep trick:
 
-::
+.. sourcecode:: bash
 
-  find . -name '*.cc' | xargs grep -i tcp
+  $ find . -name '*.cc' | xargs grep -i tcp
 
 You will find page after page of instances of tcp pointing you to that file. 
 
@@ -1247,9 +1250,9 @@
 is to find some code that already hooks the "CongestionWindow" trace source
 and see if we can modify it.  As usual, grep is your friend:
 
-::
+.. sourcecode:: bash
 
-  find . -name '*.cc' | xargs grep CongestionWindow
+  $ find . -name '*.cc' | xargs grep CongestionWindow
 
 This will point out a couple of promising candidates: 
 ``examples/tcp/tcp-large-transfer.cc`` and 
@@ -1954,10 +1957,10 @@
 your distribution (in debug mode since it uses NS_LOG -- recall that optimized
 builds optimize out NS_LOGs) it will be waiting for you to run.
 
-::
+.. sourcecode:: bash
 
-  ./waf --run fifth
-  Waf: Entering directory `/home/craigdo/repos/ns-3-allinone-dev/ns-3-dev/build
+  $ ./waf --run fifth
+  Waf: Entering directory `/home/craigdo/repos/ns-3-allinone-dev/ns-3-dev/build'
   Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone-dev/ns-3-dev/build'
   'build' finished successfully (0.684s)
   1.20919 1072
@@ -1976,9 +1979,9 @@
 sure you can't wait to see the results of all of this work.  Let's redirect that
 output to a file called ``cwnd.dat``:
 
-::
+.. sourcecode:: bash
 
-  ./waf --run fifth > cwnd.dat 2>&1
+  $ ./waf --run fifth > cwnd.dat 2>&1
 
 Now edit up "cwnd.dat" in your favorite editor and remove the waf build status
 and drop lines, leaving only the traced data (you could also comment out the
@@ -1988,8 +1991,9 @@
 You can now run gnuplot (if you have it installed) and tell it to generate some 
 pretty pictures:
 
-::
+.. sourcecode:: bash
 
+  $ gnuplot
   gnuplot> set terminal png size 640,480
   gnuplot> set output "cwnd.png"
   gnuplot> plot "cwnd.dat" using 1:2 title 'Congestion Window' with linespoints
@@ -2140,7 +2144,7 @@
 since the packets are coming from our point-to-point device driver.  Other
 common data link types are DLT_EN10MB (10 MB Ethernet) appropriate for csma
 devices and DLT_IEEE802_11 (IEEE 802.11) appropriate for wifi devices.  These
-are defined in ``src/network/helper/trace-helper.h"`` if you are interested in seeing
+are defined in ``src/network/helper/trace-helper.h`` if you are interested in seeing 
 the list.  The entries in the list match those in ``bpf.h`` but we duplicate
 them to avoid a pcap source dependence.
 
@@ -2187,21 +2191,21 @@
 
 Now, back to the example.  If you now build and run this example,
 
-::
+.. sourcecode:: bash
 
-  ./waf --run sixth
+  $ ./waf --run sixth
 
 you will see the same messages appear as when you ran "fifth", but two new 
 files will appear in the top-level directory of your |ns3| distribution.
 
-::
+.. sourcecode:: bash
 
   sixth.cwnd  sixth.pcap
 
 Since "sixth.cwnd" is an ASCII text file, you can view it with ``cat``
 or your favorite file viewer.
 
-::
+.. sourcecode:: bash
 
   1.20919 536     1072
   1.21511 1072    1608
@@ -2215,7 +2219,7 @@
 
 Since "sixth.pcap" is a pcap file, you can fiew it with ``tcpdump``.
 
-::
+.. sourcecode:: bash
 
   reading from file ../../sixth.pcap, link-type PPP (PPP)
   1.251507 IP 10.1.1.1.49153 > 10.1.1.2.8080: . 17689:18225(536) ack 1 win 65535
@@ -2305,14 +2309,13 @@
 but we do strive to make them all work as similarly as possible; and whenever
 possible there are analogs for all methods in all classes.
 
-::
-
-                   | pcap | ascii |
-  -----------------+------+-------|
-  Device Helper    |      |       |
-  -----------------+------+-------|
-  Protocol Helper  |      |       |
-  -----------------+------+-------|
+  +-----------------+---------+---------+
+  |                 |  pcap   |  ascii  |
+  +=================+=========+=========+
+  | Device Helper   | |check| | |check| |
+  +-----------------+---------+---------+
+  | Protocol Helper | |check| | |check| |
+  +-----------------+---------+---------+
 
 We use an approach called a ``mixin`` to add tracing functionality to our 
 helper classes.  A ``mixin`` is a class that provides functionality to that
diff -Naur ns-3.17/doc/tutorial/source/tweaking.rst ns-3.18/doc/tutorial/source/tweaking.rst
--- ns-3.17/doc/tutorial/source/tweaking.rst	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/doc/tutorial/source/tweaking.rst	2013-10-26 07:07:29.451364379 -0700
@@ -1,4 +1,5 @@
 .. include:: replace.txt
+.. highlight:: cpp
 
 
 Tweaking
@@ -80,16 +81,16 @@
 first, just to get our bearings, go ahead and run the last script just as you 
 did previously,
 
-::
+.. sourcecode:: bash
 
-  ./waf --run scratch/myfirst
+  $ ./waf --run scratch/myfirst
 
 You should see the now familiar output of the first |ns3| example
 program
 
-::
+.. sourcecode:: bash
 
-  Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
+  $ Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
   Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
   'build' finished successfully (0.413s)
   Sent 1024 bytes to 10.1.1.2
@@ -121,13 +122,13 @@
 increase the logging level and get more information without changing the
 script and recompiling by setting the NS_LOG environment variable like this:
 
-::
+.. sourcecode:: bash
 
-  export NS_LOG=UdpEchoClientApplication=level_all
+  $ export NS_LOG=UdpEchoClientApplication=level_all
 
 This sets the shell environment variable ``NS_LOG`` to the string,
 
-::
+.. sourcecode:: bash
 
   UdpEchoClientApplication=level_all
 
@@ -137,9 +138,9 @@
 you run the script with NS_LOG set this way, the |ns3| logging 
 system will pick up the change and you should see the following output:
 
-::
+.. sourcecode:: bash
 
-  Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build
+  Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
   Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
   'build' finished successfully (0.404s)
   UdpEchoClientApplication:UdpEchoClient()
@@ -183,9 +184,9 @@
 from.  You can resolve this by OR'ing the ``prefix_func`` level into the
 ``NS_LOG`` environment variable.  Try doing the following,
 
-::
+.. sourcecode:: bash
 
-  export 'NS_LOG=UdpEchoClientApplication=level_all|prefix_func'
+  $ export 'NS_LOG=UdpEchoClientApplication=level_all|prefix_func'
 
 Note that the quotes are required since the vertical bar we use to indicate an
 OR operation is also a Unix pipe connector.
@@ -194,7 +195,7 @@
 that every message from the given log component is prefixed with the component
 name.
 
-::
+.. sourcecode:: bash
 
   Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
   Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
@@ -219,9 +220,9 @@
 can enable that component by entering a colon separated list of components in
 the NS_LOG environment variable.
 
-::
+.. sourcecode:: bash
 
-  export 'NS_LOG=UdpEchoClientApplication=level_all|prefix_func:
+  $ export 'NS_LOG=UdpEchoClientApplication=level_all|prefix_func:
                  UdpEchoServerApplication=level_all|prefix_func'
 
 Warning:  You will need to remove the newline after the ``:`` in the
@@ -231,7 +232,7 @@
 echo client and server applications.  You may see that this can be very useful
 in debugging problems.
 
-::
+.. sourcecode:: bash
 
   Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
   Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
@@ -258,15 +259,15 @@
 It is also sometimes useful to be able to see the simulation time at which a
 log message is generated.  You can do this by ORing in the prefix_time bit.
 
-::
+.. sourcecode:: bash
 
-  export 'NS_LOG=UdpEchoClientApplication=level_all|prefix_func|prefix_time:
+  $ export 'NS_LOG=UdpEchoClientApplication=level_all|prefix_func|prefix_time:
                  UdpEchoServerApplication=level_all|prefix_func|prefix_time'
 
 Again, you will have to remove the newline above.  If you run the script now,
 you should see the following output:
 
-::
+.. sourcecode:: bash
 
   Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
   Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
@@ -314,9 +315,9 @@
 turning on all of the logging components in the system.  Try setting the 
 ``NS_LOG`` variable to the following,
 
-::
+.. sourcecode:: bash
 
-  export 'NS_LOG=*=level_all|prefix_func|prefix_time'
+  $ export 'NS_LOG=*=level_all|prefix_func|prefix_time'
 
 The asterisk above is the logging component wildcard.  This will turn on all 
 of the logging in all of the components used in the simulation.  I won't 
@@ -324,9 +325,9 @@
 for the single packet echo) but you can redirect this information into a file 
 and look through it with your favorite editor if you like,
 
-::
+.. sourcecode:: bash
 
-  ./waf --run scratch/myfirst > log.out 2>&1
+  $ ./waf --run scratch/myfirst > log.out 2>&1
 
 I personally use this extremely verbose version of logging when I am presented 
 with a problem and I have no idea where things are going wrong.  I can follow the 
@@ -374,16 +375,16 @@
 Now build the script using waf and clear the ``NS_LOG`` variable to turn 
 off the torrent of logging we previously enabled:
 
-::
+.. sourcecode:: bash
 
-  ./waf
-  export NS_LOG=
+  $ ./waf
+  $ export NS_LOG=
 
 Now, if you run the script, 
 
-::
+.. sourcecode:: bash
 
-  ./waf --run scratch/myfirst
+  $ ./waf --run scratch/myfirst
 
 you will ``not`` see your new message since its associated logging 
 component (``FirstScriptExample``) has not been enabled.  In order to see your
@@ -391,14 +392,14 @@
 with a level greater than or equal to ``NS_LOG_INFO``.  If you just want to 
 see this particular level of logging, you can enable it by,
 
-::
+.. sourcecode:: bash
 
-  export NS_LOG=FirstScriptExample=info
+  $ export NS_LOG=FirstScriptExample=info
 
 If you now run the script you will see your new "Creating Topology" log
 message,
 
-::
+.. sourcecode:: bash
 
   Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
   Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
@@ -441,16 +442,16 @@
 the start of ``main``.  Go ahead and build the script and run it, but ask 
 the script for help in the following way,
 
-::
+.. sourcecode:: bash
 
-  ./waf --run "scratch/myfirst --PrintHelp"
+  $ ./waf --run "scratch/myfirst --PrintHelp"
 
 This will ask Waf to run the ``scratch/myfirst`` script and pass the command
 line argument ``--PrintHelp`` to the script.  The quotes are required to 
 sort out which program gets which argument.  The command line parser will
 now see the ``--PrintHelp`` argument and respond with,
 
-::
+.. sourcecode:: bash
 
   Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
   Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
@@ -481,14 +482,14 @@
 class name of the class to which the ``Attributes`` belong.  In this case it
 will be ``ns3::PointToPointNetDevice``.  Let's go ahead and type in,
 
-::
+.. sourcecode:: bash
 
-  ./waf --run "scratch/myfirst --PrintAttributes=ns3::PointToPointNetDevice"
+  $ ./waf --run "scratch/myfirst --PrintAttributes=ns3::PointToPointNetDevice"
 
 The system will print out all of the ``Attributes`` of this kind of net device.
 Among the ``Attributes`` you will see listed is,
 
-::
+.. sourcecode:: bash
 
   --ns3::PointToPointNetDevice::DataRate=[32768bps]:
     The default data rate for point to point links
@@ -521,13 +522,13 @@
 and enable some logging from the UDP echo server application and turn on the 
 time prefix.
 
-::
+.. sourcecode:: bash
 
-  export 'NS_LOG=UdpEchoServerApplication=level_all|prefix_time'
+  $ export 'NS_LOG=UdpEchoServerApplication=level_all|prefix_time'
 
 If you run the script, you should now see the following output,
 
-::
+.. sourcecode:: bash
 
   Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
   Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
@@ -545,7 +546,7 @@
 Recall that the last time we looked at the simulation time at which the packet
 was received by the echo server, it was at 2.00369 seconds.
 
-::
+.. sourcecode:: bash
 
   2.00369s UdpEchoServerApplication:HandleRead(): Received 1024 bytes from 10.1.1.1
 
@@ -557,9 +558,9 @@
 speed our simulation up again.  We do this in the following way, according to
 the formula implied by the help item:
 
-::
+.. sourcecode:: bash
 
-  ./waf --run "scratch/myfirst --ns3::PointToPointNetDevice::DataRate=5Mbps"
+  $ ./waf --run "scratch/myfirst --ns3::PointToPointNetDevice::DataRate=5Mbps"
 
 This will set the default value of the ``DataRate`` ``Attribute`` back to 
 five megabits per second.  Are you surprised by the result?  It turns out that
@@ -568,30 +569,30 @@
 system to print out the ``Attributes`` of the channel just like we did for
 the net device:
 
-::
+.. sourcecode:: bash
 
-  ./waf --run "scratch/myfirst --PrintAttributes=ns3::PointToPointChannel"
+  $ ./waf --run "scratch/myfirst --PrintAttributes=ns3::PointToPointChannel"
 
 We discover the ``Delay`` ``Attribute`` of the channel is set in the following
 way:
 
-::
+.. sourcecode:: bash
 
   --ns3::PointToPointChannel::Delay=[0ns]:
     Transmission delay through the channel
 
 We can then set both of these default values through the command line system,
 
-::
+.. sourcecode:: bash
 
-  ./waf --run "scratch/myfirst
+  $ ./waf --run "scratch/myfirst
     --ns3::PointToPointNetDevice::DataRate=5Mbps
     --ns3::PointToPointChannel::Delay=2ms"
 
 in which case we recover the timing we had when we explicitly set the
 ``DataRate`` and ``Delay`` in the script:
 
-::
+.. sourcecode:: bash
 
   Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
   Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
@@ -620,9 +621,9 @@
 line.  Since we're nice folks, we'll tell you that your command line should 
 end up looking something like,
 
-::
+.. sourcecode:: bash
 
-  ./waf --run "scratch/myfirst 
+  $ ./waf --run "scratch/myfirst 
     --ns3::PointToPointNetDevice::DataRate=5Mbps 
     --ns3::PointToPointChannel::Delay=2ms 
     --ns3::UdpEchoClient::MaxPackets=2"
@@ -666,11 +667,11 @@
 
 Try,
 
-::
+.. sourcecode:: bash
 
-  ./waf --run "scratch/myfirst --PrintHelp"
+  $ ./waf --run "scratch/myfirst --PrintHelp"
 
-::
+.. sourcecode:: bash
 
   Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
   Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
@@ -687,13 +688,13 @@
 If you want to specify the number of packets to echo, you can now do so by
 setting the ``--nPackets`` argument in the command line,
 
-::
+.. sourcecode:: bash
 
-  ./waf --run "scratch/myfirst --nPackets=2"
+  $ ./waf --run "scratch/myfirst --nPackets=2"
 
 You should now see
 
-::
+.. sourcecode:: bash
 
   Waf: Entering directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
   Waf: Leaving directory `/home/craigdo/repos/ns-3-allinone/ns-3-dev/build'
@@ -821,9 +822,9 @@
 
 You can now build the script and run it from the command line:
 
-::
+.. sourcecode:: bash
 
-  ./waf --run scratch/myfirst
+  $ ./waf --run scratch/myfirst
 
 Just as you have seen many times before, you will see some messages from Waf and then
 "'build' finished successfully" with some number of messages from 
@@ -856,31 +857,32 @@
 * ``r``: A packet was received by the net device.
 
 Let's take a more detailed view of the first line in the trace file.  I'll 
-break it down into sections (indented for clarity) with a two digit reference
+break it down into sections (indented for clarity) with a reference
 number on the left side:
 
-::
+.. sourcecode:: text
+  :linenos:
 
-  00 + 
-  01 2 
-  02 /NodeList/0/DeviceList/0/$ns3::PointToPointNetDevice/TxQueue/Enqueue 
-  03 ns3::PppHeader (
-  04   Point-to-Point Protocol: IP (0x0021)) 
-  05   ns3::Ipv4Header (
-  06     tos 0x0 ttl 64 id 0 protocol 17 offset 0 flags [none] 
-  07     length: 1052 10.1.1.1 > 10.1.1.2)
-  08     ns3::UdpHeader (
-  09       length: 1032 49153 > 9) 
-  10       Payload (size=1024)
+  + 
+  2 
+  /NodeList/0/DeviceList/0/$ns3::PointToPointNetDevice/TxQueue/Enqueue 
+  ns3::PppHeader (
+    Point-to-Point Protocol: IP (0x0021)) 
+    ns3::Ipv4Header (
+      tos 0x0 ttl 64 id 0 protocol 17 offset 0 flags [none] 
+      length: 1052 10.1.1.1 > 10.1.1.2)
+      ns3::UdpHeader (
+        length: 1032 49153 > 9) 
+        Payload (size=1024)
 
-The first line of this expanded trace event (reference number 00) is the 
+The first section of this expanded trace event (reference number 0) is the 
 operation.  We have a ``+`` character, so this corresponds to an
-*enqueue* operation on the transmit queue.  The second line (reference 01)
+*enqueue* operation on the transmit queue.  The second section (reference 1)
 is the simulation time expressed in seconds.  You may recall that we asked the 
 ``UdpEchoClientApplication`` to start sending packets at two seconds.  Here
 we see confirmation that this is, indeed, happening.
 
-The next line of the example trace (reference 02) tell us which trace source
+The next section of the example trace (reference 2) tell us which trace source
 originated this event (expressed in the tracing namespace).  You can think
 of the tracing namespace somewhat like you would a filesystem namespace.  The 
 root of the namespace is the ``NodeList``.  This corresponds to a container
@@ -899,11 +901,11 @@
 operation happened on the transmit queue of the device.  This is reflected in 
 the final segments of the "trace path" which are ``TxQueue/Enqueue``.
 
-The remaining lines in the trace should be fairly intuitive.  References 03-04
+The remaining sections in the trace should be fairly intuitive.  References 3-4
 indicate that the packet is encapsulated in the point-to-point protocol.  
-References 05-07 show that the packet has an IP version four header and has
+References 5-7 show that the packet has an IP version four header and has
 originated from IP address 10.1.1.1 and is destined for 10.1.1.2.  References
-08-09 show that this packet has a UDP header and, finally, reference 10 shows
+8-9 show that this packet has a UDP header and, finally, reference 10 shows
 that the payload is the expected 1024 bytes.
 
 The next line in the trace file shows the same packet being dequeued from the
@@ -912,17 +914,18 @@
 The Third line in the trace file shows the packet being received by the net
 device on the node with the echo server. I have reproduced that event below.
 
-::
+.. sourcecode:: text
+  :linenos:
 
-  00 r 
-  01 2.25732 
-  02 /NodeList/1/DeviceList/0/$ns3::PointToPointNetDevice/MacRx 
-  03   ns3::Ipv4Header (
-  04     tos 0x0 ttl 64 id 0 protocol 17 offset 0 flags [none]
-  05     length: 1052 10.1.1.1 > 10.1.1.2)
-  06     ns3::UdpHeader (
-  07       length: 1032 49153 > 9) 
-  08       Payload (size=1024)
+  r 
+  2.25732 
+  /NodeList/1/DeviceList/0/$ns3::PointToPointNetDevice/MacRx 
+    ns3::Ipv4Header (
+      tos 0x0 ttl 64 id 0 protocol 17 offset 0 flags [none]
+      length: 1052 10.1.1.1 > 10.1.1.2)
+      ns3::UdpHeader (
+        length: 1032 49153 > 9) 
+        Payload (size=1024)
 
 Notice that the trace operation is now ``r`` and the simulation time has
 increased to 2.25732 seconds.  If you have been following the tutorial steps
@@ -968,9 +971,9 @@
 Once you have added the line of code to enable pcap tracing, you can run the
 script in the usual way:
 
-::
+.. sourcecode:: bash
 
-  ./waf --run scratch/myfirst
+  $ ./waf --run scratch/myfirst
 
 If you look at the top level directory of your distribution, you should now
 see three log files:  ``myfirst.tr`` is the ASCII trace file we have 
@@ -982,9 +985,9 @@
 The easiest thing to do at this point will be to use ``tcpdump`` to look
 at the ``pcap`` files.  
 
-::
+.. sourcecode:: bash
 
-  tcpdump -nn -tt -r myfirst-0-0.pcap
+  $ tcpdump -nn -tt -r myfirst-0-0.pcap
   reading from file myfirst-0-0.pcap, link-type PPP (PPP)
   2.000000 IP 10.1.1.1.49153 > 10.1.1.2.9: UDP, length 1024
   2.514648 IP 10.1.1.2.9 > 10.1.1.1.49153: UDP, length 1024
diff -Naur ns-3.17/doc/tutorial-pt-br/source/conf.py ns-3.18/doc/tutorial-pt-br/source/conf.py
--- ns-3.17/doc/tutorial-pt-br/source/conf.py	2013-05-14 07:34:33.000000000 -0700
+++ ns-3.18/doc/tutorial-pt-br/source/conf.py	2013-10-26 07:07:29.467364379 -0700
@@ -50,9 +50,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = 'ns-3.17'
+version = 'ns-3.18'
 # The full version, including alpha/beta/rc tags.
-release = 'ns-3.17'
+release = 'ns-3.18'
 
 # The language for content autogenerated by . Refer to babel documentation
 # for a list of supported languages.
diff -Naur ns-3.17/examples/ipv6/fragmentation-ipv6.cc ns-3.18/examples/ipv6/fragmentation-ipv6.cc
--- ns-3.17/examples/ipv6/fragmentation-ipv6.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/examples/ipv6/fragmentation-ipv6.cc	2013-10-26 07:07:29.491364379 -0700
@@ -41,69 +41,23 @@
 
 NS_LOG_COMPONENT_DEFINE ("FragmentationIpv6Example");
 
-/**
- * \class StackHelper
- * \brief Helper to set or get some IPv6 information about nodes.
- */
-class StackHelper
-{
-public:
-  /**
-   * \brief Add an address to a IPv6 node.
-   * \param n node
-   * \param interface interface index
-   * \param address IPv6 address to add
-   */
-  inline void AddAddress (Ptr<Node>& n, uint32_t interface, Ipv6Address address)
-  {
-    Ptr<Ipv6> ipv6 = n->GetObject<Ipv6> ();
-    ipv6->AddAddress (interface, address);
-  }
-
-  /**
-   * \brief Print the routing table.
-   * \param n the node
-   */
-  inline void PrintRoutingTable (Ptr<Node>& n)
-  {
-    Ptr<Ipv6StaticRouting> routing = 0;
-    Ipv6StaticRoutingHelper routingHelper;
-    Ptr<Ipv6> ipv6 = n->GetObject<Ipv6> ();
-    uint32_t nbRoutes = 0;
-    Ipv6RoutingTableEntry route;
-
-    routing = routingHelper.GetStaticRouting (ipv6);
-
-    std::cout << "Routing table of " << n << " : " << std::endl;
-    std::cout << "Destination\t\t\t\t" << "Gateway\t\t\t\t\t" << "Interface\t" <<  "Prefix to use" << std::endl;
-
-    nbRoutes = routing->GetNRoutes ();
-    for (uint32_t i = 0; i < nbRoutes; i++)
-      {
-        route = routing->GetRoute (i);
-        std::cout << route.GetDest () << "\t"
-                  << route.GetGateway () << "\t"
-                  << route.GetInterface () << "\t"
-                  << route.GetPrefixToUse () << "\t"
-                  << std::endl;
-      }
-  } 
-};
 
 int main (int argc, char** argv)
 {
-#if 0 
-  LogComponentEnable ("Ipv6L3Protocol", LOG_LEVEL_ALL);
-  LogComponentEnable ("Icmpv6L4Protocol", LOG_LEVEL_ALL);
-  LogComponentEnable ("Ipv6StaticRouting", LOG_LEVEL_ALL);
-  LogComponentEnable ("Ipv6Interface", LOG_LEVEL_ALL);
-  LogComponentEnable ("Ping6Application", LOG_LEVEL_ALL);
-#endif
+  bool verbose = false;
 
   CommandLine cmd;
+  cmd.AddValue ("verbose", "turn on log components", verbose);
   cmd.Parse (argc, argv);
 
-  StackHelper stackHelper;
+  if (verbose)
+    {
+      LogComponentEnable ("Ipv6L3Protocol", LOG_LEVEL_ALL);
+      LogComponentEnable ("Icmpv6L4Protocol", LOG_LEVEL_ALL);
+      LogComponentEnable ("Ipv6StaticRouting", LOG_LEVEL_ALL);
+      LogComponentEnable ("Ipv6Interface", LOG_LEVEL_ALL);
+      LogComponentEnable ("Ping6Application", LOG_LEVEL_ALL);
+    }
 
   NS_LOG_INFO ("Create nodes.");
   Ptr<Node> n0 = CreateObject<Node> ();
@@ -129,12 +83,16 @@
   Ipv6AddressHelper ipv6;
   ipv6.SetBase (Ipv6Address ("2001:1::"), Ipv6Prefix (64));
   Ipv6InterfaceContainer i1 = ipv6.Assign (d1);
-  i1.SetRouter (1, true);
+  i1.SetForwarding (1, true);
+  i1.SetDefaultRouteInAllNodes (1);
   ipv6.SetBase (Ipv6Address ("2001:2::"), Ipv6Prefix (64));
   Ipv6InterfaceContainer i2 = ipv6.Assign (d2);
-  i2.SetRouter (0, true);
+  i2.SetForwarding (0, true);
+  i2.SetDefaultRouteInAllNodes (0);
 
-  stackHelper.PrintRoutingTable (n0);
+  Ipv6StaticRoutingHelper routingHelper;
+  Ptr<OutputStreamWrapper> routingStream = Create<OutputStreamWrapper> (&std::cout);
+  routingHelper.PrintRoutingTableAt (Seconds (0), n0, routingStream);
 
   /* Create a Ping6 application to send ICMPv6 echo request from n0 to n1 via r */
   uint32_t packetSize = 4096;
diff -Naur ns-3.17/examples/ipv6/fragmentation-ipv6-two-MTU.cc ns-3.18/examples/ipv6/fragmentation-ipv6-two-MTU.cc
--- ns-3.17/examples/ipv6/fragmentation-ipv6-two-MTU.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/examples/ipv6/fragmentation-ipv6-two-MTU.cc	2013-10-26 07:07:29.491364379 -0700
@@ -0,0 +1,124 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2008-2009 Strasbourg University
+ * Copyright (c) 2013 Universita' di Firenze
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: David Gross <gdavid.devel@gmail.com>
+ *         Sebastien Vincent <vincent@clarinet.u-strasbg.fr>
+ * Modified by Tommaso Pecorella <tommaso.pecorella@unifi.it>
+ */
+
+// Network topology
+// //
+// //     Src     n0   r    n1    Dst
+// //             |    _    |
+// //     MTU     ====|_|====     MTU
+// //     5000       router       1500
+// //
+// // - Tracing of queues and packet receptions to file "fragmentation-ipv6-two-mtu.tr"
+
+#include <fstream>
+#include "ns3/core-module.h"
+#include "ns3/internet-module.h"
+#include "ns3/csma-module.h"
+#include "ns3/applications-module.h"
+#include "ns3/ipv6-static-routing-helper.h"
+
+#include "ns3/ipv6-routing-table-entry.h"
+
+using namespace ns3;
+
+NS_LOG_COMPONENT_DEFINE ("FragmentationIpv6TwoMtuExample");
+
+int main (int argc, char** argv)
+{
+  bool verbose = false;
+
+  CommandLine cmd;
+  cmd.AddValue ("verbose", "turn on log components", verbose);
+  cmd.Parse (argc, argv);
+
+  if (verbose)
+    {
+      LogComponentEnable ("Ipv6L3Protocol", LOG_LEVEL_ALL);
+      LogComponentEnable ("Icmpv6L4Protocol", LOG_LEVEL_ALL);
+      LogComponentEnable ("Ipv6StaticRouting", LOG_LEVEL_ALL);
+      LogComponentEnable ("Ipv6Interface", LOG_LEVEL_ALL);
+      LogComponentEnable ("Ping6Application", LOG_LEVEL_ALL);
+    }
+
+  NS_LOG_INFO ("Create nodes.");
+  Ptr<Node> n0 = CreateObject<Node> ();
+  Ptr<Node> r = CreateObject<Node> ();
+  Ptr<Node> n1 = CreateObject<Node> ();
+
+  NodeContainer net1 (n0, r);
+  NodeContainer net2 (r, n1);
+  NodeContainer all (n0, r, n1);
+
+  NS_LOG_INFO ("Create IPv6 Internet Stack");
+  InternetStackHelper internetv6;
+  internetv6.Install (all);
+
+  NS_LOG_INFO ("Create channels.");
+  CsmaHelper csma;
+  csma.SetChannelAttribute ("DataRate", DataRateValue (5000000));
+  csma.SetChannelAttribute ("Delay", TimeValue (MilliSeconds (2)));
+  NetDeviceContainer d2 = csma.Install (net2);
+  csma.SetDeviceAttribute ("Mtu", UintegerValue (5000));
+  NetDeviceContainer d1 = csma.Install (net1);
+
+  NS_LOG_INFO ("Create networks and assign IPv6 Addresses.");
+  Ipv6AddressHelper ipv6;
+  ipv6.SetBase (Ipv6Address ("2001:1::"), Ipv6Prefix (64));
+  Ipv6InterfaceContainer i1 = ipv6.Assign (d1);
+  i1.SetForwarding (1, true);
+  i1.SetDefaultRouteInAllNodes (1);
+  ipv6.SetBase (Ipv6Address ("2001:2::"), Ipv6Prefix (64));
+  Ipv6InterfaceContainer i2 = ipv6.Assign (d2);
+  i2.SetForwarding (0, true);
+  i2.SetDefaultRouteInAllNodes (0);
+
+  Ipv6StaticRoutingHelper routingHelper;
+  Ptr<OutputStreamWrapper> routingStream = Create<OutputStreamWrapper> (&std::cout);
+  routingHelper.PrintRoutingTableAt (Seconds (0), n0, routingStream);
+
+  /* Create a Ping6 application to send ICMPv6 echo request from n0 to n1 via r */
+  uint32_t packetSize = 4096;
+  uint32_t maxPacketCount = 5;
+  Time interPacketInterval = Seconds (1.0);
+  Ping6Helper ping6;
+
+  ping6.SetLocal (i1.GetAddress (0, 1));
+  ping6.SetRemote (i2.GetAddress (1, 1)); 
+
+  ping6.SetAttribute ("MaxPackets", UintegerValue (maxPacketCount));
+  ping6.SetAttribute ("Interval", TimeValue (interPacketInterval));
+  ping6.SetAttribute ("PacketSize", UintegerValue (packetSize));
+  ApplicationContainer apps = ping6.Install (net1.Get (0));
+  apps.Start (Seconds (2.0));
+  apps.Stop (Seconds (20.0));
+
+  AsciiTraceHelper ascii;
+  csma.EnableAsciiAll (ascii.CreateFileStream ("fragmentation-ipv6-two-mtu.tr"));
+  csma.EnablePcapAll (std::string ("fragmentation-ipv6-two-mtu"), true);
+
+  NS_LOG_INFO ("Run Simulation.");
+  Simulator::Run ();
+  Simulator::Destroy ();
+  NS_LOG_INFO ("Done.");
+}
+
diff -Naur ns-3.17/examples/ipv6/icmpv6-redirect.cc ns-3.18/examples/ipv6/icmpv6-redirect.cc
--- ns-3.17/examples/ipv6/icmpv6-redirect.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/examples/ipv6/icmpv6-redirect.cc	2013-10-26 07:07:29.491364379 -0700
@@ -53,75 +53,25 @@
 
 NS_LOG_COMPONENT_DEFINE ("Icmpv6RedirectExample");
 
-/**
- * \class StackHelper
- * \brief Helper to set or get some IPv6 information about nodes.
- */
-class StackHelper
-{
-public:
-  /**
-   * \brief Print the routing table.
-   * \param n the node
-   */
-  inline void PrintRoutingTable (Ptr<Node>& n)
-  {
-    Ptr<Ipv6StaticRouting> routing = 0;
-    Ipv6StaticRoutingHelper routingHelper;
-    Ptr<Ipv6> ipv6 = n->GetObject<Ipv6> ();
-    uint32_t nbRoutes = 0;
-    Ipv6RoutingTableEntry route;
-
-    routing = routingHelper.GetStaticRouting (ipv6);
-
-    std::cout << "Routing table of " << n << " : " << std::endl;
-    std::cout << "Destination\t\t\t\t" << "Gateway\t\t\t\t\t" << "Interface\t" << "Prefix to use" << std::endl;
-
-    nbRoutes = routing->GetNRoutes ();
-    for(uint32_t i = 0; i < nbRoutes; i++)
-      {
-        route = routing->GetRoute (i);
-        std::cout << route.GetDest () << "\t"
-                  << route.GetGateway () << "\t"
-                  << route.GetInterface () << "\t"
-                  << route.GetPrefixToUse () << "\t"
-                  << std::endl;
-      }
-  }
-
-  /**
-   * \brief Add an host route.
-   * \param n node 
-   * \param dst destination address
-   * \param nextHop next hop for destination
-   * \param interface output interface
-   */
-  inline void AddHostRouteTo (Ptr<Node>& n, Ipv6Address dst, Ipv6Address nextHop, uint32_t interface)
-  {
-    Ptr<Ipv6StaticRouting> routing = 0;
-    Ipv6StaticRoutingHelper routingHelper;
-    Ptr<Ipv6> ipv6 = n->GetObject<Ipv6> ();
-
-    routing = routingHelper.GetStaticRouting (ipv6);
-    routing->AddHostRouteTo (dst, nextHop, interface);
-  }
-};
-
 int main (int argc, char **argv)
 {
-#if 0 
-  LogComponentEnable ("Icmpv6RedirectExample", LOG_LEVEL_INFO);
-  LogComponentEnable ("Icmpv6L4Protocol", LOG_LEVEL_INFO);
-  LogComponentEnable ("Ipv6L3Protocol", LOG_LEVEL_ALL);
-  LogComponentEnable ("Ipv6StaticRouting", LOG_LEVEL_ALL);
-  LogComponentEnable ("Ipv6Interface", LOG_LEVEL_ALL);
-  LogComponentEnable ("Icmpv6L4Protocol", LOG_LEVEL_ALL);
-  LogComponentEnable ("NdiscCache", LOG_LEVEL_ALL);
-#endif
+  bool verbose = false;
 
   CommandLine cmd;
+  cmd.AddValue ("verbose", "turn on log components", verbose);
   cmd.Parse (argc, argv);
 
+  if (verbose)
+    {
+      LogComponentEnable ("Icmpv6RedirectExample", LOG_LEVEL_INFO);
+      LogComponentEnable ("Icmpv6L4Protocol", LOG_LEVEL_INFO);
+      LogComponentEnable ("Ipv6L3Protocol", LOG_LEVEL_ALL);
+      LogComponentEnable ("Ipv6StaticRouting", LOG_LEVEL_ALL);
+      LogComponentEnable ("Ipv6Interface", LOG_LEVEL_ALL);
+      LogComponentEnable ("Icmpv6L4Protocol", LOG_LEVEL_ALL);
+      LogComponentEnable ("NdiscCache", LOG_LEVEL_ALL);
+    }
+
   NS_LOG_INFO ("Create nodes.");
   Ptr<Node> sta1 = CreateObject<Node> ();
   Ptr<Node> r1 = CreateObject<Node> ();
@@ -131,8 +81,6 @@
   NodeContainer net2 (r2, sta2);
   NodeContainer all (sta1, r1, r2, sta2);
 
-  StackHelper stackHelper;
-
   InternetStackHelper internetv6;
   internetv6.Install (all);
 
@@ -148,17 +96,24 @@
 
   ipv6.SetBase (Ipv6Address ("2001:1::"), Ipv6Prefix (64));
   Ipv6InterfaceContainer iic1 = ipv6.Assign (ndc1);
-  iic1.SetRouter (2, true);
-  iic1.SetRouter (1, true);
+  iic1.SetForwarding (2, true);
+  iic1.SetForwarding (1, true);
+  iic1.SetDefaultRouteInAllNodes (1);
 
   ipv6.SetBase (Ipv6Address ("2001:2::"), Ipv6Prefix (64));
   Ipv6InterfaceContainer iic2 = ipv6.Assign (ndc2);
-  iic2.SetRouter (0, true);
+  iic2.SetForwarding (0, true);
+  iic2.SetDefaultRouteInAllNodes (0);
 
-  stackHelper.AddHostRouteTo (r1, iic2.GetAddress (1, 1), iic1.GetAddress (2, 1), iic1.GetInterfaceIndex (1));
+  Ipv6StaticRoutingHelper routingHelper;
 
-  Simulator::Schedule (Seconds (0.0), &StackHelper::PrintRoutingTable, &stackHelper, r1);
-  Simulator::Schedule (Seconds (3.0), &StackHelper::PrintRoutingTable, &stackHelper, sta1);
+  // manually inject a static route to the second router.
+  Ptr<Ipv6StaticRouting> routing = routingHelper.GetStaticRouting (r1->GetObject<Ipv6> ());
+  routing->AddHostRouteTo (iic2.GetAddress (1, 1), iic1.GetAddress (2, 0), iic1.GetInterfaceIndex (1));
+
+  Ptr<OutputStreamWrapper> routingStream = Create<OutputStreamWrapper> (&std::cout);
+  routingHelper.PrintRoutingTableAt (Seconds (0.0), r1, routingStream);
+  routingHelper.PrintRoutingTableAt (Seconds (3.0), sta1, routingStream);
 
   NS_LOG_INFO ("Create Applications.");
   uint32_t packetSize = 1024;
diff -Naur ns-3.17/examples/ipv6/loose-routing-ipv6.cc ns-3.18/examples/ipv6/loose-routing-ipv6.cc
--- ns-3.17/examples/ipv6/loose-routing-ipv6.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/examples/ipv6/loose-routing-ipv6.cc	2013-10-26 07:07:29.491364379 -0700
@@ -50,19 +50,23 @@
 
 int main (int argc, char **argv)
 {
-#if 0 
-  LogComponentEnable ("Ipv6ExtensionLooseRouting", LOG_LEVEL_ALL);
-  LogComponentEnable ("Ipv6Extension", LOG_LEVEL_ALL);
-  LogComponentEnable ("Ipv6L3Protocol", LOG_LEVEL_ALL);
-  LogComponentEnable ("Ipv6StaticRouting", LOG_LEVEL_ALL);
-  LogComponentEnable ("Ipv6Interface", LOG_LEVEL_ALL);
-  LogComponentEnable ("Ipv6Interface", LOG_LEVEL_ALL);
-  LogComponentEnable ("NdiscCache", LOG_LEVEL_ALL);
-#endif
+  bool verbose = false;
 
   CommandLine cmd;
+  cmd.AddValue ("verbose", "turn on log components", verbose);
   cmd.Parse (argc, argv);
 
+  if (verbose)
+    {
+      LogComponentEnable ("Ipv6ExtensionLooseRouting", LOG_LEVEL_ALL);
+      LogComponentEnable ("Ipv6Extension", LOG_LEVEL_ALL);
+      LogComponentEnable ("Ipv6L3Protocol", LOG_LEVEL_ALL);
+      LogComponentEnable ("Ipv6StaticRouting", LOG_LEVEL_ALL);
+      LogComponentEnable ("Ipv6Interface", LOG_LEVEL_ALL);
+      LogComponentEnable ("Ipv6Interface", LOG_LEVEL_ALL);
+      LogComponentEnable ("NdiscCache", LOG_LEVEL_ALL);
+    }
+
   NS_LOG_INFO ("Create nodes.");
   Ptr<Node> h0 = CreateObject<Node> ();
   Ptr<Node> h1 = CreateObject<Node> ();
@@ -106,31 +110,41 @@
 
   ipv6.SetBase (Ipv6Address ("2001:1::"), Ipv6Prefix (64));
   Ipv6InterfaceContainer i1 = ipv6.Assign (d1);
-  i1.SetRouter (1, true);
+  i1.SetForwarding (1, true);
+  i1.SetDefaultRouteInAllNodes (1);
 
   ipv6.SetBase (Ipv6Address ("2001:2::"), Ipv6Prefix (64));
   Ipv6InterfaceContainer i2 = ipv6.Assign (d2);
-  i2.SetRouter (1, true);
+  i2.SetForwarding (1, true);
+  i2.SetDefaultRouteInAllNodes (1);
 
   ipv6.SetBase (Ipv6Address ("2001:3::"), Ipv6Prefix (64));
   Ipv6InterfaceContainer i3 = ipv6.Assign (d3);
-  i3.SetRouter (0, true);
-  i3.SetRouter (1, true);
+  i3.SetForwarding (0, true);
+  i3.SetDefaultRouteInAllNodes (0);
+  i3.SetForwarding (1, true);
+  i3.SetDefaultRouteInAllNodes (1);
 
   ipv6.SetBase (Ipv6Address ("2001:4::"), Ipv6Prefix (64));
   Ipv6InterfaceContainer i4 = ipv6.Assign (d4);
-  i4.SetRouter (0, true);
-  i4.SetRouter (1, true);
+  i4.SetForwarding (0, true);
+  i4.SetDefaultRouteInAllNodes (0);
+  i4.SetForwarding (1, true);
+  i4.SetDefaultRouteInAllNodes (1);
 
   ipv6.SetBase (Ipv6Address ("2001:5::"), Ipv6Prefix (64));
   Ipv6InterfaceContainer i5 = ipv6.Assign (d5);
-  i5.SetRouter (0, true);
-  i5.SetRouter (1, true);
+  i5.SetForwarding (0, true);
+  i5.SetDefaultRouteInAllNodes (0);
+  i5.SetForwarding (1, true);
+  i5.SetDefaultRouteInAllNodes (1);
 
   ipv6.SetBase (Ipv6Address ("2001:6::"), Ipv6Prefix (64));
   Ipv6InterfaceContainer i6 = ipv6.Assign (d6);
-  i6.SetRouter (0, true);
-  i6.SetRouter (1, true);
+  i6.SetForwarding (0, true);
+  i6.SetDefaultRouteInAllNodes (0);
+  i6.SetForwarding (1, true);
+  i6.SetDefaultRouteInAllNodes (1);
 
   NS_LOG_INFO ("Create Applications.");
 
diff -Naur ns-3.17/examples/ipv6/ping6.cc ns-3.18/examples/ipv6/ping6.cc
--- ns-3.17/examples/ipv6/ping6.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/examples/ipv6/ping6.cc	2013-10-26 07:07:29.491364379 -0700
@@ -41,21 +41,25 @@
 
 int main (int argc, char **argv)
 {
-#if 0 
-  LogComponentEnable ("Ping6Example", LOG_LEVEL_INFO);
-  LogComponentEnable ("Ipv6EndPointDemux", LOG_LEVEL_ALL);
-  LogComponentEnable ("Ipv6L3Protocol", LOG_LEVEL_ALL);
-  LogComponentEnable ("Ipv6StaticRouting", LOG_LEVEL_ALL);
-  LogComponentEnable ("Ipv6ListRouting", LOG_LEVEL_ALL);
-  LogComponentEnable ("Ipv6Interface", LOG_LEVEL_ALL);
-  LogComponentEnable ("Icmpv6L4Protocol", LOG_LEVEL_ALL);
-  LogComponentEnable ("Ping6Application", LOG_LEVEL_ALL);
-  LogComponentEnable ("NdiscCache", LOG_LEVEL_ALL);
-#endif
+  bool verbose = false;
 
   CommandLine cmd;
+  cmd.AddValue ("verbose", "turn on log components", verbose);
   cmd.Parse (argc, argv);
 
+  if (verbose)
+    {
+      LogComponentEnable ("Ping6Example", LOG_LEVEL_INFO);
+      LogComponentEnable ("Ipv6EndPointDemux", LOG_LEVEL_ALL);
+      LogComponentEnable ("Ipv6L3Protocol", LOG_LEVEL_ALL);
+      LogComponentEnable ("Ipv6StaticRouting", LOG_LEVEL_ALL);
+      LogComponentEnable ("Ipv6ListRouting", LOG_LEVEL_ALL);
+      LogComponentEnable ("Ipv6Interface", LOG_LEVEL_ALL);
+      LogComponentEnable ("Icmpv6L4Protocol", LOG_LEVEL_ALL);
+      LogComponentEnable ("Ping6Application", LOG_LEVEL_ALL);
+      LogComponentEnable ("NdiscCache", LOG_LEVEL_ALL);
+    }
+
   NS_LOG_INFO ("Create nodes.");
   NodeContainer n;
   n.Create (4);
diff -Naur ns-3.17/examples/ipv6/radvd.cc ns-3.18/examples/ipv6/radvd.cc
--- ns-3.17/examples/ipv6/radvd.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/examples/ipv6/radvd.cc	2013-10-26 07:07:29.491364379 -0700
@@ -47,19 +47,23 @@
 
 int main (int argc, char** argv)
 {
-#if 0 
-  LogComponentEnable ("Ipv6L3Protocol", LOG_LEVEL_ALL);
-  LogComponentEnable ("Ipv6RawSocketImpl", LOG_LEVEL_ALL);
-  LogComponentEnable ("Icmpv6L4Protocol", LOG_LEVEL_ALL);
-  LogComponentEnable ("Ipv6StaticRouting", LOG_LEVEL_ALL);
-  LogComponentEnable ("Ipv6Interface", LOG_LEVEL_ALL);
-  LogComponentEnable ("RadvdApplication", LOG_LEVEL_ALL);
-  LogComponentEnable ("Ping6Application", LOG_LEVEL_ALL);
-#endif
+  bool verbose = false;
 
   CommandLine cmd;
+  cmd.AddValue ("verbose", "turn on log components", verbose);
   cmd.Parse (argc, argv);
 
+  if (verbose)
+    {
+      LogComponentEnable ("Ipv6L3Protocol", LOG_LEVEL_ALL);
+      LogComponentEnable ("Ipv6RawSocketImpl", LOG_LEVEL_ALL);
+      LogComponentEnable ("Icmpv6L4Protocol", LOG_LEVEL_ALL);
+      LogComponentEnable ("Ipv6StaticRouting", LOG_LEVEL_ALL);
+      LogComponentEnable ("Ipv6Interface", LOG_LEVEL_ALL);
+      LogComponentEnable ("RadvdApplication", LOG_LEVEL_ALL);
+      LogComponentEnable ("Ping6Application", LOG_LEVEL_ALL);
+    }
+
   NS_LOG_INFO ("Create nodes.");
   Ptr<Node> n0 = CreateObject<Node> ();
   Ptr<Node> r = CreateObject<Node> ();
@@ -92,7 +96,8 @@
   NetDeviceContainer tmp2;
   tmp2.Add (d1.Get (1)); /* R */
   Ipv6InterfaceContainer iicr1 = ipv6.Assign (tmp2); /* R interface to the first subnet is just statically assigned */
-  iicr1.SetRouter (0, true);
+  iicr1.SetForwarding (0, true);
+  iicr1.SetDefaultRouteInAllNodes (0);
   iic1.Add (iicr1);
 
   /* second subnet R - n1 */
@@ -100,7 +105,8 @@
   NetDeviceContainer tmp3;
   tmp3.Add (d2.Get (0)); /* R */
   Ipv6InterfaceContainer iicr2 = ipv6.Assign (tmp3); /* R interface */
-  iicr2.SetRouter (0, true);
+  iicr2.SetForwarding (0, true);
+  iicr2.SetDefaultRouteInAllNodes (0);
 
   NetDeviceContainer tmp4;
   tmp4.Add (d2.Get (1)); /* n1 */
@@ -108,24 +114,15 @@
   iic2.Add (iicr2);
 
   /* radvd configuration */
-  Ipv6Address prefix ("2001:1::0"); /* create the prefix */
-  Ipv6Address prefix2 ("2001:2::0"); /* create the prefix */
-  uint32_t indexRouter = iic1.GetInterfaceIndex (1); /* R interface (n0 - R) */
-  uint32_t indexRouter2 = iic2.GetInterfaceIndex (1); /* R interface (R - n1) */
-  Ptr<Radvd> radvd = CreateObject<Radvd> ();
-  Ptr<RadvdInterface> routerInterface = Create<RadvdInterface> (indexRouter, 5000, 1000);
-  Ptr<RadvdPrefix> routerPrefix = Create<RadvdPrefix> (prefix, 64, 3, 5);
-  Ptr<RadvdInterface> routerInterface2 = Create<RadvdInterface> (indexRouter2, 5000, 1000);
-  Ptr<RadvdPrefix> routerPrefix2 = Create<RadvdPrefix> (prefix2, 64, 3, 5);
-
-  routerInterface->AddPrefix (routerPrefix);
-  routerInterface2->AddPrefix (routerPrefix2);
-  radvd->AddConfiguration (routerInterface);
-  radvd->AddConfiguration (routerInterface2);
-
-  r->AddApplication (radvd);
-  radvd->SetStartTime (Seconds (1.0));
-  radvd->SetStopTime (Seconds (10.0));
+  RadvdHelper radvdHelper;
+  /* R interface (n0 - R) */
+  radvdHelper.AddAnnouncedPrefix(iic1.GetInterfaceIndex (1), Ipv6Address("2001:1::0"), 64);
+  /* R interface (R - n1) */
+  radvdHelper.AddAnnouncedPrefix(iic2.GetInterfaceIndex (1), Ipv6Address("2001:2::0"), 64);
+
+  ApplicationContainer radvdApps = radvdHelper.Install (r);
+  radvdApps.Start (Seconds (1.0));
+  radvdApps.Stop (Seconds (10.0));
 
   /* Create a Ping6 application to send ICMPv6 echo request from n0 to n1 via R */
   uint32_t packetSize = 1024;
diff -Naur ns-3.17/examples/ipv6/radvd-two-prefix.cc ns-3.18/examples/ipv6/radvd-two-prefix.cc
--- ns-3.17/examples/ipv6/radvd-two-prefix.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/examples/ipv6/radvd-two-prefix.cc	2013-10-26 07:07:29.491364379 -0700
@@ -49,69 +49,56 @@
 NS_LOG_COMPONENT_DEFINE ("RadvdTwoPrefixExample");
 
 /**
- * \class StackHelper
- * \brief Helper to set or get some IPv6 information about nodes.
+ * \class IpAddressHelper
+ * \brief Helper to print a node's IP addresses.
  */
-class StackHelper
+class IpAddressHelper
 {
 public:
   /**
-   * \brief Add an address to a IPv6 node.
-   * \param n node
-   * \param interface interface index
-   * \param address IPv6 address to add
-   */
-  inline void AddAddress (Ptr<Node>& n, uint32_t interface, Ipv6Address address)
-  {
-    Ptr<Ipv6> ipv6 = n->GetObject<Ipv6> ();
-    ipv6->AddAddress (interface, address);
-  }
-
-  /**
-   * \brief Print the routing table.
+   * \brief Print the node's IP addresses.
    * \param n the node
    */
-  inline void PrintRoutingTable (Ptr<Node>& n)
+  inline void PrintIpAddresses (Ptr<Node>& n)
   {
-    Ptr<Ipv6StaticRouting> routing = 0;
-    Ipv6StaticRoutingHelper routingHelper;
     Ptr<Ipv6> ipv6 = n->GetObject<Ipv6> ();
-    uint32_t nbRoutes = 0;
-    Ipv6RoutingTableEntry route;
-
-    routing = routingHelper.GetStaticRouting (ipv6);
+    uint32_t nInterfaces = ipv6->GetNInterfaces();
 
-    std::cout << "Routing table of " << n << " : " << std::endl;
-    std::cout << "Destination\t\t\t\t" << "Gateway\t\t\t\t\t" << "Interface\t" << "Prefix to use" << std::endl;
+    std::cout << "Node: " << ipv6->GetObject<Node> ()->GetId ()
+        << " Time: " << Simulator::Now ().GetSeconds () << "s "
+        << "IPv6 addresses" << std::endl;
+    std::cout << "(Interface index, Address index)\t" << "IPv6 Address" << std::endl;
 
-    nbRoutes = routing->GetNRoutes ();
-    for (uint32_t i = 0; i < nbRoutes; i++)
+    for (uint32_t i = 0; i < nInterfaces; i++)
       {
-        route = routing->GetRoute (i);
-        std::cout << route.GetDest () << "\t"
-                  << route.GetGateway () << "\t"
-                  << route.GetInterface () << "\t"
-                  << route.GetPrefixToUse () << "\t"
-                  << std::endl;
+        for (uint32_t j = 0; j < ipv6->GetNAddresses(i); j++)
+          {
+            std::cout << "(" << int(i) << "," << int(j) << ")\t" << ipv6->GetAddress(i,j) << std::endl;
+          }
       }
+    std::cout << std::endl;
   }
 };
 
 int main (int argc, char** argv)
 {
-#if 0 
-  LogComponentEnable ("Ipv6L3Protocol", LOG_LEVEL_ALL);
-  LogComponentEnable ("Ipv6RawSocketImpl", LOG_LEVEL_ALL);
-  LogComponentEnable ("Icmpv6L4Protocol", LOG_LEVEL_ALL);
-  LogComponentEnable ("Ipv6StaticRouting", LOG_LEVEL_ALL);
-  LogComponentEnable ("Ipv6Interface", LOG_LEVEL_ALL);
-  LogComponentEnable ("RadvdApplication", LOG_LEVEL_ALL);
-  LogComponentEnable ("Ping6Application", LOG_LEVEL_ALL);
-#endif
+  bool verbose = false;
 
   CommandLine cmd;
+  cmd.AddValue ("verbose", "turn on log components", verbose);
   cmd.Parse (argc, argv);
 
+  if (verbose)
+    {
+      LogComponentEnable ("Ipv6L3Protocol", LOG_LEVEL_ALL);
+      LogComponentEnable ("Ipv6RawSocketImpl", LOG_LEVEL_ALL);
+      LogComponentEnable ("Icmpv6L4Protocol", LOG_LEVEL_ALL);
+      LogComponentEnable ("Ipv6StaticRouting", LOG_LEVEL_ALL);
+      LogComponentEnable ("Ipv6Interface", LOG_LEVEL_ALL);
+      LogComponentEnable ("RadvdApplication", LOG_LEVEL_ALL);
+      LogComponentEnable ("Ping6Application", LOG_LEVEL_ALL);
+    }
+
   NS_LOG_INFO ("Create nodes.");
   Ptr<Node> n0 = CreateObject<Node> ();
   Ptr<Node> r = CreateObject<Node> ();
@@ -120,7 +107,6 @@
   NodeContainer net1 (n0, r);
   NodeContainer net2 (r, n1);
   NodeContainer all (n0, r, n1);
-  StackHelper stackHelper;
 
   NS_LOG_INFO ("Create IPv6 Internet Stack");
   InternetStackHelper internetv6;
@@ -145,18 +131,21 @@
   NetDeviceContainer tmp2;
   tmp2.Add (d1.Get (1)); /* R */
   Ipv6InterfaceContainer iicr1 = ipv6.Assign (tmp2); /* R interface to the first subnet is just statically assigned */
-  iicr1.SetRouter (0, true);
+  iicr1.SetForwarding (0, true);
+  iicr1.SetDefaultRouteInAllNodes (0);
   iic1.Add (iicr1);
 
   /* add another IPv6 address for second prefix advertised on first subnet */
-  stackHelper.AddAddress (r, iic1.GetInterfaceIndex (1), Ipv6Address ("2001:ABCD::2"));
+  ipv6.SetBase (Ipv6Address ("2001:ABCD::2"), Ipv6Prefix (64));
+  ipv6.Assign (tmp2);
 
   /* second subnet R - n1 */
   ipv6.SetBase (Ipv6Address ("2001:2::"), Ipv6Prefix (64));
   NetDeviceContainer tmp3;
   tmp3.Add (d2.Get (0)); /* R */
   Ipv6InterfaceContainer iicr2 = ipv6.Assign (tmp3); /* R interface */
-  iicr2.SetRouter (0, true);
+  iicr2.SetForwarding (0, true);
+  iicr2.SetDefaultRouteInAllNodes (0);
 
   NetDeviceContainer tmp4;
   tmp4.Add (d2.Get (1)); /* n1 */
@@ -164,29 +153,39 @@
   iic2.Add (iicr2);
 
   /* radvd configuration */
-  Ipv6Address prefix ("2001:ABCD::0"); /* create the prefix */
-  Ipv6Address prefixBis ("2001:1::0"); /* create the prefix */
-  Ipv6Address prefix2 ("2001:2::0"); /* create the prefix */
-  uint32_t indexRouter = iic1.GetInterfaceIndex (1); /* R interface (n0 - R) */
-  uint32_t indexRouter2 = iic2.GetInterfaceIndex (1); /* R interface (R - n1) */
-  Ptr<Radvd> radvd = CreateObject<Radvd> ();
-  Ptr<RadvdInterface> routerInterface = Create<RadvdInterface> (indexRouter, 2000, 1000);
-  Ptr<RadvdPrefix> routerPrefix = Create<RadvdPrefix> (prefix, 64, 3, 5);
-  Ptr<RadvdPrefix> routerPrefixBis = Create<RadvdPrefix> (prefixBis, 64, 3, 5);
-  Ptr<RadvdInterface> routerInterface2 = Create<RadvdInterface> (indexRouter2, 2000, 1000);
-  Ptr<RadvdPrefix> routerPrefix2 = Create<RadvdPrefix> (prefix2, 64, 3, 5);
-
-  /* first interface advertise two prefixes (2001:1::/64 and 2001:ABCD::/64) */
-  /* prefix is added in the inverse order in packet */
-  routerInterface->AddPrefix (routerPrefix);
-  routerInterface->AddPrefix (routerPrefixBis);
-  routerInterface2->AddPrefix (routerPrefix2);
-  radvd->AddConfiguration (routerInterface);
-  radvd->AddConfiguration (routerInterface2);
-
-  r->AddApplication (radvd);
-  radvd->SetStartTime (Seconds (1.0));
-  radvd->SetStopTime (Seconds (2.0));
+  RadvdHelper radvdHelper;
+  /* R interface (n0 - R) */
+  radvdHelper.AddAnnouncedPrefix(iic1.GetInterfaceIndex (1), Ipv6Address("2001:ABCD::0"), 64);
+  radvdHelper.AddAnnouncedPrefix(iic1.GetInterfaceIndex (1), Ipv6Address("2001:1::0"), 64);
+
+  // Set some non-standard timers so the simulation is not taking ages
+  Ptr<RadvdInterface> routerInterface = radvdHelper.GetRadvdInterface(iic1.GetInterfaceIndex (1));
+  routerInterface->SetMaxRtrAdvInterval (2000);
+  routerInterface->SetMinRtrAdvInterval (1000);
+  RadvdInterface::RadvdPrefixList prefixList = routerInterface->GetPrefixes ();
+  for (RadvdInterface::RadvdPrefixListI iter = prefixList.begin(); iter != prefixList.end(); iter++)
+    {
+      (*iter)->SetPreferredLifeTime (3);
+      (*iter)->SetValidLifeTime (5);
+    }
+
+  /* R interface (R - n1) */
+  radvdHelper.AddAnnouncedPrefix(iic2.GetInterfaceIndex (1), Ipv6Address("2001:2::0"), 64);
+
+  // Set some non-standard timers so the simulation is not taking ages
+  routerInterface = radvdHelper.GetRadvdInterface(iic2.GetInterfaceIndex (1));
+  routerInterface->SetMaxRtrAdvInterval (2000);
+  routerInterface->SetMinRtrAdvInterval (1000);
+  prefixList = routerInterface->GetPrefixes ();
+  for (RadvdInterface::RadvdPrefixListI iter = prefixList.begin(); iter != prefixList.end(); iter++)
+    {
+      (*iter)->SetPreferredLifeTime (3);
+      (*iter)->SetValidLifeTime (5);
+    }
+
+  ApplicationContainer radvdApps = radvdHelper.Install(r);
+  radvdApps.Start (Seconds (1.0));
+  radvdApps.Stop (Seconds (2.0));
 
   /* Create a Ping6 application to send ICMPv6 echo request from n0 to n1 via R */
   uint32_t packetSize = 1024;
@@ -205,10 +204,16 @@
   apps.Start (Seconds (2.0));
   apps.Stop (Seconds (9.0));
 
+  Ipv6StaticRoutingHelper routingHelper;
+  Ptr<OutputStreamWrapper> routingStream = Create<OutputStreamWrapper> (&std::cout);
+  routingHelper.PrintRoutingTableAt (Seconds (2.0), n0, routingStream);
+  routingHelper.PrintRoutingTableAt (Seconds (10.0), n0, routingStream);
+
+  IpAddressHelper ipAddressHelper;
   /* RA should be received, two prefixes + routes + default route should be present */
-  Simulator::Schedule (Seconds (2.0), &StackHelper::PrintRoutingTable, &stackHelper, n0); 
+  Simulator::Schedule (Seconds (2.0), &IpAddressHelper::PrintIpAddresses, &ipAddressHelper, n0);
   /* at the end, RA addresses and routes should be cleared */
-  Simulator::Schedule (Seconds (10.0), &StackHelper::PrintRoutingTable, &stackHelper, n0); 
+  Simulator::Schedule (Seconds (10.0), &IpAddressHelper::PrintIpAddresses, &ipAddressHelper, n0);
 
   AsciiTraceHelper ascii;
   csma.EnableAsciiAll (ascii.CreateFileStream ("radvd-two-prefix.tr"));
diff -Naur ns-3.17/examples/ipv6/wscript ns-3.18/examples/ipv6/wscript
--- ns-3.17/examples/ipv6/wscript	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/examples/ipv6/wscript	2013-10-26 07:07:29.491364379 -0700
@@ -18,6 +18,9 @@
     
     obj = bld.create_ns3_program('fragmentation-ipv6', ['csma', 'internet'])
     obj.source = 'fragmentation-ipv6.cc'
+    
+    obj = bld.create_ns3_program('fragmentation-ipv6-two-MTU', ['csma', 'internet'])
+    obj.source = 'fragmentation-ipv6-two-MTU.cc'
 
     obj = bld.create_ns3_program('loose-routing-ipv6', ['csma', 'internet'])
     obj.source = 'loose-routing-ipv6.cc'
diff -Naur ns-3.17/examples/routing/simple-routing-ping6.cc ns-3.18/examples/routing/simple-routing-ping6.cc
--- ns-3.17/examples/routing/simple-routing-ping6.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/examples/routing/simple-routing-ping6.cc	2013-10-26 07:07:29.495364379 -0700
@@ -130,10 +130,12 @@
   Ipv6AddressHelper ipv6;
   ipv6.SetBase (Ipv6Address ("2001:1::"), Ipv6Prefix (64));
   Ipv6InterfaceContainer i1 = ipv6.Assign (d1);
-  i1.SetRouter (1, true);
+  i1.SetForwarding (1, true);
+  i1.SetDefaultRouteInAllNodes (1);
   ipv6.SetBase (Ipv6Address ("2001:2::"), Ipv6Prefix (64));
   Ipv6InterfaceContainer i2 = ipv6.Assign (d2);
-  i2.SetRouter (0, true);
+  i2.SetForwarding (0, true);
+  i2.SetDefaultRouteInAllNodes (0);
 
   stackHelper.PrintRoutingTable (n0);
 
diff -Naur ns-3.17/examples/tutorial/examples-to-run.py ns-3.18/examples/tutorial/examples-to-run.py
--- ns-3.17/examples/tutorial/examples-to-run.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/examples/tutorial/examples-to-run.py	2013-10-26 07:07:29.487364379 -0700
@@ -15,6 +15,7 @@
     ("fourth", "True", "True"),
     ("fifth", "True", "True"),
     ("sixth", "True", "True"),
+    ("seventh", "True", "True"),
 ]
 
 # A list of Python examples to run in order to ensure that they remain
diff -Naur ns-3.17/examples/tutorial/first.cc ns-3.18/examples/tutorial/first.cc
--- ns-3.17/examples/tutorial/first.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/examples/tutorial/first.cc	2013-10-26 07:07:29.487364379 -0700
@@ -27,6 +27,7 @@
 int
 main (int argc, char *argv[])
 {
+  Time::SetResolution (Time::NS);
   LogComponentEnable ("UdpEchoClientApplication", LOG_LEVEL_INFO);
   LogComponentEnable ("UdpEchoServerApplication", LOG_LEVEL_INFO);
 
diff -Naur ns-3.17/examples/tutorial/seventh.cc ns-3.18/examples/tutorial/seventh.cc
--- ns-3.17/examples/tutorial/seventh.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/examples/tutorial/seventh.cc	2013-10-26 07:07:29.487364379 -0700
@@ -0,0 +1,300 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <fstream>
+#include "ns3/core-module.h"
+#include "ns3/network-module.h"
+#include "ns3/internet-module.h"
+#include "ns3/point-to-point-module.h"
+#include "ns3/applications-module.h"
+#include "ns3/stats-module.h"
+
+using namespace ns3;
+
+NS_LOG_COMPONENT_DEFINE ("SeventhScriptExample");
+
+// ===========================================================================
+//
+//         node 0                 node 1
+//   +----------------+    +----------------+
+//   |    ns-3 TCP    |    |    ns-3 TCP    |
+//   +----------------+    +----------------+
+//   |    10.1.1.1    |    |    10.1.1.2    |
+//   +----------------+    +----------------+
+//   | point-to-point |    | point-to-point |
+//   +----------------+    +----------------+
+//           |                     |
+//           +---------------------+
+//                5 Mbps, 2 ms
+//
+//
+// We want to look at changes in the ns-3 TCP congestion window.  We need
+// to crank up a flow and hook the CongestionWindow attribute on the socket
+// of the sender.  Normally one would use an on-off application to generate a
+// flow, but this has a couple of problems.  First, the socket of the on-off
+// application is not created until Application Start time, so we wouldn't be
+// able to hook the socket (now) at configuration time.  Second, even if we
+// could arrange a call after start time, the socket is not public so we
+// couldn't get at it.
+//
+// So, we can cook up a simple version of the on-off application that does what
+// we want.  On the plus side we don't need all of the complexity of the on-off
+// application.  On the minus side, we don't have a helper, so we have to get
+// a little more involved in the details, but this is trivial.
+//
+// So first, we create a socket and do the trace connect on it; then we pass
+// this socket into the constructor of our simple application which we then
+// install in the source node.
+// ===========================================================================
+//
+class MyApp : public Application
+{
+public:
+  MyApp ();
+  virtual ~MyApp ();
+
+  void Setup (Ptr<Socket> socket, Address address, uint32_t packetSize, uint32_t nPackets, DataRate dataRate);
+
+private:
+  virtual void StartApplication (void);
+  virtual void StopApplication (void);
+
+  void ScheduleTx (void);
+  void SendPacket (void);
+
+  Ptr<Socket>     m_socket;
+  Address         m_peer;
+  uint32_t        m_packetSize;
+  uint32_t        m_nPackets;
+  DataRate        m_dataRate;
+  EventId         m_sendEvent;
+  bool            m_running;
+  uint32_t        m_packetsSent;
+};
+
+MyApp::MyApp ()
+  : m_socket (0),
+    m_peer (),
+    m_packetSize (0),
+    m_nPackets (0),
+    m_dataRate (0),
+    m_sendEvent (),
+    m_running (false),
+    m_packetsSent (0)
+{
+}
+
+MyApp::~MyApp ()
+{
+  m_socket = 0;
+}
+
+void
+MyApp::Setup (Ptr<Socket> socket, Address address, uint32_t packetSize, uint32_t nPackets, DataRate dataRate)
+{
+  m_socket = socket;
+  m_peer = address;
+  m_packetSize = packetSize;
+  m_nPackets = nPackets;
+  m_dataRate = dataRate;
+}
+
+void
+MyApp::StartApplication (void)
+{
+  m_running = true;
+  m_packetsSent = 0;
+  if (InetSocketAddress::IsMatchingType (m_peer))
+    {
+      m_socket->Bind ();
+    }
+  else
+    {
+      m_socket->Bind6 ();
+    }
+  m_socket->Connect (m_peer);
+  SendPacket ();
+}
+
+void
+MyApp::StopApplication (void)
+{
+  m_running = false;
+
+  if (m_sendEvent.IsRunning ())
+    {
+      Simulator::Cancel (m_sendEvent);
+    }
+
+  if (m_socket)
+    {
+      m_socket->Close ();
+    }
+}
+
+void
+MyApp::SendPacket (void)
+{
+  Ptr<Packet> packet = Create<Packet> (m_packetSize);
+  m_socket->Send (packet);
+
+  if (++m_packetsSent < m_nPackets)
+    {
+      ScheduleTx ();
+    }
+}
+
+void
+MyApp::ScheduleTx (void)
+{
+  if (m_running)
+    {
+      Time tNext (Seconds (m_packetSize * 8 / static_cast<double> (m_dataRate.GetBitRate ())));
+      m_sendEvent = Simulator::Schedule (tNext, &MyApp::SendPacket, this);
+    }
+}
+
+static void
+CwndChange (Ptr<OutputStreamWrapper> stream, uint32_t oldCwnd, uint32_t newCwnd)
+{
+  NS_LOG_UNCOND (Simulator::Now ().GetSeconds () << "\t" << newCwnd);
+  *stream->GetStream () << Simulator::Now ().GetSeconds () << "\t" << oldCwnd << "\t" << newCwnd << std::endl;
+}
+
+static void
+RxDrop (Ptr<PcapFileWrapper> file, Ptr<const Packet> p)
+{
+  NS_LOG_UNCOND ("RxDrop at " << Simulator::Now ().GetSeconds ());
+  file->Write (Simulator::Now (), p);
+}
+
+int
+main (int argc, char *argv[])
+{
+  bool useV6 = false;
+
+  CommandLine cmd;
+  cmd.AddValue ("useIpv6", "Use Ipv6", useV6);
+  cmd.Parse (argc, argv);
+
+  NodeContainer nodes;
+  nodes.Create (2);
+
+  PointToPointHelper pointToPoint;
+  pointToPoint.SetDeviceAttribute ("DataRate", StringValue ("5Mbps"));
+  pointToPoint.SetChannelAttribute ("Delay", StringValue ("2ms"));
+
+  NetDeviceContainer devices;
+  devices = pointToPoint.Install (nodes);
+
+  Ptr<RateErrorModel> em = CreateObject<RateErrorModel> ();
+  em->SetAttribute ("ErrorRate", DoubleValue (0.00001));
+  devices.Get (1)->SetAttribute ("ReceiveErrorModel", PointerValue (em));
+
+  InternetStackHelper stack;
+  stack.Install (nodes);
+
+  uint16_t sinkPort = 8080;
+  Address sinkAddress;
+  Address anyAddress;
+  std::string probeName;
+  std::string probeTrace;
+  if (useV6 == false)
+    {
+      Ipv4AddressHelper address;
+      address.SetBase ("10.1.1.0", "255.255.255.0");
+      Ipv4InterfaceContainer interfaces = address.Assign (devices);
+      sinkAddress = InetSocketAddress (interfaces.GetAddress (1), sinkPort);
+      anyAddress = InetSocketAddress (Ipv4Address::GetAny (), sinkPort);
+      probeName = "ns3::Ipv4PacketProbe";
+      probeTrace = "/NodeList/*/$ns3::Ipv4L3Protocol/Tx";
+    }
+  else
+    {
+      Ipv6AddressHelper address;
+      address.SetBase ("2001:0000:f00d:cafe::", Ipv6Prefix (64));
+      Ipv6InterfaceContainer interfaces = address.Assign (devices);
+      sinkAddress = Inet6SocketAddress (interfaces.GetAddress (1,1), sinkPort);
+      anyAddress = Inet6SocketAddress (Ipv6Address::GetAny (), sinkPort);
+      probeName = "ns3::Ipv6PacketProbe";
+      probeTrace = "/NodeList/*/$ns3::Ipv6L3Protocol/Tx";
+    }
+
+  PacketSinkHelper packetSinkHelper ("ns3::TcpSocketFactory", anyAddress);
+  ApplicationContainer sinkApps = packetSinkHelper.Install (nodes.Get (1));
+  sinkApps.Start (Seconds (0.));
+  sinkApps.Stop (Seconds (20.));
+
+  Ptr<Socket> ns3TcpSocket = Socket::CreateSocket (nodes.Get (0), TcpSocketFactory::GetTypeId ());
+
+  Ptr<MyApp> app = CreateObject<MyApp> ();
+  app->Setup (ns3TcpSocket, sinkAddress, 1040, 1000, DataRate ("1Mbps"));
+  nodes.Get (0)->AddApplication (app);
+  app->SetStartTime (Seconds (1.));
+  app->SetStopTime (Seconds (20.));
+
+  AsciiTraceHelper asciiTraceHelper;
+  Ptr<OutputStreamWrapper> stream = asciiTraceHelper.CreateFileStream ("seventh.cwnd");
+  ns3TcpSocket->TraceConnectWithoutContext ("CongestionWindow", MakeBoundCallback (&CwndChange, stream));
+
+  PcapHelper pcapHelper;
+  Ptr<PcapFileWrapper> file = pcapHelper.CreateFile ("seventh.pcap", std::ios::out, PcapHelper::DLT_PPP);
+  devices.Get (1)->TraceConnectWithoutContext ("PhyRxDrop", MakeBoundCallback (&RxDrop, file));
+
+  // Use GnuplotHelper to plot the packet byte count over time
+  GnuplotHelper plotHelper;
+
+  // Configure the plot.  The first argument is the file name prefix
+  // for the output files generated.  The second, third, and fourth
+  // arguments are, respectively, the plot title, x-axis, and y-axis labels
+  plotHelper.ConfigurePlot ("seventh-packet-byte-count",
+                            "Packet Byte Count vs. Time",
+                            "Time (Seconds)",
+                            "Packet Byte Count");
+
+  // Specify the probe type, probe path (in configuration namespace), and
+  // probe output trace source ("OutputBytes") to plot.  The fourth argument
+  // specifies the name of the data series label on the plot.  The last
+  // argument formats the plot by specifying where the key should be placed.
+  plotHelper.PlotProbe (probeName,
+                        probeTrace,
+                        "OutputBytes",
+                        "Packet Byte Count",
+                        GnuplotAggregator::KEY_BELOW);
+
+  // Use FileHelper to write out the packet byte count over time
+  FileHelper fileHelper;
+
+  // Configure the file to be written, and the formatting of output data.
+  fileHelper.ConfigureFile ("seventh-packet-byte-count",
+                            FileAggregator::FORMATTED);
+
+  // Set the labels for this formatted output file.
+  fileHelper.Set2dFormat ("Time (Seconds) = %.3e\tPacket Byte Count = %.0f");
+
+  // Specify the probe type, probe path (in configuration namespace), and
+  // probe output trace source ("OutputBytes") to write.
+  fileHelper.WriteProbe (probeName,
+                         probeTrace,
+                         "OutputBytes");
+
+  Simulator::Stop (Seconds (20));
+  Simulator::Run ();
+  Simulator::Destroy ();
+
+  return 0;
+}
+
diff -Naur ns-3.17/examples/tutorial/sixth.cc ns-3.18/examples/tutorial/sixth.cc
--- ns-3.17/examples/tutorial/sixth.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/examples/tutorial/sixth.cc	2013-10-26 07:07:29.487364379 -0700
@@ -43,10 +43,10 @@
 // We want to look at changes in the ns-3 TCP congestion window.  We need
 // to crank up a flow and hook the CongestionWindow attribute on the socket
 // of the sender.  Normally one would use an on-off application to generate a
-// flow, but this has a couple of problems.  First, the socket of the on-off 
-// application is not created until Application Start time, so we wouldn't be 
-// able to hook the socket (now) at configuration time.  Second, even if we 
-// could arrange a call after start time, the socket is not public so we 
+// flow, but this has a couple of problems.  First, the socket of the on-off
+// application is not created until Application Start time, so we wouldn't be
+// able to hook the socket (now) at configuration time.  Second, even if we
+// could arrange a call after start time, the socket is not public so we
 // couldn't get at it.
 //
 // So, we can cook up a simple version of the on-off application that does what
@@ -54,17 +54,16 @@
 // application.  On the minus side, we don't have a helper, so we have to get
 // a little more involved in the details, but this is trivial.
 //
-// So first, we create a socket and do the trace connect on it; then we pass 
-// this socket into the constructor of our simple application which we then 
+// So first, we create a socket and do the trace connect on it; then we pass
+// this socket into the constructor of our simple application which we then
 // install in the source node.
 // ===========================================================================
 //
-class MyApp : public Application 
+class MyApp : public Application
 {
 public:
-
   MyApp ();
-  virtual ~MyApp();
+  virtual ~MyApp ();
 
   void Setup (Ptr<Socket> socket, Address address, uint32_t packetSize, uint32_t nPackets, DataRate dataRate);
 
@@ -86,18 +85,18 @@
 };
 
 MyApp::MyApp ()
-  : m_socket (0), 
-    m_peer (), 
-    m_packetSize (0), 
-    m_nPackets (0), 
-    m_dataRate (0), 
-    m_sendEvent (), 
-    m_running (false), 
+  : m_socket (0),
+    m_peer (),
+    m_packetSize (0),
+    m_nPackets (0),
+    m_dataRate (0),
+    m_sendEvent (),
+    m_running (false),
     m_packetsSent (0)
 {
 }
 
-MyApp::~MyApp()
+MyApp::~MyApp ()
 {
   m_socket = 0;
 }
@@ -122,7 +121,7 @@
   SendPacket ();
 }
 
-void 
+void
 MyApp::StopApplication (void)
 {
   m_running = false;
@@ -138,7 +137,7 @@
     }
 }
 
-void 
+void
 MyApp::SendPacket (void)
 {
   Ptr<Packet> packet = Create<Packet> (m_packetSize);
@@ -150,7 +149,7 @@
     }
 }
 
-void 
+void
 MyApp::ScheduleTx (void)
 {
   if (m_running)
@@ -174,7 +173,7 @@
   file->Write (Simulator::Now (), p);
 }
 
-int 
+int
 main (int argc, char *argv[])
 {
   NodeContainer nodes;
diff -Naur ns-3.17/examples/tutorial/wscript ns-3.18/examples/tutorial/wscript
--- ns-3.17/examples/tutorial/wscript	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/examples/tutorial/wscript	2013-10-26 07:07:29.487364379 -0700
@@ -23,3 +23,6 @@
 
     obj = bld.create_ns3_program('sixth', ['core', 'point-to-point', 'internet', 'applications'])
     obj.source = 'sixth.cc'
+
+    obj = bld.create_ns3_program('seventh', ['core', 'stats', 'point-to-point', 'internet', 'applications'])
+    obj.source = 'seventh.cc'
diff -Naur ns-3.17/examples/wireless/ht-wifi-network.cc ns-3.18/examples/wireless/ht-wifi-network.cc
--- ns-3.17/examples/wireless/ht-wifi-network.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/examples/wireless/ht-wifi-network.cc	2013-10-26 07:07:29.479364378 -0700
@@ -0,0 +1,244 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2009 MIRKO BANCHI
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as 
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Mirko Banchi <mk.banchi@gmail.com>
+ */
+#include "ns3/core-module.h"
+#include "ns3/network-module.h"
+#include "ns3/applications-module.h"
+#include "ns3/wifi-module.h"
+#include "ns3/mobility-module.h"
+#include "ns3/ipv4-global-routing-helper.h"
+#include "ns3/internet-module.h"
+
+//This is a simple example in order to show how 802.11n frame aggregation feature (A-MSDU) works.
+//
+//Network topology:
+// 
+//  Wifi 192.168.1.0
+// 
+//             AP
+//   *    *    *
+//   |    |    |
+//   n1   n2   n3 
+//
+//Packets in this simulation aren't marked with a QosTag so they are considered
+//belonging to BestEffort Access Class (AC_BE).
+
+using namespace ns3;
+
+NS_LOG_COMPONENT_DEFINE ("DataRates");
+
+double rxBytessum=0;
+double throughput=0;
+
+
+//===========================================================================
+//Set position of the nodes
+//===========================================================================
+static void
+SetPosition (Ptr<Node> node, Vector position)
+{
+  Ptr<MobilityModel> mobility = node->GetObject<MobilityModel> ();
+  mobility->SetPosition (position);
+}
+
+//==========================================================================
+//==========================================================================
+
+int main (int argc, char *argv[])
+{
+  std::cout << "DataRate" <<"  " << "Throughput" << '\n';
+  bool udp = true;
+  int i=2;
+  for (;i <= 2; i++)
+  {
+    uint32_t nWifi = 1;
+    CommandLine cmd;
+    cmd.AddValue ("nWifi", "Number of wifi STA devices", nWifi);
+    cmd.Parse (argc,argv);
+    Config::SetDefault ("ns3::WifiRemoteStationManager::FragmentationThreshold", StringValue ("990000"));
+    // disable rts cts all the time.
+    Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold", StringValue ("99000"));
+    NodeContainer wifiNodes;
+    wifiNodes.Create (1);
+    NodeContainer wifiApNode;
+    wifiApNode.Create (1);
+ 
+    YansWifiChannelHelper channel = YansWifiChannelHelper::Default ();
+    YansWifiPhyHelper phy = YansWifiPhyHelper::Default ();
+    phy.SetChannel (channel.Create ());
+    if (i ==3 || i == 4)
+      phy.Set ("ShortGuardEnabled",BooleanValue(true));
+      //phy.Set ("GreenfieldEnabled",BooleanValue(true));
+
+    WifiHelper wifi = WifiHelper::Default ();
+    wifi.SetStandard (WIFI_PHY_STANDARD_80211n_2_4GHZ);
+    HtWifiMacHelper mac = HtWifiMacHelper::Default ();
+ 
+
+    Ssid ssid = Ssid ("ns380211n");
+    double datarate;
+    StringValue DataRate;
+    if (i==0)
+      {
+        DataRate = StringValue("OfdmRate6_5MbpsBW20MHz");
+        datarate = 6.5;
+      }
+    else if (i==1)
+      {
+        DataRate = StringValue("OfdmRate58_5MbpsBW20MHz");
+        datarate = 58.5;
+      }
+    else if (i == 2)
+      {
+        DataRate = StringValue("OfdmRate65MbpsBW20MHz");
+        datarate = 65;
+      }
+    else if (i == 3)
+      {
+        DataRate = StringValue("OfdmRate57_8MbpsBW20MHz");
+        datarate = 57.8;
+      }
+    else if (i == 4)
+      {
+        DataRate = StringValue("OfdmRate72_2MbpsBW20MHz");
+        datarate = 72.2;
+      }
+
+    wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager","DataMode", DataRate,
+                                   "ControlMode", DataRate);
+    mac.SetType ("ns3::StaWifiMac",
+                 "Ssid", SsidValue (ssid),
+                 "ActiveProbing", BooleanValue (false));
+    
+    NetDeviceContainer staDevices;
+    staDevices = wifi.Install (phy, mac, wifiNodes);
+
+    mac.SetType ("ns3::ApWifiMac",
+                 "Ssid", SsidValue (ssid));
+   
+    NetDeviceContainer apDevice;
+    apDevice = wifi.Install (phy, mac, wifiApNode);
+   /* Ptr<WifiRemoteStationManager> apStationManager =
+              DynamicCast<WifiNetDevice>(apDevice.Get (0))->GetRemoteStationManager ();
+    apStationManager->AddBasicMode (WifiMode ("OfdmRate13MbpsBW20MHz"));
+    apStationManager->AddBasicMode (WifiMode ("OfdmRate19_5MbpsBW20MHz"));
+    apStationManager->AddBasicMode (WifiMode ("OfdmRate26MbpsBW20MHz"));
+    apStationManager->AddBasicMode (WifiMode ("OfdmRate39MbpsBW20MHz"));
+    Ptr<WifiRemoteStationManager> staStationManager =
+              DynamicCast<WifiNetDevice> (staDevices.Get (0))->GetRemoteStationManager ();
+    staStationManager->AddBasicMode (WifiMode ("OfdmRate13MbpsBW20MHz"));
+    staStationManager->AddBasicMode (WifiMode ("OfdmRate19_5MbpsBW20MHz"));
+    staStationManager->AddBasicMode (WifiMode ("OfdmRate26MbpsBW20MHz"));
+    staStationManager->AddBasicMode (WifiMode ("OfdmRate39MbpsBW20MHz"));*/
+              
+   // mobility.
+   MobilityHelper mobility;
+   mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
+   mobility.Install (wifiNodes);
+   mobility.Install (wifiApNode);
+    
+   SetPosition (wifiNodes.Get(0), Vector (1.0,0.0,0.0));
+   SetPosition (wifiApNode.Get(0), Vector (0.0,0.0,0.0));
+ 
+
+   /* Internet stack*/
+   InternetStackHelper stack;
+   stack.Install (wifiApNode);
+   stack.Install (wifiNodes);
+
+   Ipv4AddressHelper address;
+
+   address.SetBase ("10.1.3.0", "255.255.255.0");
+   Ipv4InterfaceContainer wifiNodesInterfaces;
+   Ipv4InterfaceContainer apNodeInterface;
+
+   wifiNodesInterfaces = address.Assign (staDevices);
+   apNodeInterface = address.Assign (apDevice);
+
+   ApplicationContainer serverApps,sink1App;
+
+   double t=10;
+
+   /* Setting applications */
+   if (udp)
+     {
+       UdpServerHelper myServer (9);
+       serverApps = myServer.Install (wifiNodes.Get (0));
+       serverApps.Start (Seconds (0.0));
+       serverApps.Stop (Seconds (t));
+
+       UdpClientHelper myClient (wifiNodesInterfaces.GetAddress (0), 9);
+       myClient.SetAttribute ("MaxPackets", UintegerValue (64707202));
+       myClient.SetAttribute ("Interval", TimeValue (Time ("0.00002")));
+       myClient.SetAttribute ("PacketSize", UintegerValue (1500));
+ 
+       ApplicationContainer clientApps = myClient.Install (wifiApNode.Get (0));
+       clientApps.Start (Seconds (0.0));
+       clientApps.Stop (Seconds (t));
+     }
+   else
+     {
+
+       //TCP flow
+       uint16_t port = 50000;
+       Address apLocalAddress (InetSocketAddress (Ipv4Address::GetAny (), port));
+       PacketSinkHelper packetSinkHelper ("ns3::TcpSocketFactory", apLocalAddress);
+       sink1App = packetSinkHelper.Install (wifiNodes.Get (0));
+
+       sink1App.Start (Seconds (0.0));
+       sink1App.Stop (Seconds (t));
+            
+       OnOffHelper onoff ("ns3::TcpSocketFactory",Ipv4Address::GetAny ());
+       onoff.SetAttribute ("OnTime", RandomVariableValue (ConstantVariable(30)));//in seconds
+       onoff.SetAttribute ("OffTime", RandomVariableValue (ConstantVariable(0)));
+       onoff.SetAttribute ("PacketSize", UintegerValue (1500-30));//1024
+       onoff.SetAttribute ("DataRate", DataRateValue (100000000));//51200
+       ApplicationContainer apps;
+
+       AddressValue remoteAddress (InetSocketAddress (wifiNodesInterfaces.GetAddress(0), port));
+       onoff.SetAttribute ("Remote", remoteAddress);
+       apps.Add (onoff.Install (wifiApNode.Get (0)));
+       apps.Start (Seconds (0.0));
+       apps.Stop (Seconds (t));
+     }
+
+  
+   Ipv4GlobalRoutingHelper::PopulateRoutingTables ();
+
+   Simulator::Stop (Seconds (t));
+   Simulator::Run ();
+   Simulator::Destroy ();
+
+   //UDP
+   if (udp)
+     {
+       uint32_t totalPacketsThrough = DynamicCast<UdpServer>(serverApps.Get (0))->GetReceived ();
+       throughput=totalPacketsThrough*1500*8/(t*1000000.0);
+     }
+   else
+     {
+       //TCP
+       uint32_t totalPacketsThrough = DynamicCast<PacketSink>(sink1App.Get (0))->GetTotalRx ();
+       throughput=totalPacketsThrough*8/((t-3)*1000000.0);
+     }
+  
+   std::cout << datarate <<"  " << throughput << '\n';
+   }
+  return 0;
+} 
diff -Naur ns-3.17/examples/wireless/multirate.cc ns-3.18/examples/wireless/multirate.cc
--- ns-3.17/examples/wireless/multirate.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/examples/wireless/multirate.cc	2013-10-26 07:07:29.483364379 -0700
@@ -52,7 +52,7 @@
 #include "ns3/network-module.h"
 #include "ns3/applications-module.h"
 #include "ns3/mobility-module.h"
-#include "ns3/tools-module.h"
+#include "ns3/stats-module.h"
 #include "ns3/random-variable-stream.h"
 #include "ns3/wifi-module.h"
 #include "ns3/internet-module.h"
@@ -103,6 +103,7 @@
 
   double totalTime; 
   double expMean;
+  double samplingPeriod;
 
   uint32_t bytesTotal;
   uint32_t packetSize;
@@ -129,6 +130,7 @@
   m_output (name),
   totalTime (0.3),
   expMean (0.1), //flows being exponentially distributed
+  samplingPeriod(0.1),
   bytesTotal (0),
   packetSize (2000),
   gridSize (10), //10x10 grid  for a total of 100 nodes
@@ -172,12 +174,12 @@
 void
 Experiment::CheckThroughput ()
 {
-  double mbs = ((bytesTotal * 8.0) /1000000);
+  double mbs = ((bytesTotal * 8.0) /1000000 /samplingPeriod);
   bytesTotal = 0;
   m_output.Add ((Simulator::Now ()).GetSeconds (), mbs);
 
-  //check throughput every 1/10 of a second 
-  Simulator::Schedule (Seconds (0.1), &Experiment::CheckThroughput, this);
+  //check throughput every samplingPeriod second
+  Simulator::Schedule (Seconds (samplingPeriod), &Experiment::CheckThroughput, this);
 }
 
 /**
@@ -534,6 +536,17 @@
   CommandLine cmd;
   cmd.AddValue ("packetSize", "packet size", packetSize);
   cmd.AddValue ("totalTime", "simulation time", totalTime);
+  // according to totalTime, select an appropriate samplingPeriod automatically.
+  if (totalTime < 1.0)
+    {
+	  samplingPeriod = 0.1;
+    }
+  else
+    {
+	  samplingPeriod = 1.0;
+    }
+  // or user selects a samplingPeriod.
+  cmd.AddValue ("samplingPeriod", "sampling period", samplingPeriod);
   cmd.AddValue ("rtsThreshold", "rts threshold", rtsThreshold);
   cmd.AddValue ("rateManager", "type of rate", rateManager);
   cmd.AddValue ("outputFileName", "output filename", outputFileName);
diff -Naur ns-3.17/examples/wireless/wifi-adhoc.cc ns-3.18/examples/wireless/wifi-adhoc.cc
--- ns-3.17/examples/wireless/wifi-adhoc.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/examples/wireless/wifi-adhoc.cc	2013-10-26 07:07:29.483364379 -0700
@@ -22,7 +22,7 @@
 #include "ns3/network-module.h"
 #include "ns3/applications-module.h"
 #include "ns3/mobility-module.h"
-#include "ns3/tools-module.h"
+#include "ns3/stats-module.h"
 #include "ns3/wifi-module.h"
 
 #include <iostream>
diff -Naur ns-3.17/examples/wireless/wifi-clear-channel-cmu.cc ns-3.18/examples/wireless/wifi-clear-channel-cmu.cc
--- ns-3.17/examples/wireless/wifi-clear-channel-cmu.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/examples/wireless/wifi-clear-channel-cmu.cc	2013-10-26 07:07:29.483364379 -0700
@@ -21,7 +21,7 @@
 #include "ns3/core-module.h"
 #include "ns3/network-module.h"
 #include "ns3/mobility-module.h"
-#include "ns3/tools-module.h"
+#include "ns3/stats-module.h"
 #include "ns3/wifi-module.h"
 #include "ns3/internet-module.h"
 
diff -Naur ns-3.17/examples/wireless/wifi-hidden-terminal.cc ns-3.18/examples/wireless/wifi-hidden-terminal.cc
--- ns-3.17/examples/wireless/wifi-hidden-terminal.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/examples/wireless/wifi-hidden-terminal.cc	2013-10-26 07:07:29.483364379 -0700
@@ -109,19 +109,19 @@
   cbrApps.Add (onOffHelper.Install (nodes.Get (0))); 
 
   // flow 2:  node 2 -> node 1
-  // The slightly different start times and data rates are a workround
-  // for Bug 388 and Bug 912
-  // http://www.nsnam.org/bugzilla/show_bug.cgi?id=912
-  // http://www.nsnam.org/bugzilla/show_bug.cgi?id=388
+  /** \internal
+   * The slightly different start times and data rates are a workaround
+   * for \bugid{388} and \bugid{912}
+   */
   onOffHelper.SetAttribute ("DataRate", StringValue ("3001100bps"));
   onOffHelper.SetAttribute ("StartTime", TimeValue (Seconds (1.001)));
   cbrApps.Add (onOffHelper.Install (nodes.Get (2))); 
 
-  // we also use separate UDP applications that will send a single
-  // packet before the CBR flows start. 
-  // This is a workround for the lack of perfect ARP, see Bug 187
-  // http://www.nsnam.org/bugzilla/show_bug.cgi?id=187
-
+  /** \internal
+   * We also use separate UDP applications that will send a single
+   * packet before the CBR flows start. 
+   * This is a workaround for the lack of perfect ARP, see \bugid{187}
+   */
   uint16_t  echoPort = 9;
   UdpEchoClientHelper echoClientHelper (Ipv4Address ("10.0.0.2"), echoPort);
   echoClientHelper.SetAttribute ("MaxPackets", UintegerValue (1));
@@ -156,9 +156,10 @@
       if (i->first > 2)
         {
           Ipv4FlowClassifier::FiveTuple t = classifier->FindFlow (i->first);
-          std::cout << "Flow " << i->first - 2 << " (" << t.sourceAddress << " -> " << t.destinationAddress << ")\n";           std::cout << "  Tx Bytes:   " << i->second.txBytes << "\n";
+          std::cout << "Flow " << i->first - 2 << " (" << t.sourceAddress << " -> " << t.destinationAddress << ")\n";
+          std::cout << "  Tx Bytes:   " << i->second.txBytes << "\n";
           std::cout << "  Rx Bytes:   " << i->second.rxBytes << "\n";
-          std::cout << "  Throughput: " << i->second.rxBytes * 8.0 / 10.0 / 1024 / 1024  << " Mbps\n";
+          std::cout << "  Throughput: " << i->second.rxBytes * 8.0 / 10.0 / 1000 / 1000  << " Mbps\n";
         }
     }
 
diff -Naur ns-3.17/examples/wireless/wscript ns-3.18/examples/wireless/wscript
--- ns-3.17/examples/wireless/wscript	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/examples/wireless/wscript	2013-10-26 07:07:29.479364378 -0700
@@ -8,16 +8,16 @@
     bld.register_ns3_script('mixed-wireless.py', ['core', 'mobility', 'wifi', 'applications', 'point-to-point', 
                                                     'internet', 'csma', 'olsr'])
 
-    obj = bld.create_ns3_program('wifi-adhoc', ['core', 'mobility', 'wifi', 'applications', 'tools'])
+    obj = bld.create_ns3_program('wifi-adhoc', ['core', 'mobility', 'wifi', 'applications', 'stats'])
     obj.source = 'wifi-adhoc.cc'
 
-    obj = bld.create_ns3_program('wifi-clear-channel-cmu', ['internet', 'mobility', 'wifi', 'tools'])
+    obj = bld.create_ns3_program('wifi-clear-channel-cmu', ['internet', 'mobility', 'wifi', 'stats'])
     obj.source = 'wifi-clear-channel-cmu.cc'
 
-    obj = bld.create_ns3_program('wifi-ap', ['core', 'mobility', 'wifi', 'applications', 'config-store', 'tools'])
+    obj = bld.create_ns3_program('wifi-ap', ['core', 'mobility', 'wifi', 'applications', 'config-store', 'stats'])
     obj.source = 'wifi-ap.cc'
 
-    bld.register_ns3_script('wifi-ap.py', ['core', 'mobility', 'wifi', 'applications', 'config-store', 'tools'])
+    bld.register_ns3_script('wifi-ap.py', ['core', 'mobility', 'wifi', 'applications', 'config-store', 'stats'])
 
     obj = bld.create_ns3_program('wifi-wired-bridging', ['internet', 'mobility', 'wifi', 'csma', 'bridge', 'applications'])
     obj.source = 'wifi-wired-bridging.cc'
@@ -25,26 +25,29 @@
     obj = bld.create_ns3_program('simple-wifi-frame-aggregation', ['internet', 'mobility', 'wifi', 'applications'])
     obj.source = 'simple-wifi-frame-aggregation.cc'
 
-    obj = bld.create_ns3_program('multirate', ['internet', 'mobility', 'wifi', 'tools', 'flow-monitor', 'olsr', 'applications', 'point-to-point'])
+    obj = bld.create_ns3_program('multirate', ['internet', 'mobility', 'wifi', 'stats', 'flow-monitor', 'olsr', 'applications', 'point-to-point'])
     obj.source = 'multirate.cc'
 
-    obj = bld.create_ns3_program('wifi-simple-adhoc', ['internet', 'mobility', 'wifi', 'config-store', 'tools'])
+    obj = bld.create_ns3_program('wifi-simple-adhoc', ['internet', 'mobility', 'wifi', 'config-store', 'stats'])
     obj.source = 'wifi-simple-adhoc.cc'
 
-    obj = bld.create_ns3_program('wifi-simple-adhoc-grid', ['internet', 'mobility', 'wifi', 'olsr', 'config-store', 'tools', 'point-to-point'])
+    obj = bld.create_ns3_program('wifi-simple-adhoc-grid', ['internet', 'mobility', 'wifi', 'olsr', 'config-store', 'stats', 'point-to-point'])
     obj.source = 'wifi-simple-adhoc-grid.cc'
 
     obj = bld.create_ns3_program('wifi-simple-infra', ['internet', 'mobility', 'wifi','config-store'])
     obj.source = 'wifi-simple-infra.cc'
 
-    obj = bld.create_ns3_program('wifi-simple-interference', ['internet', 'mobility', 'wifi', 'config-store', 'tools'])
+    obj = bld.create_ns3_program('wifi-simple-interference', ['internet', 'mobility', 'wifi', 'config-store', 'stats'])
     obj.source = 'wifi-simple-interference.cc'
 
     obj = bld.create_ns3_program('wifi-blockack', ['internet', 'mobility', 'wifi', 'applications'])
     obj.source = 'wifi-blockack.cc'
 
-    obj = bld.create_ns3_program('ofdm-validation', ['core', 'mobility', 'wifi', 'config-store', 'tools'])
+    obj = bld.create_ns3_program('ofdm-validation', ['core', 'mobility', 'wifi', 'config-store', 'stats'])
     obj.source = 'ofdm-validation.cc'
 
     obj = bld.create_ns3_program('wifi-hidden-terminal', ['internet', 'mobility', 'wifi', 'applications', 'propagation', 'flow-monitor'])
     obj.source = 'wifi-hidden-terminal.cc'
+
+    obj = bld.create_ns3_program('ht-wifi-network', ['core','internet', 'mobility', 'wifi', 'applications', 'propagation'])
+    obj.source = 'ht-wifi-network.cc'
diff -Naur ns-3.17/Makefile ns-3.18/Makefile
--- ns-3.17/Makefile	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/Makefile	2013-10-26 07:07:30.611364407 -0700
@@ -0,0 +1,20 @@
+# Makefile wrapper for waf
+
+all:
+	./waf
+
+# free free to change this part to suit your requirements
+configure:
+	./waf configure --enable-examples --enable-tests
+
+build:
+	./waf build
+
+install:
+	./waf install
+
+clean:
+	./waf clean
+
+distclean:
+	./waf distclean
diff -Naur ns-3.17/RELEASE_NOTES ns-3.18/RELEASE_NOTES
--- ns-3.17/RELEASE_NOTES	2013-05-14 07:37:33.000000000 -0700
+++ ns-3.18/RELEASE_NOTES	2013-10-26 07:07:29.479364378 -0700
@@ -9,6 +9,91 @@
 Consult the file CHANGES.html for more detailed information about changed
 API and behavior across ns-3 releases.
 
+Release 3.18
+============
+
+Availability
+------------
+This release is available from: 
+http://www.nsnam.org/release/ns-allinone-3.18.tar.bz2
+
+Supported platforms
+-------------------
+
+New user-visible features
+-------------------------
+- Time attributes can now be bounded.  See attribute-test-suite.cc for an
+  example.
+- Data collection components have been added to the stats module.  These
+  components can be used to generate time series data in files and plots.
+- IPv6 address class 2001:db8::/32 is now dropped by routers (RFC 3849).
+- New generic hash function interface.  Two hash functions are provided:
+  murmur3 (default), and the venerable FNV1a.  See the Hash Functions
+  section in the Manual.
+- New Mac16Address has been added, Mac64Address is now in-line with 
+  Mac48Address and all the three can be used in IPv6 autoconfigure. 
+- Previously, the use of Building models was limited to the use of the
+  companion BuildingsMobilityModel. Now, any MobilityModel can be
+  used with Building models. 
+- The latest LTE module code by the LENA project has been merged,
+  including the following new features: 
+   - PHY support for UE measurements (RSRP and RSRQ)
+   - RRC support for UE measurements (configuration, execution, reporting)
+   - Automatic Handover trigger based on RRC UE measurement reports
+- IPv6 can now detect and use Path-MTU. See 
+  examples/ipv6/fragmentation-ipv6-two-MTU.cc for an example.
+- Radvd application have a new Helper. See the updated 
+  examples/ipv6/radvd.cc for an example.
+- 11n- It is now possible to create a high throughput (HT) node that used the new 11n data rates and preambles.
+- It is now possible to request printing command line arguments to the
+  desired output stream using PrintHelp or operator <<
+
+Bugs fixed
+----------
+- Bug  760 - IP address removal can be painful
+- Bug 1190 - Suppress hello if bcast was sent within the last hello interval
+- Bug 1296 - Enhancement in Ipv[4,6]RoutingHelper
+- Bug 1390 - ICMPv6 Redirect are handled correctly only for /64 networks
+- Bug 1522 - Hidden node scenario leads to ARP failure
+- Bug 1584 - Old Association Request Timeouts are not canceled
+- Bug 1629 - Make AODV Default to Disable Hello
+- Bug 1643 - NdiscCache creation and existence checks
+- Bug 1646 - ICMPv6 Redirect are sent from global address instead of link-local
+- Bug 1662 - m_type not set for Ipv6OptionRouterAlertHeader
+- Bug 1678 - C++11 compliance problem with std::pair"
+- Bug 1682 - ./waf crashes on FC10
+- Bug 1683 - IPv6 autoconfigured don't use *infinite* lifetimes
+- Bug 1669 - ns-3 should support binding two and three (possibly more) arguments
+- Bug 1675 - Throughput computation error in Wireless examples
+- Bug 1687 - wscript features report doesn't respect NOCOLOR
+- Bug 1688 - Routers should advertise themselves from the link-local address
+- Bug 1689 - IPv6 shouldn't add a default gateway without checking the Router lifetime
+- Bug 1690 - missing header files from wifi wscript
+- Bug 1697 - ICMPv6 Redirect trigger contains multiple bugs
+- Bug 1698 - mobility.SetPositionAllocator misses prefix "ns3::"
+- Bug 1700 - Ipv6RawSocket does not honor the bound address when sending packets
+- Bug 1701 - Ipv6StaticRouting: the source address should match the destination scope
+- Bug 1702 - Ipv6InterfaceContainer::SetRouter should not always add the router as the default router.
+- Bug 1703 - Nodes don't react to a DAD
+- Bug 1712 - The IP (v4 and v6) forwarding needs a test
+- Bug 1718 - Ipv4StaticRouting log component is misspelled
+- Bug 1720 - IPv6 Fragmentation cause crashes
+- Bug 1721 - Path MTU isn't handled properly
+- Bug 1723 - name clash in ipv4-header.h with <termios.h>
+- Bug 1727 - Ping6 should use a proper source address
+- Bug 1728 - Radvd application is missing an Helper
+- Bug 1731 - lte-phy-error-model passes unexpectedly
+- Bug 1738 - strict aliasing compiler bug
+- Bug 1742 - IPv6 HbH and Dst Extension Header size is not correctly calculated
+- Bug 1752 - RadvdInterface m_defaultLifeTime is set to milliseconds instead of seconds
+- Bug 1753 - Halting Issue with DistributedSimulatorImpl
+- Bug 1754 - Missing GIL lock in generated callback destructor
+
+Known issues
+------------
+In general, known issues are tracked on the project tracker available
+at http://www.nsnam.org/bugzilla/
+
 Release 3.17
 ============
 
diff -Naur ns-3.17/src/antenna/bindings/modulegen__gcc_ILP32.py ns-3.18/src/antenna/bindings/modulegen__gcc_ILP32.py
--- ns-3.17/src/antenna/bindings/modulegen__gcc_ILP32.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/antenna/bindings/modulegen__gcc_ILP32.py	2013-10-26 07:07:29.679364384 -0700
@@ -28,6 +28,8 @@
     module.add_class('Item', import_from_module='ns.core', outer_class=root_module['ns3::AttributeConstructionList'])
     ## callback.h (module 'core'): ns3::CallbackBase [class]
     module.add_class('CallbackBase', import_from_module='ns.core')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
     ## object-base.h (module 'core'): ns3::ObjectBase [class]
     module.add_class('ObjectBase', allow_subclassing=True, import_from_module='ns.core')
     ## object.h (module 'core'): ns3::ObjectDeleter [struct]
@@ -60,6 +62,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::AttributeValue', 'ns3::empty', 'ns3::DefaultDeleter<ns3::AttributeValue>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::TraceSourceAccessor', 'ns3::empty', 'ns3::DefaultDeleter<ns3::TraceSourceAccessor>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -116,16 +120,53 @@
     nested_module = module.add_cpp_namespace('FatalImpl')
     register_types_ns3_FatalImpl(nested_module)
     
+    
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
 
 def register_types_ns3_FatalImpl(module):
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_methods(root_module):
     register_Ns3Angles_methods(root_module, root_module['ns3::Angles'])
     register_Ns3AttributeConstructionList_methods(root_module, root_module['ns3::AttributeConstructionList'])
     register_Ns3AttributeConstructionListItem_methods(root_module, root_module['ns3::AttributeConstructionList::Item'])
     register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3ObjectBase_methods(root_module, root_module['ns3::ObjectBase'])
     register_Ns3ObjectDeleter_methods(root_module, root_module['ns3::ObjectDeleter'])
     register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >'])
@@ -141,6 +182,7 @@
     register_Ns3SimpleRefCount__Ns3AttributeChecker_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeChecker__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> >'])
     register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >'])
     register_Ns3TraceSourceAccessor_methods(root_module, root_module['ns3::TraceSourceAccessor'])
     register_Ns3AntennaModel_methods(root_module, root_module['ns3::AntennaModel'])
@@ -160,6 +202,11 @@
     register_Ns3Vector2DValue_methods(root_module, root_module['ns3::Vector2DValue'])
     register_Ns3Vector3DChecker_methods(root_module, root_module['ns3::Vector3DChecker'])
     register_Ns3Vector3DValue_methods(root_module, root_module['ns3::Vector3DValue'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     return
 
 def register_Ns3Angles_methods(root_module, cls):
@@ -239,6 +286,35 @@
                    is_static=True, visibility='protected')
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3ObjectBase_methods(root_module, cls):
     ## object-base.h (module 'core'): ns3::ObjectBase::ObjectBase() [constructor]
     cls.add_constructor([])
@@ -372,6 +448,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -431,6 +512,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -649,6 +740,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -1072,6 +1175,111 @@
                    [param('ns3::Vector3D const &', 'value')])
     return
 
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_functions(root_module):
     module = root_module
     ## angles.h (module 'antenna'): extern double ns3::DegreesToRadians(double degrees) [free function]
@@ -1083,11 +1291,19 @@
                         'double', 
                         [param('double', 'radians')])
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     return
 
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def main():
     out = FileCodeSink(sys.stdout)
     root_module = module_init()
diff -Naur ns-3.17/src/antenna/bindings/modulegen__gcc_LP64.py ns-3.18/src/antenna/bindings/modulegen__gcc_LP64.py
--- ns-3.17/src/antenna/bindings/modulegen__gcc_LP64.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/antenna/bindings/modulegen__gcc_LP64.py	2013-10-26 07:07:29.675364383 -0700
@@ -28,6 +28,8 @@
     module.add_class('Item', import_from_module='ns.core', outer_class=root_module['ns3::AttributeConstructionList'])
     ## callback.h (module 'core'): ns3::CallbackBase [class]
     module.add_class('CallbackBase', import_from_module='ns.core')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
     ## object-base.h (module 'core'): ns3::ObjectBase [class]
     module.add_class('ObjectBase', allow_subclassing=True, import_from_module='ns.core')
     ## object.h (module 'core'): ns3::ObjectDeleter [struct]
@@ -60,6 +62,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::AttributeValue', 'ns3::empty', 'ns3::DefaultDeleter<ns3::AttributeValue>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::TraceSourceAccessor', 'ns3::empty', 'ns3::DefaultDeleter<ns3::TraceSourceAccessor>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -116,16 +120,53 @@
     nested_module = module.add_cpp_namespace('FatalImpl')
     register_types_ns3_FatalImpl(nested_module)
     
+    
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
 
 def register_types_ns3_FatalImpl(module):
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_methods(root_module):
     register_Ns3Angles_methods(root_module, root_module['ns3::Angles'])
     register_Ns3AttributeConstructionList_methods(root_module, root_module['ns3::AttributeConstructionList'])
     register_Ns3AttributeConstructionListItem_methods(root_module, root_module['ns3::AttributeConstructionList::Item'])
     register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3ObjectBase_methods(root_module, root_module['ns3::ObjectBase'])
     register_Ns3ObjectDeleter_methods(root_module, root_module['ns3::ObjectDeleter'])
     register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >'])
@@ -141,6 +182,7 @@
     register_Ns3SimpleRefCount__Ns3AttributeChecker_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeChecker__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> >'])
     register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >'])
     register_Ns3TraceSourceAccessor_methods(root_module, root_module['ns3::TraceSourceAccessor'])
     register_Ns3AntennaModel_methods(root_module, root_module['ns3::AntennaModel'])
@@ -160,6 +202,11 @@
     register_Ns3Vector2DValue_methods(root_module, root_module['ns3::Vector2DValue'])
     register_Ns3Vector3DChecker_methods(root_module, root_module['ns3::Vector3DChecker'])
     register_Ns3Vector3DValue_methods(root_module, root_module['ns3::Vector3DValue'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     return
 
 def register_Ns3Angles_methods(root_module, cls):
@@ -239,6 +286,35 @@
                    is_static=True, visibility='protected')
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3ObjectBase_methods(root_module, cls):
     ## object-base.h (module 'core'): ns3::ObjectBase::ObjectBase() [constructor]
     cls.add_constructor([])
@@ -372,6 +448,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -431,6 +512,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -649,6 +740,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -1072,6 +1175,111 @@
                    [param('ns3::Vector3D const &', 'value')])
     return
 
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_functions(root_module):
     module = root_module
     ## angles.h (module 'antenna'): extern double ns3::DegreesToRadians(double degrees) [free function]
@@ -1083,11 +1291,19 @@
                         'double', 
                         [param('double', 'radians')])
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     return
 
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def main():
     out = FileCodeSink(sys.stdout)
     root_module = module_init()
diff -Naur ns-3.17/src/antenna/doc/Makefile ns-3.18/src/antenna/doc/Makefile
--- ns-3.17/src/antenna/doc/Makefile	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/antenna/doc/Makefile	2013-10-26 07:07:29.675364383 -0700
@@ -20,12 +20,14 @@
 
 IMAGES = $(IMAGES_EPS) $(IMAGES_PNG) $(IMAGES_PDF)
 
+RESCALE = $(shell hg root)/utils/rescale-pdf.sh
+
 %.eps : %.dia; $(DIA) -t eps $< -e $@
 %.png : %.dia; $(DIA) -t png $< -e $@
 %.png : %.eps; $(CONVERT) $< $@
 %.pdf : %.eps
 	$(EPSTOPDF) $< -o=$@
-	if test x$($@_width) != x; then ./rescale-pdf.sh $($@_width) $@ ; fi
+	@if test x$($@_width) != x; then $(RESCALE) $($@_width) $@ ; fi
 
 GRAPHS_PNG = ${GRAPHS_EPS:.eps=.png}
 GRAPHS_PDF = ${GRAPHS_EPS:.eps=.pdf}
@@ -35,7 +37,7 @@
 %.png : %.eps; $(CONVERT) $< $@
 %.pdf : %.eps
 	$(EPSTOPDF) $< -o=$@
-	if test x$($@_width) != x; then ./rescale-pdf.sh $($@_width) $@ ; fi
+	@if test x$($@_width) != x; then $(RESCALE) $($@_width) $@ ; fi
 
 # You can set these variables from the command line.
 SPHINXOPTS    =
diff -Naur ns-3.17/src/antenna/doc/rescale-pdf.sh ns-3.18/src/antenna/doc/rescale-pdf.sh
--- ns-3.17/src/antenna/doc/rescale-pdf.sh	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/antenna/doc/rescale-pdf.sh	1969-12-31 16:00:00.000000000 -0800
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-TMPDIR=/tmp
-
-TMPFILE=`mktemp`
-
-echo "\documentclass{book}
-\usepackage{pdfpages}
-\begin{document}
-\includepdf[width=${1},fitpaper]{${2}}
-\end{document}" >${TMPFILE}.tex
-pdflatex -output-directory /tmp ${TMPFILE}.tex >/dev/null 2>/dev/null
-cp ${TMPFILE}.pdf ${2}
-rm -f ${TMPFILE}{,.{tex,aux,log,pdf}}
diff -Naur ns-3.17/src/aodv/bindings/callbacks_list.py ns-3.18/src/aodv/bindings/callbacks_list.py
--- ns-3.17/src/aodv/bindings/callbacks_list.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/aodv/bindings/callbacks_list.py	2013-10-26 07:07:29.631364382 -0700
@@ -1,12 +1,12 @@
 callback_classes = [
     ['void', 'ns3::Ptr<ns3::Packet const>', 'ns3::Ipv4Header const&', 'ns3::Socket::SocketErrno', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'ns3::Ptr<ns3::Ipv4Route>', 'ns3::Ptr<ns3::Packet const>', 'ns3::Ipv4Header const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
+    ['void', 'ns3::WifiMacHeader const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
+    ['void', 'ns3::Ipv4Address', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
+    ['void', 'ns3::Ptr<ns3::ArpCache const>', 'ns3::Ipv4Address', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'ns3::Ptr<ns3::Socket>', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'ns3::Ptr<ns3::Socket>', 'unsigned int', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'ns3::Ptr<ns3::Socket>', 'ns3::Address const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['bool', 'ns3::Ptr<ns3::Socket>', 'ns3::Address const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
-    ['void', 'ns3::WifiMacHeader const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
-    ['void', 'ns3::Ipv4Address', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
-    ['void', 'ns3::Ptr<ns3::ArpCache const>', 'ns3::Ipv4Address', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'ns3::Ptr<ns3::NetDevice>', 'ns3::Ptr<ns3::Packet const>', 'unsigned short', 'ns3::Address const&', 'ns3::Address const&', 'ns3::NetDevice::PacketType', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
 ]
diff -Naur ns-3.17/src/aodv/bindings/modulegen__gcc_ILP32.py ns-3.18/src/aodv/bindings/modulegen__gcc_ILP32.py
--- ns-3.17/src/aodv/bindings/modulegen__gcc_ILP32.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/aodv/bindings/modulegen__gcc_ILP32.py	2013-10-26 07:07:29.631364382 -0700
@@ -21,7 +21,7 @@
     root_module = module.get_root()
     
     ## wifi-mac-header.h (module 'wifi'): ns3::WifiMacType [enumeration]
-    module.add_enum('WifiMacType', ['WIFI_MAC_CTL_RTS', 'WIFI_MAC_CTL_CTS', 'WIFI_MAC_CTL_ACK', 'WIFI_MAC_CTL_BACKREQ', 'WIFI_MAC_CTL_BACKRESP', 'WIFI_MAC_MGT_BEACON', 'WIFI_MAC_MGT_ASSOCIATION_REQUEST', 'WIFI_MAC_MGT_ASSOCIATION_RESPONSE', 'WIFI_MAC_MGT_DISASSOCIATION', 'WIFI_MAC_MGT_REASSOCIATION_REQUEST', 'WIFI_MAC_MGT_REASSOCIATION_RESPONSE', 'WIFI_MAC_MGT_PROBE_REQUEST', 'WIFI_MAC_MGT_PROBE_RESPONSE', 'WIFI_MAC_MGT_AUTHENTICATION', 'WIFI_MAC_MGT_DEAUTHENTICATION', 'WIFI_MAC_MGT_ACTION', 'WIFI_MAC_MGT_ACTION_NO_ACK', 'WIFI_MAC_MGT_MULTIHOP_ACTION', 'WIFI_MAC_DATA', 'WIFI_MAC_DATA_CFACK', 'WIFI_MAC_DATA_CFPOLL', 'WIFI_MAC_DATA_CFACK_CFPOLL', 'WIFI_MAC_DATA_NULL', 'WIFI_MAC_DATA_NULL_CFACK', 'WIFI_MAC_DATA_NULL_CFPOLL', 'WIFI_MAC_DATA_NULL_CFACK_CFPOLL', 'WIFI_MAC_QOSDATA', 'WIFI_MAC_QOSDATA_CFACK', 'WIFI_MAC_QOSDATA_CFPOLL', 'WIFI_MAC_QOSDATA_CFACK_CFPOLL', 'WIFI_MAC_QOSDATA_NULL', 'WIFI_MAC_QOSDATA_NULL_CFPOLL', 'WIFI_MAC_QOSDATA_NULL_CFACK_CFPOLL'], import_from_module='ns.wifi')
+    module.add_enum('WifiMacType', ['WIFI_MAC_CTL_RTS', 'WIFI_MAC_CTL_CTS', 'WIFI_MAC_CTL_ACK', 'WIFI_MAC_CTL_BACKREQ', 'WIFI_MAC_CTL_BACKRESP', 'WIFI_MAC_CTL_CTLWRAPPER', 'WIFI_MAC_MGT_BEACON', 'WIFI_MAC_MGT_ASSOCIATION_REQUEST', 'WIFI_MAC_MGT_ASSOCIATION_RESPONSE', 'WIFI_MAC_MGT_DISASSOCIATION', 'WIFI_MAC_MGT_REASSOCIATION_REQUEST', 'WIFI_MAC_MGT_REASSOCIATION_RESPONSE', 'WIFI_MAC_MGT_PROBE_REQUEST', 'WIFI_MAC_MGT_PROBE_RESPONSE', 'WIFI_MAC_MGT_AUTHENTICATION', 'WIFI_MAC_MGT_DEAUTHENTICATION', 'WIFI_MAC_MGT_ACTION', 'WIFI_MAC_MGT_ACTION_NO_ACK', 'WIFI_MAC_MGT_MULTIHOP_ACTION', 'WIFI_MAC_DATA', 'WIFI_MAC_DATA_CFACK', 'WIFI_MAC_DATA_CFPOLL', 'WIFI_MAC_DATA_CFACK_CFPOLL', 'WIFI_MAC_DATA_NULL', 'WIFI_MAC_DATA_NULL_CFACK', 'WIFI_MAC_DATA_NULL_CFPOLL', 'WIFI_MAC_DATA_NULL_CFACK_CFPOLL', 'WIFI_MAC_QOSDATA', 'WIFI_MAC_QOSDATA_CFACK', 'WIFI_MAC_QOSDATA_CFPOLL', 'WIFI_MAC_QOSDATA_CFACK_CFPOLL', 'WIFI_MAC_QOSDATA_NULL', 'WIFI_MAC_QOSDATA_NULL_CFPOLL', 'WIFI_MAC_QOSDATA_NULL_CFACK_CFPOLL'], import_from_module='ns.wifi')
     ## address.h (module 'network'): ns3::Address [class]
     module.add_class('Address', import_from_module='ns.network')
     ## address.h (module 'network'): ns3::Address::MaxSize_e [enumeration]
@@ -48,6 +48,8 @@
     module.add_class('CallbackBase', import_from_module='ns.core')
     ## event-id.h (module 'core'): ns3::EventId [class]
     module.add_class('EventId', import_from_module='ns.core')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress [class]
     module.add_class('Inet6SocketAddress', import_from_module='ns.network')
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress [class]
@@ -136,6 +138,8 @@
     module.add_class('PacketTagList', import_from_module='ns.network')
     ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct]
     module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration]
+    module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network')
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter> [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simulator.h (module 'core'): ns3::Simulator [class]
@@ -173,9 +177,9 @@
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header [class]
     module.add_class('Ipv4Header', import_from_module='ns.internet', parent=root_module['ns3::Header'])
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType [enumeration]
-    module.add_enum('DscpType', ['DscpDefault', 'CS1', 'AF11', 'AF12', 'AF13', 'CS2', 'AF21', 'AF22', 'AF23', 'CS3', 'AF31', 'AF32', 'AF33', 'CS4', 'AF41', 'AF42', 'AF43', 'CS5', 'EF', 'CS6', 'CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
+    module.add_enum('DscpType', ['DscpDefault', 'DSCP_CS1', 'DSCP_AF11', 'DSCP_AF12', 'DSCP_AF13', 'DSCP_CS2', 'DSCP_AF21', 'DSCP_AF22', 'DSCP_AF23', 'DSCP_CS3', 'DSCP_AF31', 'DSCP_AF32', 'DSCP_AF33', 'DSCP_CS4', 'DSCP_AF41', 'DSCP_AF42', 'DSCP_AF43', 'DSCP_CS5', 'DSCP_EF', 'DSCP_CS6', 'DSCP_CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType [enumeration]
-    module.add_enum('EcnType', ['NotECT', 'ECT1', 'ECT0', 'CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
+    module.add_enum('EcnType', ['ECN_NotECT', 'ECN_ECT1', 'ECN_ECT0', 'ECN_CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
     ## ipv6-header.h (module 'internet'): ns3::Ipv6Header [class]
     module.add_class('Ipv6Header', import_from_module='ns.internet', parent=root_module['ns3::Header'])
     ## ipv6-header.h (module 'internet'): ns3::Ipv6Header::NextHeader_e [enumeration]
@@ -198,6 +202,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Ipv4MulticastRoute', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Ipv4MulticastRoute>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> > [class]
@@ -352,8 +358,6 @@
     module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
     ## random-variable-stream.h (module 'core'): ns3::ParetoRandomVariable [class]
     module.add_class('ParetoRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
-    ## nstime.h (module 'core'): ns3::TimeChecker [class]
-    module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
     module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
@@ -364,6 +368,8 @@
     module.add_class('AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
     ## address.h (module 'network'): ns3::AddressValue [class]
     module.add_class('AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
+    ## ipv4-list-routing.h (module 'internet'): ns3::Ipv4ListRouting [class]
+    module.add_class('Ipv4ListRouting', import_from_module='ns.internet', parent=root_module['ns3::Ipv4RoutingProtocol'])
     module.add_container('std::list< ns3::Ptr< ns3::Packet > >', 'ns3::Ptr< ns3::Packet >', container_type='list')
     module.add_container('std::map< unsigned int, unsigned int >', ('unsigned int', 'unsigned int'), container_type='map')
     
@@ -373,6 +379,12 @@
     register_types_ns3_FatalImpl(nested_module)
     
     
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
+    
     ## Register a nested module for the namespace aodv
     
     nested_module = module.add_cpp_namespace('aodv')
@@ -383,6 +395,36 @@
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_types_ns3_aodv(module):
     root_module = module.get_root()
     
@@ -434,6 +476,7 @@
     register_Ns3ByteTagListIteratorItem_methods(root_module, root_module['ns3::ByteTagList::Iterator::Item'])
     register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase'])
     register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3Inet6SocketAddress_methods(root_module, root_module['ns3::Inet6SocketAddress'])
     register_Ns3InetSocketAddress_methods(root_module, root_module['ns3::InetSocketAddress'])
     register_Ns3IntToType__0_methods(root_module, root_module['ns3::IntToType< 0 >'])
@@ -487,6 +530,7 @@
     register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
     register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3Ipv4MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4MulticastRoute__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> >'])
     register_Ns3SimpleRefCount__Ns3Ipv4Route_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4Route__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> >'])
     register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
@@ -555,12 +599,17 @@
     register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper'])
     register_Ns3Packet_methods(root_module, root_module['ns3::Packet'])
     register_Ns3ParetoRandomVariable_methods(root_module, root_module['ns3::ParetoRandomVariable'])
-    register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
     register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
     register_Ns3AddressChecker_methods(root_module, root_module['ns3::AddressChecker'])
     register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue'])
+    register_Ns3Ipv4ListRouting_methods(root_module, root_module['ns3::Ipv4ListRouting'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     register_Ns3AodvDuplicatePacketDetection_methods(root_module, root_module['ns3::aodv::DuplicatePacketDetection'])
     register_Ns3AodvIdCache_methods(root_module, root_module['ns3::aodv::IdCache'])
     register_Ns3AodvNeighbors_methods(root_module, root_module['ns3::aodv::Neighbors'])
@@ -1100,6 +1149,35 @@
                    is_const=True)
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3Inet6SocketAddress_methods(root_module, cls):
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress::Inet6SocketAddress(ns3::Inet6SocketAddress const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::Inet6SocketAddress const &', 'arg0')])
@@ -1598,6 +1676,11 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
     cls.add_method('IsEqual', 
                    'bool', 
@@ -1637,16 +1720,36 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
     cls.add_method('MakeAutoconfiguredAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
     cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'mac')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
     cls.add_method('MakeIpv4MappedAddress', 
                    'ns3::Ipv6Address', 
@@ -2205,6 +2308,10 @@
     cls.add_method('RemoveAll', 
                    'void', 
                    [])
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function]
+    cls.add_method('Replace', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     return
 
 def register_Ns3PacketTagListTagData_methods(root_module, cls):
@@ -2541,6 +2648,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -2600,6 +2712,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -3342,6 +3464,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3Ipv4MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4MulticastRoute__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -4159,11 +4293,26 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
     cls.add_method('SetResolution', 
                    'void', 
                    [param('ns3::Time::Unit', 'resolution')], 
                    is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
     cls.add_method('To', 
                    'ns3::int64x64_t', 
@@ -4710,10 +4859,18 @@
     cls.add_method('SetNoMoreFragments', 
                    'void', 
                    [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetNoOrder() [member function]
+    cls.add_method('SetNoOrder', 
+                   'void', 
+                   [])
     ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetNoRetry() [member function]
     cls.add_method('SetNoRetry', 
                    'void', 
                    [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetOrder() [member function]
+    cls.add_method('SetOrder', 
+                   'void', 
+                   [])
     ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetProbeReq() [member function]
     cls.add_method('SetProbeReq', 
                    'void', 
@@ -5636,6 +5793,11 @@
                    'bool', 
                    [param('uint32_t', 'interface'), param('uint32_t', 'addressIndex')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## ipv4.h (module 'internet'): bool ns3::Ipv4::RemoveAddress(uint32_t interface, ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4Address', 'address')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## ipv4.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4::SelectSourceAddress(ns3::Ptr<const ns3::NetDevice> device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function]
     cls.add_method('SelectSourceAddress', 
                    'ns3::Ipv4Address', 
@@ -5798,6 +5960,10 @@
     cls.add_method('RemoveAddress', 
                    'ns3::Ipv4InterfaceAddress', 
                    [param('uint32_t', 'index')])
+    ## ipv4-interface.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4Interface::RemoveAddress(ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'ns3::Ipv4InterfaceAddress', 
+                   [param('ns3::Ipv4Address', 'address')])
     ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::Send(ns3::Ptr<ns3::Packet> p, ns3::Ipv4Address dest) [member function]
     cls.add_method('Send', 
                    'void', 
@@ -5958,6 +6124,11 @@
                    'bool', 
                    [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], 
                    is_virtual=True)
+    ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interface, ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4Address', 'address')], 
+                   is_virtual=True)
     ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr<const ns3::NetDevice> device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function]
     cls.add_method('SelectSourceAddress', 
                    'ns3::Ipv4Address', 
@@ -6350,6 +6521,10 @@
     cls.add_method('RemoveAddress', 
                    'ns3::Ipv6InterfaceAddress', 
                    [param('uint32_t', 'index')])
+    ## ipv6-interface.h (module 'internet'): ns3::Ipv6InterfaceAddress ns3::Ipv6Interface::RemoveAddress(ns3::Ipv6Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'ns3::Ipv6InterfaceAddress', 
+                   [param('ns3::Ipv6Address', 'address')])
     ## ipv6-interface.h (module 'internet'): void ns3::Ipv6Interface::Send(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Address dest) [member function]
     cls.add_method('Send', 
                    'void', 
@@ -7054,6 +7229,10 @@
     cls.add_method('RemoveTrailer', 
                    'uint32_t', 
                    [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('ReplacePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
     cls.add_method('Serialize', 
                    'uint32_t', 
@@ -7108,13 +7287,6 @@
                    is_virtual=True)
     return
 
-def register_Ns3TimeChecker_methods(root_module, cls):
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor]
-    cls.add_constructor([])
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')])
-    return
-
 def register_Ns3TimeValue_methods(root_module, cls):
     ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
     cls.add_constructor([])
@@ -7228,6 +7400,188 @@
                    [param('ns3::Address const &', 'value')])
     return
 
+def register_Ns3Ipv4ListRouting_methods(root_module, cls):
+    ## ipv4-list-routing.h (module 'internet'): ns3::Ipv4ListRouting::Ipv4ListRouting(ns3::Ipv4ListRouting const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv4ListRouting const &', 'arg0')])
+    ## ipv4-list-routing.h (module 'internet'): ns3::Ipv4ListRouting::Ipv4ListRouting() [constructor]
+    cls.add_constructor([])
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::AddRoutingProtocol(ns3::Ptr<ns3::Ipv4RoutingProtocol> routingProtocol, int16_t priority) [member function]
+    cls.add_method('AddRoutingProtocol', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol'), param('int16_t', 'priority')], 
+                   is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): uint32_t ns3::Ipv4ListRouting::GetNRoutingProtocols() const [member function]
+    cls.add_method('GetNRoutingProtocols', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): ns3::Ptr<ns3::Ipv4RoutingProtocol> ns3::Ipv4ListRouting::GetRoutingProtocol(uint32_t index, int16_t & priority) const [member function]
+    cls.add_method('GetRoutingProtocol', 
+                   'ns3::Ptr< ns3::Ipv4RoutingProtocol >', 
+                   [param('uint32_t', 'index'), param('int16_t &', 'priority', direction=2)], 
+                   is_const=True, is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): static ns3::TypeId ns3::Ipv4ListRouting::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::NotifyAddAddress(uint32_t interface, ns3::Ipv4InterfaceAddress address) [member function]
+    cls.add_method('NotifyAddAddress', 
+                   'void', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4InterfaceAddress', 'address')], 
+                   is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::NotifyInterfaceDown(uint32_t interface) [member function]
+    cls.add_method('NotifyInterfaceDown', 
+                   'void', 
+                   [param('uint32_t', 'interface')], 
+                   is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::NotifyInterfaceUp(uint32_t interface) [member function]
+    cls.add_method('NotifyInterfaceUp', 
+                   'void', 
+                   [param('uint32_t', 'interface')], 
+                   is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::NotifyRemoveAddress(uint32_t interface, ns3::Ipv4InterfaceAddress address) [member function]
+    cls.add_method('NotifyRemoveAddress', 
+                   'void', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4InterfaceAddress', 'address')], 
+                   is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::PrintRoutingTable(ns3::Ptr<ns3::OutputStreamWrapper> stream) const [member function]
+    cls.add_method('PrintRoutingTable', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], 
+                   is_const=True, is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): bool ns3::Ipv4ListRouting::RouteInput(ns3::Ptr<ns3::Packet const> p, ns3::Ipv4Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void, ns3::Ptr<ns3::Ipv4Route>, ns3::Ptr<ns3::Packet const>, ns3::Ipv4Header const&, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<ns3::Ipv4MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void, ns3::Ptr<ns3::Packet const>, ns3::Ipv4Header const&, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> ecb) [member function]
+    cls.add_method('RouteInput', 
+                   'bool', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv4Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], 
+                   is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): ns3::Ptr<ns3::Ipv4Route> ns3::Ipv4ListRouting::RouteOutput(ns3::Ptr<ns3::Packet> p, ns3::Ipv4Header const & header, ns3::Ptr<ns3::NetDevice> oif, ns3::Socket::SocketErrno & sockerr) [member function]
+    cls.add_method('RouteOutput', 
+                   'ns3::Ptr< ns3::Ipv4Route >', 
+                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv4Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice >', 'oif'), param('ns3::Socket::SocketErrno &', 'sockerr')], 
+                   is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::SetIpv4(ns3::Ptr<ns3::Ipv4> ipv4) [member function]
+    cls.add_method('SetIpv4', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Ipv4 >', 'ipv4')], 
+                   is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::DoInitialize() [member function]
+    cls.add_method('DoInitialize', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    return
+
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_Ns3AodvDuplicatePacketDetection_methods(root_module, cls):
     ## aodv-dpd.h (module 'aodv'): ns3::aodv::DuplicatePacketDetection::DuplicatePacketDetection(ns3::aodv::DuplicatePacketDetection const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::aodv::DuplicatePacketDetection const &', 'arg0')])
@@ -8171,12 +8525,20 @@
 def register_functions(root_module):
     module = root_module
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     register_functions_ns3_aodv(module.get_submodule('aodv'), root_module)
     return
 
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def register_functions_ns3_aodv(module, root_module):
     return
 
diff -Naur ns-3.17/src/aodv/bindings/modulegen__gcc_LP64.py ns-3.18/src/aodv/bindings/modulegen__gcc_LP64.py
--- ns-3.17/src/aodv/bindings/modulegen__gcc_LP64.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/aodv/bindings/modulegen__gcc_LP64.py	2013-10-26 07:07:29.627364383 -0700
@@ -21,7 +21,7 @@
     root_module = module.get_root()
     
     ## wifi-mac-header.h (module 'wifi'): ns3::WifiMacType [enumeration]
-    module.add_enum('WifiMacType', ['WIFI_MAC_CTL_RTS', 'WIFI_MAC_CTL_CTS', 'WIFI_MAC_CTL_ACK', 'WIFI_MAC_CTL_BACKREQ', 'WIFI_MAC_CTL_BACKRESP', 'WIFI_MAC_MGT_BEACON', 'WIFI_MAC_MGT_ASSOCIATION_REQUEST', 'WIFI_MAC_MGT_ASSOCIATION_RESPONSE', 'WIFI_MAC_MGT_DISASSOCIATION', 'WIFI_MAC_MGT_REASSOCIATION_REQUEST', 'WIFI_MAC_MGT_REASSOCIATION_RESPONSE', 'WIFI_MAC_MGT_PROBE_REQUEST', 'WIFI_MAC_MGT_PROBE_RESPONSE', 'WIFI_MAC_MGT_AUTHENTICATION', 'WIFI_MAC_MGT_DEAUTHENTICATION', 'WIFI_MAC_MGT_ACTION', 'WIFI_MAC_MGT_ACTION_NO_ACK', 'WIFI_MAC_MGT_MULTIHOP_ACTION', 'WIFI_MAC_DATA', 'WIFI_MAC_DATA_CFACK', 'WIFI_MAC_DATA_CFPOLL', 'WIFI_MAC_DATA_CFACK_CFPOLL', 'WIFI_MAC_DATA_NULL', 'WIFI_MAC_DATA_NULL_CFACK', 'WIFI_MAC_DATA_NULL_CFPOLL', 'WIFI_MAC_DATA_NULL_CFACK_CFPOLL', 'WIFI_MAC_QOSDATA', 'WIFI_MAC_QOSDATA_CFACK', 'WIFI_MAC_QOSDATA_CFPOLL', 'WIFI_MAC_QOSDATA_CFACK_CFPOLL', 'WIFI_MAC_QOSDATA_NULL', 'WIFI_MAC_QOSDATA_NULL_CFPOLL', 'WIFI_MAC_QOSDATA_NULL_CFACK_CFPOLL'], import_from_module='ns.wifi')
+    module.add_enum('WifiMacType', ['WIFI_MAC_CTL_RTS', 'WIFI_MAC_CTL_CTS', 'WIFI_MAC_CTL_ACK', 'WIFI_MAC_CTL_BACKREQ', 'WIFI_MAC_CTL_BACKRESP', 'WIFI_MAC_CTL_CTLWRAPPER', 'WIFI_MAC_MGT_BEACON', 'WIFI_MAC_MGT_ASSOCIATION_REQUEST', 'WIFI_MAC_MGT_ASSOCIATION_RESPONSE', 'WIFI_MAC_MGT_DISASSOCIATION', 'WIFI_MAC_MGT_REASSOCIATION_REQUEST', 'WIFI_MAC_MGT_REASSOCIATION_RESPONSE', 'WIFI_MAC_MGT_PROBE_REQUEST', 'WIFI_MAC_MGT_PROBE_RESPONSE', 'WIFI_MAC_MGT_AUTHENTICATION', 'WIFI_MAC_MGT_DEAUTHENTICATION', 'WIFI_MAC_MGT_ACTION', 'WIFI_MAC_MGT_ACTION_NO_ACK', 'WIFI_MAC_MGT_MULTIHOP_ACTION', 'WIFI_MAC_DATA', 'WIFI_MAC_DATA_CFACK', 'WIFI_MAC_DATA_CFPOLL', 'WIFI_MAC_DATA_CFACK_CFPOLL', 'WIFI_MAC_DATA_NULL', 'WIFI_MAC_DATA_NULL_CFACK', 'WIFI_MAC_DATA_NULL_CFPOLL', 'WIFI_MAC_DATA_NULL_CFACK_CFPOLL', 'WIFI_MAC_QOSDATA', 'WIFI_MAC_QOSDATA_CFACK', 'WIFI_MAC_QOSDATA_CFPOLL', 'WIFI_MAC_QOSDATA_CFACK_CFPOLL', 'WIFI_MAC_QOSDATA_NULL', 'WIFI_MAC_QOSDATA_NULL_CFPOLL', 'WIFI_MAC_QOSDATA_NULL_CFACK_CFPOLL'], import_from_module='ns.wifi')
     ## address.h (module 'network'): ns3::Address [class]
     module.add_class('Address', import_from_module='ns.network')
     ## address.h (module 'network'): ns3::Address::MaxSize_e [enumeration]
@@ -48,6 +48,8 @@
     module.add_class('CallbackBase', import_from_module='ns.core')
     ## event-id.h (module 'core'): ns3::EventId [class]
     module.add_class('EventId', import_from_module='ns.core')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress [class]
     module.add_class('Inet6SocketAddress', import_from_module='ns.network')
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress [class]
@@ -136,6 +138,8 @@
     module.add_class('PacketTagList', import_from_module='ns.network')
     ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct]
     module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration]
+    module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network')
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter> [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simulator.h (module 'core'): ns3::Simulator [class]
@@ -173,9 +177,9 @@
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header [class]
     module.add_class('Ipv4Header', import_from_module='ns.internet', parent=root_module['ns3::Header'])
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType [enumeration]
-    module.add_enum('DscpType', ['DscpDefault', 'CS1', 'AF11', 'AF12', 'AF13', 'CS2', 'AF21', 'AF22', 'AF23', 'CS3', 'AF31', 'AF32', 'AF33', 'CS4', 'AF41', 'AF42', 'AF43', 'CS5', 'EF', 'CS6', 'CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
+    module.add_enum('DscpType', ['DscpDefault', 'DSCP_CS1', 'DSCP_AF11', 'DSCP_AF12', 'DSCP_AF13', 'DSCP_CS2', 'DSCP_AF21', 'DSCP_AF22', 'DSCP_AF23', 'DSCP_CS3', 'DSCP_AF31', 'DSCP_AF32', 'DSCP_AF33', 'DSCP_CS4', 'DSCP_AF41', 'DSCP_AF42', 'DSCP_AF43', 'DSCP_CS5', 'DSCP_EF', 'DSCP_CS6', 'DSCP_CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType [enumeration]
-    module.add_enum('EcnType', ['NotECT', 'ECT1', 'ECT0', 'CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
+    module.add_enum('EcnType', ['ECN_NotECT', 'ECN_ECT1', 'ECN_ECT0', 'ECN_CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
     ## ipv6-header.h (module 'internet'): ns3::Ipv6Header [class]
     module.add_class('Ipv6Header', import_from_module='ns.internet', parent=root_module['ns3::Header'])
     ## ipv6-header.h (module 'internet'): ns3::Ipv6Header::NextHeader_e [enumeration]
@@ -198,6 +202,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Ipv4MulticastRoute', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Ipv4MulticastRoute>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> > [class]
@@ -352,8 +358,6 @@
     module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
     ## random-variable-stream.h (module 'core'): ns3::ParetoRandomVariable [class]
     module.add_class('ParetoRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
-    ## nstime.h (module 'core'): ns3::TimeChecker [class]
-    module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
     module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
@@ -364,6 +368,8 @@
     module.add_class('AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
     ## address.h (module 'network'): ns3::AddressValue [class]
     module.add_class('AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
+    ## ipv4-list-routing.h (module 'internet'): ns3::Ipv4ListRouting [class]
+    module.add_class('Ipv4ListRouting', import_from_module='ns.internet', parent=root_module['ns3::Ipv4RoutingProtocol'])
     module.add_container('std::list< ns3::Ptr< ns3::Packet > >', 'ns3::Ptr< ns3::Packet >', container_type='list')
     module.add_container('std::map< unsigned int, unsigned int >', ('unsigned int', 'unsigned int'), container_type='map')
     
@@ -373,6 +379,12 @@
     register_types_ns3_FatalImpl(nested_module)
     
     
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
+    
     ## Register a nested module for the namespace aodv
     
     nested_module = module.add_cpp_namespace('aodv')
@@ -383,6 +395,36 @@
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_types_ns3_aodv(module):
     root_module = module.get_root()
     
@@ -434,6 +476,7 @@
     register_Ns3ByteTagListIteratorItem_methods(root_module, root_module['ns3::ByteTagList::Iterator::Item'])
     register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase'])
     register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3Inet6SocketAddress_methods(root_module, root_module['ns3::Inet6SocketAddress'])
     register_Ns3InetSocketAddress_methods(root_module, root_module['ns3::InetSocketAddress'])
     register_Ns3IntToType__0_methods(root_module, root_module['ns3::IntToType< 0 >'])
@@ -487,6 +530,7 @@
     register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
     register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3Ipv4MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4MulticastRoute__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> >'])
     register_Ns3SimpleRefCount__Ns3Ipv4Route_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4Route__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> >'])
     register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
@@ -555,12 +599,17 @@
     register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper'])
     register_Ns3Packet_methods(root_module, root_module['ns3::Packet'])
     register_Ns3ParetoRandomVariable_methods(root_module, root_module['ns3::ParetoRandomVariable'])
-    register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
     register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
     register_Ns3AddressChecker_methods(root_module, root_module['ns3::AddressChecker'])
     register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue'])
+    register_Ns3Ipv4ListRouting_methods(root_module, root_module['ns3::Ipv4ListRouting'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     register_Ns3AodvDuplicatePacketDetection_methods(root_module, root_module['ns3::aodv::DuplicatePacketDetection'])
     register_Ns3AodvIdCache_methods(root_module, root_module['ns3::aodv::IdCache'])
     register_Ns3AodvNeighbors_methods(root_module, root_module['ns3::aodv::Neighbors'])
@@ -1100,6 +1149,35 @@
                    is_const=True)
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3Inet6SocketAddress_methods(root_module, cls):
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress::Inet6SocketAddress(ns3::Inet6SocketAddress const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::Inet6SocketAddress const &', 'arg0')])
@@ -1598,6 +1676,11 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
     cls.add_method('IsEqual', 
                    'bool', 
@@ -1637,16 +1720,36 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
     cls.add_method('MakeAutoconfiguredAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
     cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'mac')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
     cls.add_method('MakeIpv4MappedAddress', 
                    'ns3::Ipv6Address', 
@@ -2205,6 +2308,10 @@
     cls.add_method('RemoveAll', 
                    'void', 
                    [])
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function]
+    cls.add_method('Replace', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     return
 
 def register_Ns3PacketTagListTagData_methods(root_module, cls):
@@ -2541,6 +2648,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -2600,6 +2712,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -3342,6 +3464,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3Ipv4MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4MulticastRoute__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -4159,11 +4293,26 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
     cls.add_method('SetResolution', 
                    'void', 
                    [param('ns3::Time::Unit', 'resolution')], 
                    is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
     cls.add_method('To', 
                    'ns3::int64x64_t', 
@@ -4710,10 +4859,18 @@
     cls.add_method('SetNoMoreFragments', 
                    'void', 
                    [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetNoOrder() [member function]
+    cls.add_method('SetNoOrder', 
+                   'void', 
+                   [])
     ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetNoRetry() [member function]
     cls.add_method('SetNoRetry', 
                    'void', 
                    [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetOrder() [member function]
+    cls.add_method('SetOrder', 
+                   'void', 
+                   [])
     ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetProbeReq() [member function]
     cls.add_method('SetProbeReq', 
                    'void', 
@@ -5636,6 +5793,11 @@
                    'bool', 
                    [param('uint32_t', 'interface'), param('uint32_t', 'addressIndex')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## ipv4.h (module 'internet'): bool ns3::Ipv4::RemoveAddress(uint32_t interface, ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4Address', 'address')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## ipv4.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4::SelectSourceAddress(ns3::Ptr<const ns3::NetDevice> device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function]
     cls.add_method('SelectSourceAddress', 
                    'ns3::Ipv4Address', 
@@ -5798,6 +5960,10 @@
     cls.add_method('RemoveAddress', 
                    'ns3::Ipv4InterfaceAddress', 
                    [param('uint32_t', 'index')])
+    ## ipv4-interface.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4Interface::RemoveAddress(ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'ns3::Ipv4InterfaceAddress', 
+                   [param('ns3::Ipv4Address', 'address')])
     ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::Send(ns3::Ptr<ns3::Packet> p, ns3::Ipv4Address dest) [member function]
     cls.add_method('Send', 
                    'void', 
@@ -5958,6 +6124,11 @@
                    'bool', 
                    [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], 
                    is_virtual=True)
+    ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interface, ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4Address', 'address')], 
+                   is_virtual=True)
     ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr<const ns3::NetDevice> device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function]
     cls.add_method('SelectSourceAddress', 
                    'ns3::Ipv4Address', 
@@ -6350,6 +6521,10 @@
     cls.add_method('RemoveAddress', 
                    'ns3::Ipv6InterfaceAddress', 
                    [param('uint32_t', 'index')])
+    ## ipv6-interface.h (module 'internet'): ns3::Ipv6InterfaceAddress ns3::Ipv6Interface::RemoveAddress(ns3::Ipv6Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'ns3::Ipv6InterfaceAddress', 
+                   [param('ns3::Ipv6Address', 'address')])
     ## ipv6-interface.h (module 'internet'): void ns3::Ipv6Interface::Send(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Address dest) [member function]
     cls.add_method('Send', 
                    'void', 
@@ -7054,6 +7229,10 @@
     cls.add_method('RemoveTrailer', 
                    'uint32_t', 
                    [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('ReplacePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
     cls.add_method('Serialize', 
                    'uint32_t', 
@@ -7108,13 +7287,6 @@
                    is_virtual=True)
     return
 
-def register_Ns3TimeChecker_methods(root_module, cls):
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor]
-    cls.add_constructor([])
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')])
-    return
-
 def register_Ns3TimeValue_methods(root_module, cls):
     ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
     cls.add_constructor([])
@@ -7228,6 +7400,188 @@
                    [param('ns3::Address const &', 'value')])
     return
 
+def register_Ns3Ipv4ListRouting_methods(root_module, cls):
+    ## ipv4-list-routing.h (module 'internet'): ns3::Ipv4ListRouting::Ipv4ListRouting(ns3::Ipv4ListRouting const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv4ListRouting const &', 'arg0')])
+    ## ipv4-list-routing.h (module 'internet'): ns3::Ipv4ListRouting::Ipv4ListRouting() [constructor]
+    cls.add_constructor([])
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::AddRoutingProtocol(ns3::Ptr<ns3::Ipv4RoutingProtocol> routingProtocol, int16_t priority) [member function]
+    cls.add_method('AddRoutingProtocol', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol'), param('int16_t', 'priority')], 
+                   is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): uint32_t ns3::Ipv4ListRouting::GetNRoutingProtocols() const [member function]
+    cls.add_method('GetNRoutingProtocols', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): ns3::Ptr<ns3::Ipv4RoutingProtocol> ns3::Ipv4ListRouting::GetRoutingProtocol(uint32_t index, int16_t & priority) const [member function]
+    cls.add_method('GetRoutingProtocol', 
+                   'ns3::Ptr< ns3::Ipv4RoutingProtocol >', 
+                   [param('uint32_t', 'index'), param('int16_t &', 'priority', direction=2)], 
+                   is_const=True, is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): static ns3::TypeId ns3::Ipv4ListRouting::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::NotifyAddAddress(uint32_t interface, ns3::Ipv4InterfaceAddress address) [member function]
+    cls.add_method('NotifyAddAddress', 
+                   'void', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4InterfaceAddress', 'address')], 
+                   is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::NotifyInterfaceDown(uint32_t interface) [member function]
+    cls.add_method('NotifyInterfaceDown', 
+                   'void', 
+                   [param('uint32_t', 'interface')], 
+                   is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::NotifyInterfaceUp(uint32_t interface) [member function]
+    cls.add_method('NotifyInterfaceUp', 
+                   'void', 
+                   [param('uint32_t', 'interface')], 
+                   is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::NotifyRemoveAddress(uint32_t interface, ns3::Ipv4InterfaceAddress address) [member function]
+    cls.add_method('NotifyRemoveAddress', 
+                   'void', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4InterfaceAddress', 'address')], 
+                   is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::PrintRoutingTable(ns3::Ptr<ns3::OutputStreamWrapper> stream) const [member function]
+    cls.add_method('PrintRoutingTable', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], 
+                   is_const=True, is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): bool ns3::Ipv4ListRouting::RouteInput(ns3::Ptr<ns3::Packet const> p, ns3::Ipv4Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void, ns3::Ptr<ns3::Ipv4Route>, ns3::Ptr<ns3::Packet const>, ns3::Ipv4Header const&, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<ns3::Ipv4MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void, ns3::Ptr<ns3::Packet const>, ns3::Ipv4Header const&, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> ecb) [member function]
+    cls.add_method('RouteInput', 
+                   'bool', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv4Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], 
+                   is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): ns3::Ptr<ns3::Ipv4Route> ns3::Ipv4ListRouting::RouteOutput(ns3::Ptr<ns3::Packet> p, ns3::Ipv4Header const & header, ns3::Ptr<ns3::NetDevice> oif, ns3::Socket::SocketErrno & sockerr) [member function]
+    cls.add_method('RouteOutput', 
+                   'ns3::Ptr< ns3::Ipv4Route >', 
+                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv4Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice >', 'oif'), param('ns3::Socket::SocketErrno &', 'sockerr')], 
+                   is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::SetIpv4(ns3::Ptr<ns3::Ipv4> ipv4) [member function]
+    cls.add_method('SetIpv4', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Ipv4 >', 'ipv4')], 
+                   is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::DoInitialize() [member function]
+    cls.add_method('DoInitialize', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    return
+
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_Ns3AodvDuplicatePacketDetection_methods(root_module, cls):
     ## aodv-dpd.h (module 'aodv'): ns3::aodv::DuplicatePacketDetection::DuplicatePacketDetection(ns3::aodv::DuplicatePacketDetection const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::aodv::DuplicatePacketDetection const &', 'arg0')])
@@ -8171,12 +8525,20 @@
 def register_functions(root_module):
     module = root_module
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     register_functions_ns3_aodv(module.get_submodule('aodv'), root_module)
     return
 
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def register_functions_ns3_aodv(module, root_module):
     return
 
diff -Naur ns-3.17/src/aodv/helper/aodv-helper.h ns-3.18/src/aodv/helper/aodv-helper.h
--- ns-3.17/src/aodv/helper/aodv-helper.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/aodv/helper/aodv-helper.h	2013-10-26 07:07:29.619364382 -0700
@@ -38,9 +38,9 @@
   AodvHelper();
 
   /**
-   * \internal
    * \returns pointer to clone of this OlsrHelper 
    * 
+   * \internal
    * This method is mainly for internal use by the other helpers;
    * clients are expected to free the dynamic memory allocated by this method
    */
@@ -52,7 +52,7 @@
    *
    * This method will be called by ns3::InternetStackHelper::Install
    * 
-   * TODO: support installing AODV on the subset of all available IP interfaces
+   * \todo support installing AODV on the subset of all available IP interfaces
    */
   virtual Ptr<Ipv4RoutingProtocol> Create (Ptr<Node> node) const;
   /**
@@ -76,6 +76,7 @@
   int64_t AssignStreams (NodeContainer c, int64_t stream);
 
 private:
+  /** the factory to create AODV routing object */
   ObjectFactory m_agentFactory;
 };
 
diff -Naur ns-3.17/src/aodv/model/aodv-routing-protocol.cc ns-3.18/src/aodv/model/aodv-routing-protocol.cc
--- ns-3.17/src/aodv/model/aodv-routing-protocol.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/aodv/model/aodv-routing-protocol.cc	2013-10-26 07:07:29.619364382 -0700
@@ -135,7 +135,7 @@
   MaxQueueTime (Seconds (30)),
   DestinationOnly (false),
   GratuitousReply (true),
-  EnableHello (true),
+  EnableHello (false),
   m_routingTable (DeletePeriod),
   m_queue (MaxQueueLen, MaxQueueTime),
   m_requestId (0),
@@ -147,12 +147,10 @@
   m_rerrCount (0),
   m_htimer (Timer::CANCEL_ON_DESTROY),
   m_rreqRateLimitTimer (Timer::CANCEL_ON_DESTROY),
-  m_rerrRateLimitTimer (Timer::CANCEL_ON_DESTROY)
+  m_rerrRateLimitTimer (Timer::CANCEL_ON_DESTROY),
+  m_lastBcastTime (Seconds (0))
 {
-  if (EnableHello)
-    {
-      m_nb.SetCallback (MakeCallback (&RoutingProtocol::SendRerrWhenBreaksLinkToNextHop, this));
-    }
+  m_nb.SetCallback (MakeCallback (&RoutingProtocol::SendRerrWhenBreaksLinkToNextHop, this));
 }
 
 TypeId
@@ -334,6 +332,7 @@
   NS_LOG_FUNCTION (this << header << (oif ? oif->GetIfIndex () : 0));
   if (!p)
     {
+      NS_LOG_DEBUG("Packet is == 0");
       return LoopbackRoute (header, oif); // later
     }
   if (m_socketAddresses.empty ())
@@ -368,6 +367,7 @@
   // routed to loopback, received from loopback and passed to RouteInput (see below)
   uint32_t iif = (oif ? m_ipv4->GetInterfaceForDevice (oif) : -1);
   DeferredRouteOutputTag tag (iif);
+  NS_LOG_DEBUG ("Valid Route not found");
   if (!p->PeekPacketTag (tag))
     {
       p->AddPacketTag (tag);
@@ -903,20 +903,19 @@
           destination = iface.GetBroadcast ();
         }
       NS_LOG_DEBUG ("Send RREQ with id " << rreqHeader.GetId () << " to socket");
-      socket->SendTo (packet, 0, InetSocketAddress (destination, AODV_PORT));
+      m_lastBcastTime = Simulator::Now ();
+      Simulator::Schedule (Time (MilliSeconds (m_uniformRandomVariable->GetInteger (0, 10))), &RoutingProtocol::SendTo, this, socket, packet, destination); 
     }
   ScheduleRreqRetry (dst);
-  if (EnableHello)
-    {
-      if (!m_htimer.IsRunning ())
-        {
-          m_htimer.Cancel ();
-          m_htimer.Schedule (HelloInterval - Time (0.01 * MilliSeconds (m_uniformRandomVariable->GetInteger (0, 10))));
-        }
-    }
 }
 
 void
+RoutingProtocol::SendTo (Ptr<Socket> socket, Ptr<Packet> packet, Ipv4Address destination)
+{
+    socket->SendTo (packet, 0, InetSocketAddress (destination, AODV_PORT));
+
+}
+void
 RoutingProtocol::ScheduleRreqRetry (Ipv4Address dst)
 {
   NS_LOG_FUNCTION (this << dst);
@@ -1101,7 +1100,32 @@
       toOrigin.SetLifeTime (std::max (Time (2 * NetTraversalTime - 2 * hop * NodeTraversalTime),
                                       toOrigin.GetLifeTime ()));
       m_routingTable.Update (toOrigin);
+      //m_nb.Update (src, Time (AllowedHelloLoss * HelloInterval));
+    }
+
+
+  RoutingTableEntry toNeighbor;
+  if (!m_routingTable.LookupRoute (src, toNeighbor))
+    {
+      NS_LOG_DEBUG ("Neighbor:" << src << " not found in routing table. Creating an entry"); 
+      Ptr<NetDevice> dev = m_ipv4->GetNetDevice (m_ipv4->GetInterfaceForAddress (receiver));
+      RoutingTableEntry newEntry (dev, src, false, rreqHeader.GetOriginSeqno (),
+                                              m_ipv4->GetAddress (m_ipv4->GetInterfaceForAddress (receiver), 0),
+                                              1, src, ActiveRouteTimeout);
+      m_routingTable.AddRoute (newEntry);
+    }
+  else
+    {
+      toNeighbor.SetLifeTime (ActiveRouteTimeout);
+      toNeighbor.SetValidSeqNo (false);
+      toNeighbor.SetSeqNo (rreqHeader.GetOriginSeqno ()); 
+      toNeighbor.SetFlag (VALID);
+      toNeighbor.SetOutputDevice (m_ipv4->GetNetDevice (m_ipv4->GetInterfaceForAddress (receiver)));
+      toNeighbor.SetInterface (m_ipv4->GetAddress (m_ipv4->GetInterfaceForAddress (receiver), 0));
+      m_routingTable.Update (toNeighbor);
     }
+  m_nb.Update (src, Time (AllowedHelloLoss * HelloInterval));
+
   NS_LOG_LOGIC (receiver << " receive RREQ with hop count " << static_cast<uint32_t>(rreqHeader.GetHopCount ()) 
                          << " ID " << rreqHeader.GetId ()
                          << " to destination " << rreqHeader.GetDst ());
@@ -1170,16 +1194,9 @@
         { 
           destination = iface.GetBroadcast ();
         }
-      socket->SendTo (packet, 0, InetSocketAddress (destination, AODV_PORT));
-    }
+      m_lastBcastTime = Simulator::Now ();
+      Simulator::Schedule (Time (MilliSeconds (m_uniformRandomVariable->GetInteger (0, 10))), &RoutingProtocol::SendTo, this, socket, packet, destination); 
 
-  if (EnableHello)
-    {
-      if (!m_htimer.IsRunning ())
-        {
-          m_htimer.Cancel ();
-          m_htimer.Schedule (HelloInterval - Time (0.1 * MilliSeconds (m_uniformRandomVariable->GetInteger (0, 10))));
-	}
     }
 }
 
@@ -1539,10 +1556,20 @@
 RoutingProtocol::HelloTimerExpire ()
 {
   NS_LOG_FUNCTION (this);
-  SendHello ();
+  Time offset = Time (Seconds (0));
+  if (m_lastBcastTime > Time (Seconds (0)))
+    {
+      offset = Simulator::Now () - m_lastBcastTime;
+      NS_LOG_DEBUG ("Hello deferred due to last bcast at:" << m_lastBcastTime);
+    }
+  else
+    {
+      SendHello ();
+    }
   m_htimer.Cancel ();
-  Time t = Time (0.01 * MilliSeconds (m_uniformRandomVariable->GetInteger (0, 100)));
-  m_htimer.Schedule (HelloInterval - t);
+  Time diff = HelloInterval - offset;
+  m_htimer.Schedule (std::max (Time (Seconds (0)), diff));
+  m_lastBcastTime = Time (Seconds (0));
 }
 
 void
@@ -1598,7 +1625,8 @@
         { 
           destination = iface.GetBroadcast ();
         }
-      socket->SendTo (packet, 0, InetSocketAddress (destination, AODV_PORT));
+      Time jitter = Time (MilliSeconds (m_uniformRandomVariable->GetInteger (0, 10)));
+      Simulator::Schedule (jitter, &RoutingProtocol::SendTo, this , socket, packet, destination);
     }
 }
 
@@ -1757,7 +1785,7 @@
           Ptr<Socket> socket = FindSocketWithInterfaceAddress (toPrecursor.GetInterface ());
           NS_ASSERT (socket);
           NS_LOG_LOGIC ("one precursor => unicast RERR to " << toPrecursor.GetDestination () << " from " << toPrecursor.GetInterface ().GetLocal ());
-          socket->SendTo (packet, 0, InetSocketAddress (precursors.front (), AODV_PORT));
+          Simulator::Schedule (Time (MilliSeconds (m_uniformRandomVariable->GetInteger (0, 10))), &RoutingProtocol::SendTo, this, socket, packet, precursors.front ());
           m_rerrCount++;
         }
       return;
@@ -1790,8 +1818,7 @@
         { 
           destination = i->GetBroadcast ();
         }
-      socket->SendTo (packet, 0, InetSocketAddress (destination, AODV_PORT));
-      m_rerrCount++;
+      Simulator::Schedule (Time (MilliSeconds (m_uniformRandomVariable->GetInteger (0, 10))), &RoutingProtocol::SendTo, this, socket, packet, destination);
     }
 }
 
diff -Naur ns-3.17/src/aodv/model/aodv-routing-protocol.h ns-3.18/src/aodv/model/aodv-routing-protocol.h
--- ns-3.17/src/aodv/model/aodv-routing-protocol.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/aodv/model/aodv-routing-protocol.h	2013-10-26 07:07:29.619364382 -0700
@@ -248,6 +248,8 @@
   void SendRerrWhenNoRouteToForward (Ipv4Address dst, uint32_t dstSeqNo, Ipv4Address origin);
   //\}
 
+  void SendTo (Ptr<Socket> socket, Ptr<Packet> packet, Ipv4Address destination);
+
   /// Hello timer
   Timer m_htimer;
   /// Schedule next send of hello message
@@ -269,6 +271,8 @@
 
   /// Provides uniform random variables.
   Ptr<UniformRandomVariable> m_uniformRandomVariable;  
+  /// Keep track of the last bcast time
+  Time m_lastBcastTime;
 };
 
 }
diff -Naur ns-3.17/src/aodv/test/aodv-chain-regression-test-0-0.pcap ns-3.18/src/aodv/test/aodv-chain-regression-test-0-0.pcap
--- ns-3.17/src/aodv/test/aodv-chain-regression-test-0-0.pcap	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/aodv/test/aodv-chain-regression-test-0-0.pcap	2013-10-26 07:07:29.635364382 -0700
@@ -1,180 +1,159 @@
-��i�XX�������

��E4


+��i�XX�������

��E4


 



 

��� 
(

 


-



�
XX���������E4

+



xXX���������E4

 


 

��� 
(


 


-



�TT�������

��E0

-



-

���
-




-


�}
-@@�<��

+



L�@@�<��

 


-

Ԁ�@@������� ��


+

ۑԀ��@@������� ��


 

������
-


�@@�<

 ��


+


ѡ@@�<

��


 



-

�
Ԁ
hTT�<
0��E0


+

~�Ԁ
^�TT�<
0��E0


 


 


��
 


-


+�xԀ�@@�������

0��



+


+�n�Ԁ��@@�������

 ��



 


������
-

P@@�<
@��

+

��@@�<
@��

 



-


`Ԁ�xx�<

@��ET@

+


��ԀA�xx�<

0��ET@

 



-

�Ԁ
|@@�������P��


+

5�Ԁ
	�@@�������P��


 

������
-

KԀxx�<`��ET?

-



-

Ԁ�xx�<
p��ET
=

-


-


	ԀH^TT����������E0

-


-

���
-


-

�
xx�<

P��ET@

+

��Ԁ�xx�<`��ET?

 



-



�Ԁ

�
xx�<���ET?

-



-



kTT�������

`��E0

+

H�TT�������

@��E0

 



 

���
 




-


�
�Ԁ
pxx�<
���ET=

+


���Ԁ��xx�<
p��ET
=

+


+


��Ԁ
xx�<

P��ET@

+



+



�Ԁ

�
xx�<���ET?

+



+



�Ԁ
pxx�<
���ET=

 


-




�Ԁ
>^TT����������E0

+




�Ԁ
((TT����������E0

 


 

���
 


-

�
ATT�������

p��E0

+

�
�
TT�������

`��E0

 



 

���
 




-


�xx�<

���ET@

+


�xx�<

p��ET@

 



-

�Ԁ
�
xx�<���ET?

+

�Ԁ
�
xx�<���ET?

 



-

�Ԁpxx�<
���ET=

+

�Ԁpxx�<
���ET=

 


-


�ԀN]TT����������E0

+


�Ԁ�TT����������E0

 


 

���
 


-

��>TT�������

���E0

+

��	
TT�������

���E0

 



 

���
 




-


�xx�<

���ET@

+


�xx�<

���ET@

 



-

�Ԁ
�
xx�<���ET?

+

�Ԁ
�
xx�<���ET?

 



-

�Ԁ�xx�<

��ET=

+

�Ԁ�xx�<
���ET=

 


-


�ԀP[TT�������
��E0

+


�Ԁ�TT�������
��E0

 


 

���
 


-

�8;TT�������

���E0	

+

��TT�������

���E0

 



 

���
 




-


�xx�<

���ET
-@

+


�xx�<

���ET	@

 



-

�Ԁ
�
xx�< 
��ET
-?

+

�Ԁ
�
xx�<
��ET	?

 



-

xx�< 
��ET
-?

+

xx�<
��ET	?

 



-

\xx�< 
��ET
-?

+

`xx�<
��ET	?

 



-

q
-xx�< 
��ET
-?

+

�xx�<
��ET	?

 



-

[xx�< 
��ET
-?

+

�xx�<
��ET	?

 



-

^xx�< 
��ET
-?

+

�!xx�<
��ET	?

 



-

�/xx�< 
��ET
-?

+

�*xx�<
��ET	?

 



-

�0TT�<
0
��E0

-


-


��
-


-

�0ԀDXTT�������@
��E0

+

�+TT������� 
��E0

 


 

���
 


-

�x7TT�������

���E0

+

��FTT�<
0
��E0

+


+


��
+


+

�FԀ�	
TT�������

���E0
+

 



 

���
 




-


�XX�������

���E4


+


��XX�������

���E4

 



 

��� 
 
 


-


B
XX�������P
��E4

-


-

��� 
 

-


-


UTT�������`
��E0	

+


�/TT�������@
��E0

 


 

���
 


-

��4TT�������

���E0

+

��3XX�������P
��E4

+


+

��� 
 

+


+


(#TT�������

���E0

 



 

���
 



-


�STT�������p
��E0
-

+


��;TT�������`
��E0	

 


 

���
 


-

��1TT�������


��E0

+

��TT�������

���E0

 



 

���
 



-


��QTT��������
��E0

+


��;TT�������p
��E0
+

 


 

���
 


-

��4XX�������


��E4

+

�'XXX�������


��E4

 



 

��� 
 
 


-


B6XX��������
��E4

+


X�XX��������
��E4

 


 

��� 
 

 


-


b/TT�������

 
��E0

+


�@TT�������


��E0

 



 

���
 



-


��QTT��������
��E0


+


�aTT��������
��E0

 


 

���
 


-

��+TT�������

0
��E0

+

�	�<TT�������

 
��E0

 



 

���
 



-


�	�PTT��������
��E0

+


�	h|TT��������
��E0


 


 

���
 


-

�	�+TT�������

@
��E0

-



-

���
-



-


�
\ No newline at end of file
+

�
\ No newline at end of file
diff -Naur ns-3.17/src/aodv/test/aodv-chain-regression-test-1-0.pcap ns-3.18/src/aodv/test/aodv-chain-regression-test-1-0.pcap
--- ns-3.17/src/aodv/test/aodv-chain-regression-test-1-0.pcap	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/aodv/test/aodv-chain-regression-test-1-0.pcap	2013-10-26 07:07:29.635364382 -0700
@@ -1,222 +1,199 @@
-��i'
XX�������

��E4


+��i`XX�������

��E4


 



 

��� 
(

 


-



I
XX���������E4

+



�XX���������E4

 


 

��� 
(


 


-



�XX���������E4

+



I<XX���������E4

 


 

��� 
(

 


-



pTT�������

��E0

-



-

���
-




-


��@@�<��

+



N�@@�<��

 


-

G	Ԁ�	@@������� ��


+

��Ԁ��@@������� ��


 

������
-


-@@�<��

+

܏@@�<��

 


-

�
-Ԁ�TT�<0��E0


+

��Ԁ��TT�<0��E0


 


 

��
 


-


+��ԀI@@������� ��


+


+���Ԁ?�@@������� ��


 

������
-


K
@@�<

 ��


+


A�@@�<

��


 



-

[
Ԁ
�
TT�<
0��E0


+

Q�Ԁ
բTT�<
0��E0


 


 


��
 


-


+��ԀZ@@�������

0��



+


+���Ԁ��@@�������

 ��



 


������
-

�@@�<
@��

+

�@@�<
@��

 



-


�Ԁfxx�<

@��ET@

+


��Ԁ��xx�<

0��ET@

 



-

vԀ
@@�������P��


+

	�Ԁ
��@@�������P��


 

������
-

@@�<@��

+

��@@�<@��

 


-

Ԁ�xx�<`��ET?

+

��ԀT�xx�<`��ET?

 



-

�ԀN@@�������P��


-

������
-

Ԁkxx�<`��ET>

+

I�Ԁ��Ԁ"�xx�<`��ET>

 



-

	Ԁ�xx�<p��ET
>

+

��Ԁ��xx�<p��ET
>

 


-


�ԀAxx�<
p��ET
=

+


��Ԁ�xx�<
p��ET
=

 


-


6Ԁ�]TT����������E0

-


-

���
-


-

��o
TT����������E0

-


-

���
-


-

�
�xx�<

P��ET@

+


�Ԁ
�xx�<

P��ET@

 



-



�Ԁ


xx�<���ET?

+



�Ԁ


xx�<���ET?

 



-



Ԁ
Ԁ
Yxx�<���ET>

+



Ԁ
�xx�<���ET>

+



+



Ԁ
Yxx�<���ET>

 


-




iԀ
�xx�<
���ET=

+




iԀ
�xx�<
���ET=

 


-




�Ԁ
�]TT����������E0

+




�Ԁ
�'TT����������E0

 


 

���
 


-

�
o
TT����������E0

+

�
�0TT����������E0

 


 

���
 


-

�
�ATT�������

p��E0

+

�
@
TT�������

`��E0

 



 

���
 




-


��xx�<

���ET@

+


��xx�<

p��ET@

 



-

�Ԁ

xx�<���ET?

+

�Ԁ

xx�<���ET?

 



-

Ԁ�xx�<���ET>

+

Ԁ�xx�<���ET>

 



-

ԀYxx�<���ET>

+

ԀYxx�<���ET>

 


-


iԀ�xx�<
���ET=

+


iԀ�xx�<
���ET=

 


-


�Ԁ�\TT����������E0

+


�ԀTT����������E0

 


 

���
 


-

��l
TT����������E0

+

�� TT����������E0

 


 

���
 


-

�v?TT�������

���E0

+

�(
+
TT�������

���E0

 



 

���
 




-


��xx�<

���ET@

+


��xx�<

���ET@

 



-

�Ԁ

xx�<���ET?

+

�Ԁ

xx�<���ET?

 



-

Ԁ�xx�<���ET>

+

Ԁ�xx�<���ET>

 



-

�Ԁ�xx�<
��ET>

+

�Ԁ�xx�<���ET>

 


-


�Ԁxx�<

��ET=

+


�Ԁxx�<
���ET=

 


-


	Ԁ�ZTT�������
��E0

+


	ԀTT�������
��E0

 


 

���
 


-

�pl
TT�������
��E0

+

�DTT�������
��E0

 


 

���
 


-

��;TT�������

���E0	

+

���TT�������

���E0

 



 

���
 




-


��xx�<

���ET
-@

+


��xx�<

���ET	@

 



-

�Ԁ

xx�< 
��ET
-?

+

�Ԁ

xx�<
��ET	?

 



-

Mxx�< 
��ET
-?

+

Vxx�<
��ET	?

 



-

�xx�< 
��ET
-?

+

�xx�<
��ET	?

 



-

�	xx�< 
��ET
-?

+

1xx�<
��ET	?

 



-

�xx�< 
��ET
-?

+

6xx�<
��ET	?

 



-

�xx�< 
��ET
-?

+

� xx�<
��ET	?

 



-

�.xx�< 
��ET
-?

+

�)xx�<
��ET	?

 



-

g0TT�<
0
��E0

-


-


��
-


-

,1Ԁ�WTT�������@
��E0

+

N+TT������� 
��E0

 


 

���
 


-

�8TT�������

���E0

+

�3FTT�<
0
��E0

+


+


��
+


+

�FԀ(
+
TT�������

���E0
+

 



 

���
 




-


��XX�������

���E4


+


�XX�������

���E4

 



 

��� 
 
 


-


�XX�������P
��E4

-


-

��� 
 

-


-


~TTT�������`
��E0	

+


p/TT�������@
��E0

 


 

���
 


-

��5TT�������

���E0

+

�X3XX�������P
��E4

+


+

��� 
 

+


+


�#TT�������

���E0

 



 

���
 



-


��RTT�������p
��E0
-

+


�(;TT�������`
��E0	

 


 

���
 


-

�82TT�������


��E0

+

�XTT�������

���E0

 



 

���
 



-


�@QTT��������
��E0

+


�(;TT�������p
��E0
+

 


 

���
 


-

��5XX�������


��E4

+

��XXX�������


��E4

 



 

��� 
 
 


-


�5XX��������
��E4

+


�XX��������
��E4

 


 

��� 
 

 


-


�/TT�������

 
��E0

+


@ATT�������


��E0

 



 

���
 



-


�6QTT��������
��E0


+


��`TT��������
��E0

 


 

���
 


-

�,TT�������

0
��E0

+

�	X=TT�������

 
��E0

 



 

���
 



-


�	PTT��������
��E0

+


�	�{TT��������
��E0


 


 

���
 


-

�	,TT�������

@
��E0

-



-

���
-



-


�
\ No newline at end of file
+

�
\ No newline at end of file
diff -Naur ns-3.17/src/aodv/test/aodv-chain-regression-test-2-0.pcap ns-3.18/src/aodv/test/aodv-chain-regression-test-2-0.pcap
--- ns-3.17/src/aodv/test/aodv-chain-regression-test-2-0.pcap	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/aodv/test/aodv-chain-regression-test-2-0.pcap	2013-10-26 07:07:29.635364382 -0700
@@ -1,200 +1,161 @@
-��i�
XX���������E4

+��ixXX���������E4

 


 

��� 
(


 


-



�
XX���������E4

+



�;XX���������E4

 


 

��� 
(

 


-



>XX���������E4

+



aPXX���������E4

 


 

��� 
(

 


-



�@@�<��

+



H^TT���������E0


+


+

���
+


+

��t@@�< ��

 


-


Ԁ&@@������� ��


+

vԀ��@@�������0��


 

������
-

H@@�<��

+

މ@@�<��

 


-

�Ԁ
-	TT�<0��E0


+

��Ԁa�TT�<@��E0

 


 

��

 


-


+�	Ԁz	@@������� ��


+


+�q�ԀI�@@������� ��


 

������
-

}
-@@�<��

+

L�@@�<��

 


-

�
-ԀGTT�<0��E0


+

\�Ԁ�TT�<0��E0


 


 

��
 


-


+�Ԁ�@@������� ��


+


+�ۑԀ��@@������� ��


 

������
-


�
Ԁ
hTT�<
0��E0


+


~�Ԁ
^�TT�<
0��E0


 


 


��
 


-


+�P@@�<
@��

+


+���@@�<
@��

 



-


�Ԁ
|@@�������P��


+


5�Ԁ
	�@@�������P��


 

������
-

�@@�<@��

+

+�@@�<@��

 


-

KԀxx�<`��ET?

+

��Ԁ�xx�<`��ET?

 



-

�Ԁ�@@�������P��


+

�Ԁ��@@�������P��


 

������
-

�@@�<@��

+

��@@�<P��

 


-

�Ԁ�xx�<`��ET>

+

��Ԁj�xx�<`��ET>

 



-

�Ԁ:@@�������P��


+

_�Ԁ��@@�������`��


 

������
-

	Ԁ=xx�<`��ET=

+

��Ԁ��xx�<p��ET=

 



-

�Ԁ�xx�<p��ET
?

+

O�Ԁ��xx�<���ET
?

 


-


�Ԁ*xx�<p��ET
>

+


��Ԁ�xx�<p��ET
>

 


-


Ԁ�xx�<
p��ET
=

+


��Ԁ��xx�<
p��ET
=

 


-


H^TT����������E0

-


-

���
-


-

��
TT����������E0

-


-

���
-


-

�0o
TT����������E0

-


-

���
-


-

�
�Ԁ

�
xx�<���ET?

+



�Ԁ

�
xx�<���ET?

 



-



�
Ԁ
,xx�<���ET>

+



�
Ԁ
,xx�<���ET>

 



 



!Ԁ
�xx�<���ET=

 



 



NԀ
Cxx�<���ET?

 


-




SԀ
�xx�<���ET>

+




SԀ
�xx�<���ET>

 


-




�Ԁ
pxx�<
���ET=

+




�Ԁ
pxx�<
���ET=

 


-




>^TT����������E0

+




((TT����������E0

 


 

���
 


-

�
�
TT����������E0

-


-

���
-


-

�
�n
TT����������E0

+

�
0TT����������E0

 


 

���
 


-

��Ԁ
�
xx�<���ET?

+

�
�@TT����������E0

+


+

���
+


+

��Ԁ
�
xx�<���ET?

 



-

�
Ԁ,xx�<���ET>

+

�
Ԁ,xx�<���ET>

 



-

!Ԁ�xx�<���ET=

+

!Ԁ�xx�<���ET=

 



 

NԀCxx�<���ET?

 


-


SԀ�xx�<���ET>

+


SԀ�xx�<���ET>

 


-


�Ԁpxx�<
���ET=

+


�Ԁpxx�<
���ET=

 


-


N]TT����������E0

+


�TT����������E0

 


 

���
 


-

�F
TT����������E0

-


-

���
-


-

�jl
TT����������E0

+

�` TT����������E0

 


 

���
 


-

��Ԁ
�
xx�<���ET?

+

��HTT����������E0

+


+

���
+


+

��Ԁ
�
xx�<���ET?

 



-

�
Ԁ,xx�<���ET>

+

�
Ԁ,xx�<���ET>

 



-

!Ԁ�xx�<���ET=

+

!Ԁ�xx�<���ET=

 



 

NԀ�xx�<
��ET?

 


-


�Ԁ�xx�<
��ET>

+


�Ԁ�xx�<���ET>

 


-


�Ԁ�xx�<

��ET=

+


�Ԁ�xx�<
���ET=

 


-


P[TT�������
��E0

+


�TT�������
��E0

 


 

���
 


-

��
TT�������
��E0

+

��CTT�������
��E0

+


+

���
+


+

�ATTT�������
��E0

 


 

���
 


-

��k
TT�������
��E0

+

�xTT�������
��E0

 


 

���
 


-

��h
TT������� 
��E0

+

�` TT������� 
��E0

 


 

���
 


-

�e
TT�������0
��E0

+

��7TT�������0
��E0

 


 

���
 


-

�TT�<@
��E0

-


-

��
-


-

TT�<@
��E0

-


-

��
-


-

�TT�<@
��E0

-


-

��
-


-

�TT�<@
��E0

-


-

��
-


-

�#TT�<@
��E0

-


-

��
-


-

d-TT�<@
��E0

-


-

��
-


-

�8TT�<@
��E0

-


-

��
-


-

�b
TT�������P
��E0	

+

�` TT�������@
��E0

 


 

���
 


-

�h_
TT�������`
��E0
-

+

��CTT�������P
��E0	

 


 

���
 


-

�n^
TT�������p
��E0

-


-

���
-


-

�	�Z
TT��������
��E0

+

�	�7TT�������`
��E0
+

 


 

���
 


diff -Naur ns-3.17/src/aodv/test/aodv-chain-regression-test-3-0.pcap ns-3.18/src/aodv/test/aodv-chain-regression-test-3-0.pcap
--- ns-3.17/src/aodv/test/aodv-chain-regression-test-3-0.pcap	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/aodv/test/aodv-chain-regression-test-3-0.pcap	2013-10-26 07:07:29.635364382 -0700
@@ -1,67 +1,62 @@
-��i�XX���������E4

+��iI<XX���������E4

 


 

��� 
(

 


-



�XX���������E4

+



�OXX���������E4

 


 

��� 
(

 


-



�@@���������


+



�]TT���������E0


+


+

���
+


+

��s@@���������


 

������
-

y@@�<��

+

t@@�< ��

 


-

&Ԁ�TT�<��E0

+

�tԀ�uTT�<��E0

 


 

��
 


-


+��Ԁ�@@������� ��


+


+��uԀK�@@�������0��


 

������
-

�@@�<��

+

N�@@�<��

 


-

�Ԁ�TT�<0��E0


+

^�ԀيTT�<@��E0

 


 

��

 


-


+�G	Ԁ�	@@������� ��


+


+���Ԁ��@@������� ��


 

������
-

�
-Ԁ�TT�<0��E0


+

��Ԁ��TT�<0��E0


 


 

��
 


-


+�@@�<@��

+


+���@@�<@��

 


-

�ԀN@@�������P��


+

I�Ԁ�@@�������P��


 

������
-

p@@�<@��

+

'�@@�<P��

 


-

Ԁkxx�<`��ET>

+

��Ԁ"�xx�<`��ET>

 



-

{Ԁ�@@�������P��


+

2�Ԁ��@@�������`��


 

������
-

�@@�< ��

+

��@@�< ��

 


-

�Ԁ�xx�<`��ET=

+

��ԀD�xx�<p��ET=

 



-

yԀSxx�<0��ET
@

+

9�Ԁ�xx�<0��ET
@

 


-


cԀxx�<p��ET
?

+


#�Ԁ��xx�<���ET
?

 


-


	Ԁ�xx�<p��ET
>

+


��Ԁ��xx�<p��ET
>

 


-


�TT�������@��E0

+


�
TT�������@��E0

 


 

���
 


-

�@
TT����������E0

-


-

���
-


-

��o
TT����������E0

-


-

���
-


-

�
Ԁ
�xx�<���ET>

+

�
Ԁ
�xx�<���ET>

 



 



�Ԁ
Cxx�<���ET=

 



@@ -69,116 +64,116 @@
 


 




!Ԁ
�xx�<���ET?

 


-




Ԁ
Yxx�<���ET>

-


-




��TT�������`��E0

+




Ԁ
Yxx�<���ET>

 


+




�0TT����������E0

+


 

���
-


-

�
,
TT����������E0

+


+

�
1@TT����������E0

 


 

���
 


-

�
o
TT����������E0

-


+

�
X
TT�������`��E0

+


 

���
-


-

�Ԁ�xx�<���ET>

+


+

�Ԁ�xx�<���ET>

 



-

�ԀCxx�<���ET=

+

�ԀCxx�<���ET=

 



 

7Ԁxx�<p��ET@

 


 


!Ԁ�xx�<���ET?

 


-


ԀYxx�<���ET>

-


-


��TT����������E0

+


ԀYxx�<���ET>

 


+


� TT����������E0

+


 

���
-


-

��
TT����������E0

+


+

�
HTT����������E0

 


 

���
 


-

��l
TT����������E0

-


+

���TT����������E0

+


 

���
-


-

�Ԁ�xx�<���ET>

+


+

�Ԁ�xx�<���ET>

 



-

�ԀCxx�<���ET=

+

�ԀCxx�<���ET=

 



 

7Ԁxx�<���ET@

 


 


!Ԁ�xx�<
��ET?

 


-


�Ԁ�xx�<
��ET>

+


�Ԁ�xx�<���ET>

 


-


v�TT����������E0

+


DTT�������
��E0

+


+

���
+


+

��STT�������
��E0

+


+

���
+


+

�
TT����������E0

 


 

���
 


-

�(
TT�������
��E0

+

�q_TT������� 
��E0

 


 

���
 


-

�pl
TT�������
��E0

-


-

���
-


-

�,�TT����������E0	

+

�
TT����������E0	

 


 

���
 


-

��
TT������� 
��E0

+

��STT�������0
��E0

 


 

���
 


-

��TT����������E0
+

���TT����������E0
 

 


 

���
 


-

�J
TT�������0
��E0

+

�
HTT�������@
��E0

 


 

���
 


-

�kTT�<@
��E0

+

�z
TT�<P
��E0	

 


 

��
 




-

0Ԁ��TT����������E0

+

?

Ԁ�
TT����������E0

 


 

���
 


-

�L
TT�������P
��E0	

+

��[TT�������`
��E0
+

 


 

���
 


-

��TT����������E0

+

��
TT����������E0

 


 

���
 


-

��
TT�������`
��E0
-

+

�I<TT�������p
��E0

 


 

���
 


-

�V�TT����������E0


+

���TT����������E0


 


 

���
 


-

��
TT�������p
��E0

+

�	YcTT��������
��E0

 


 

���
 


-

�	b�TT�������
��E0

+

�	X
TT�������
��E0

 


 

���
 


-

�	*
TT��������
��E0

-


-

���
-


-

�
\ No newline at end of file
+

�
\ No newline at end of file
diff -Naur ns-3.17/src/aodv/test/aodv-chain-regression-test-4-0.pcap ns-3.18/src/aodv/test/aodv-chain-regression-test-4-0.pcap
--- ns-3.17/src/aodv/test/aodv-chain-regression-test-4-0.pcap	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/aodv/test/aodv-chain-regression-test-4-0.pcap	2013-10-26 07:07:29.635364382 -0700
@@ -1,136 +1,135 @@
-��i>XX���������E4

+��iaPXX���������E4

 


 

��� 
(

 


-



`@@���������


+



H^TT���������E0


+


+

���
+


+

��s@@���������


 

������
-

�@@�<��

+

�t@@�< ��

 


-

�ԀHTT�<��E0

+

�tԀ;uTT�<��E0

 


 

��
 


-


+�
Ԁ&@@������� ��


+


+�vԀ��@@�������0��


 

������
-

�Ԁ
-	TT�<0��E0


+

��Ԁa�TT�<@��E0

 


 

��

 


-


+��@@�<@��

+


+���@@�<P��

 


-

�Ԁ:@@�������P��


+

_�Ԁ��@@�������`��


 

������
-

\@@�< ��

+

�@@�< ��

 


-

	Ԁ=xx�<`��ET=

+

��Ԁ��xx�<p��ET=

 



-

MԀ�xx�<0��ET
@

+


�Ԁ[�xx�<0��ET
@

 


-


�Ԁ�xx�<p��ET
?

+


O�Ԁ��xx�<���ET
?

 


-


��TT�������@��E0

+


X
TT�������@��E0

 


 

���
 


-

��
TT����������E0

-


-

���
-


-

�
!Ԁ
�xx�<���ET=

+

�
!Ԁ
�xx�<���ET=

 



 



Ԁ
Yxx�<P��ET@

 


 




NԀ
Cxx�<���ET?

 


-




v�TT�������`��E0

-


-

���
-


-

�
�
TT����������E0

+




�@TT����������E0

 


 

���
 


-

�!Ԁ�xx�<���ET=

+

�
�

TT�������`��E0

+


+

���
+


+

�!Ԁ�xx�<���ET=

 



 

ԀYxx�<p��ET@

 


 


NԀCxx�<���ET?

 


-


�TT����������E0

-


-

���
-


-

�F
TT����������E0

+


�HTT����������E0

 


 

���
 


-

�!Ԁ�xx�<���ET=

+

��TT����������E0

+


+

���
+


+

�!Ԁ�xx�<���ET=

 



 

ԀYxx�<���ET@

 


 


NԀ�xx�<
��ET?

 


-


�TT����������E0

+


ATTT�������
��E0

+


+

���
+


+

��

TT����������E0

 


 

���
 


-

��
TT�������
��E0

+

��_TT������� 
��E0

 


 

���
 


-

���TT����������E0	

+

��

TT����������E0	

 


 

���
 


-

� 
TT������� 
��E0

+

�ATTT�������0
��E0

 


 

���
 


-

���TT����������E0
+

��TT����������E0
 

 


 

���
 


-

��
TT�������0
��E0

+

��HTT�������@
��E0

 


 

���
 


-

��TT�<@
��E0

+

�

TT�<P
��E0	

 


 

��
 




-

Ԁ�TT����������E0

+



Ԁ@
TT����������E0

 


 

���
 


-

��
TT�������P
��E0	

+

�\TT�������`
��E0
+

 


 

���
 


-

���TT����������E0

+

�X
TT����������E0

 


 

���
 


-

�0
TT�������`
��E0
-

+

��<TT�������p
��E0

 


 

���
 


-

�ήTT����������E0


+

��TT����������E0


 


 

���
 


-

�\

TT�������p
��E0

+

�	�cTT��������
��E0

 


 

���
 


-

�	ڬTT�������
��E0

+

�	�

TT�������
��E0

 


 

���
 


-

�	�
TT��������
��E0

-


-

���
-


-

�
\ No newline at end of file
+

�
\ No newline at end of file
diff -Naur ns-3.17/src/aodv/test/aodv-regression.cc ns-3.18/src/aodv/test/aodv-regression.cc
--- ns-3.17/src/aodv/test/aodv-regression.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/aodv/test/aodv-regression.cc	2013-10-26 07:07:29.635364382 -0700
@@ -57,11 +57,14 @@
     SetDataDir (NS_TEST_SOURCEDIR);
     // General RREQ-RREP-RRER test case
     AddTestCase (new ChainRegressionTest ("aodv-chain-regression-test"), TestCase::QUICK);
-    // Bug 606 test case, should crash if bug is not fixed
+    /// \internal
+    /// \bugid{606} test case, should crash if bug is not fixed
     AddTestCase (new ChainRegressionTest ("bug-606-test", Seconds (10), 3, Seconds (1)), TestCase::QUICK);
-    // Bug 772 UDP test case
+    /// \internal
+    /// \bugid{772} UDP test case
     AddTestCase (new Bug772ChainTest ("udp-chain-test", "ns3::UdpSocketFactory", Seconds (3), 10), TestCase::QUICK);
-    // Bug 772 TCP test case
+    /// \internal
+    /// \bugid{772} TCP test case
     AddTestCase (new Bug772ChainTest ("tcp-chain-test", "ns3::TcpSocketFactory", Seconds (3), 10), TestCase::QUICK);
     // Ping loopback test case
     AddTestCase (new LoopbackTestCase (), TestCase::QUICK);
@@ -161,10 +164,10 @@
   internetStack.Install (*m_nodes);
   streamsUsed += internetStack.AssignStreams (*m_nodes, streamsUsed);
   // InternetStack uses m_size more streams
-  NS_TEST_ASSERT_MSG_EQ (streamsUsed, (devices.GetN () * 6) + m_size, "Stream assignment mismatch");
+  NS_TEST_ASSERT_MSG_EQ (streamsUsed, (devices.GetN () * 8) + m_size, "Stream assignment mismatch");
   streamsUsed += aodv.AssignStreams (*m_nodes, streamsUsed);
   // AODV uses m_size more streams
-  NS_TEST_ASSERT_MSG_EQ (streamsUsed, ((devices.GetN () * 6) + (2*m_size)), "Stream assignment mismatch");
+  NS_TEST_ASSERT_MSG_EQ (streamsUsed, ((devices.GetN () * 8) + (2*m_size)), "Stream assignment mismatch");
 
   Ipv4AddressHelper address;
   address.SetBase ("10.1.1.0", "255.255.255.0");
diff -Naur ns-3.17/src/aodv/test/aodv-regression.h ns-3.18/src/aodv/test/aodv-regression.h
--- ns-3.17/src/aodv/test/aodv-regression.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/aodv/test/aodv-regression.h	2013-10-26 07:07:29.635364382 -0700
@@ -165,7 +165,7 @@
   ~ChainRegressionTest ();
 
 private:
-  /// XXX It is important to have pointers here
+  /// \internal It is important to have pointers here
   NodeContainer * m_nodes;
 
   /// PCAP file names prefix
diff -Naur ns-3.17/src/aodv/test/bug-606-test-0-0.pcap ns-3.18/src/aodv/test/bug-606-test-0-0.pcap
--- ns-3.17/src/aodv/test/bug-606-test-0-0.pcap	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/aodv/test/bug-606-test-0-0.pcap	2013-10-26 07:07:29.635364382 -0700
@@ -1,135 +1,125 @@
-��i�XX���������E4


+��i�XX���������E4


 



 

��� 
(

 


-



�
XX���������E4

+



�XX���������E4

 


 

��� 
(


 


-



O@@�<��

+



3)@@�<��

 


-

rԀ�@@������� ��


+

V*Ԁ�I@@������� ��


 

������
-


�@@�<��

+


�I@@�<��

 



-

ZԀ:TT�<0��E0


+

�JԀyKTT�<0��E0


 


 


��

 


-


+�JԀ�@@������� ��


+


+��KԀ1W@@������� ��


 


������
-

!	@@�<@��

+

3X@@�<@��

 


-


1	Ԁ	xx�<0��ET@

+


CXԀ�Xxx�<0��ET@

 



-

t
-ԀN@@�������P��


+

�YԀHqTT�������@��E0

+



+

���
+




+


�Ty@@�������P��


 

������
-

ԀQ
xx�<`��ET?

+

#zԀW{xx�<`��ET?

 



-

�Ԁ�xx�<p��ET
?

+

�|Ԁ�}xx�<p��ET
?

 


-


�Ԁ8�TT�������@��E0

+


�}Ԁ
xx�<P��ET@

 



-

���
-




-


�X
TT����������E0

+



�Ԁ
�
xx�<���ET?

+



+



!Ԁ
1xx�<���ET?

+


+




AԀ
�TT����������E0

 


 

���
 


-

�
xx�<P��ET@

-



-



�Ԁ
�
xx�<���ET?

-



-



!Ԁ
xx�<���ET?

-


-




/Ԁ
.�TT�������`��E0

+

�
HqTT�������`��E0

 



 

���
 




-


�
��TT����������E0

-


-

���
-


-

�@@�������p��


+


�(#@@�������p��


 


������
-


@@�<���

+

*$@@�<���

 


-



Ԁ�
xx�<���ET@

+


:$Ԁ�$xx�<���ET@

 



-

�Ԁ\@@����������


+

�%Ԁ�/TT����������E0

+


+

���
+


+

�fE@@����������


 

������
-

+Ԁ�xx�<���ET?

+

5FԀ�Gxx�<���ET?

 



-

�@@�<���

+

RTT����������E0

+



+

���
+




+


�\@@�<���

 


-

QԀF	@@�������
��


+

�]Ԁ�|@@�������
��


 

������
-


h	@@�<���

+


}@@�<���

 



-


-Ԁ7xx�<
��ET?

+

�}Ԁ�~xx�<
��ET?

 


-


GԀ�TT����������E0

+


�~Ԁxx�<���ET@

 



-

���
-




-


�x�TT������� 
��E0

+

�Ԁ�
xx�< 
��ET?

+



+

!Ԁxx�<0
��ET?

+


+


Ԁ�TT�������@
��E0

 


 

���
 


-

�xx�<���ET@

-



-

�Ԁ�
xx�<0
��ET?

-



-

!ԀCxx�<@
��ET?

-


-


SԀ�TT����������E0

+

��eTT����������E0

 



 

���
 




-


�0�TT�������P
��E0

-


-

���
-


-

�@@����������


+


�(#@@����������


 


������
-

R�TT����������E0
+

0uTT����������E0
 

 



 

���
 




 


�@@����������


 


������
-

ĸTT�������
��E0

+

�UTT�������
��E0

 



 

���
 




 


�@@�������
��


 


������
-

��TT������� 
��E0

+

HqTT������� 
��E0

 



 

���
 




 


�@@�������0
��


 


������
-

�XX�������@
��E4

+

�XX�������@
��E4

 



 

��� 
 
 


-


:�TT�������P
��E0

-



-

���
-



-


���TT�������`
��E0

+


'TT�������P
��E0

 



 

���
 



-


�	f�TT�������p
��E0

+


�	(#TT�������`
��E0

 



 

���
 



-


�	�4XX��������
��E4

+


�	�@XX�������p
��E4

 



 

��� 
 
 


diff -Naur ns-3.17/src/aodv/test/bug-606-test-1-0.pcap ns-3.18/src/aodv/test/bug-606-test-1-0.pcap
--- ns-3.17/src/aodv/test/bug-606-test-1-0.pcap	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/aodv/test/bug-606-test-1-0.pcap	2013-10-26 07:07:29.635364382 -0700
@@ -1,169 +1,149 @@
-��i'
XX���������E4


+��i`XX���������E4


 



 

��� 
(

 


-



I
XX���������E4

+



HXX���������E4

 


 

��� 
(


 


-



l@@���������


+



�(@@���������


 

������
-

�@@�<��

+

�(@@�<��

 


-

�Ԁ5TT�<��E0

+

o)Ԁ*TT�<��E0

 


 

��
 


-


+�EԀ@@������� ��


+


+�)*ԀYI@@������� ��


 

������
-


@@�<��

+


\J@@�<��

 



-

-Ԁ�TT�<0��E0


+

lJԀ�JTT�<0��E0


 


 


��

 


-


+�vԀ@@������� ��


+


+��KԀ�W@@������� ��


 


������
-

�@@�<@��

+

�W@@�<@��

 


-


^	Ԁ8
-xx�<0��ET@

+


pXԀ�Yxx�<0��ET@

 



-

H
-Ԁ�
-@@�������P��


+

�YԀ�qTT�������@��E0

+



+

���
+




+


��x@@�������P��


 

������
-

�@@�< ��

+

�y@@�< ��

 


-

�Ԁ�xx�<`��ET?

+

�yԀ�zxx�<`��ET?

 



-

�
Ԁyxx�<0��ET
@

+

�{Ԁ|xx�<0��ET
@

 


-


�Ԁxx�<p��ET
?

+


�|Ԁ%}xx�<p��ET
?

 


-


Ԁ�TT�������@��E0

+


~Ԁ(�TT�������@��E0

 


 

���
 


-

���TT�������@��E0

+

�
�xx�<P��ET@

 



-

���
-




-


��

TT����������E0

-


-

���
-


-

�
�xx�<P��ET@

-



-



�Ԁ

xx�<���ET?

+



�Ԁ

xx�<���ET?

 



 



Ԁ
�xx�<P��ET@

 


-




�Ԁ
gxx�<���ET?

-


-




[Ԁ
p�TT�������`��E0

+




�Ԁ
yxx�<���ET?

 


+




mԀ
0TT����������E0

+


 

���
-


-

�
��TT�������`��E0

+


+

�
�qTT�������`��E0

 



 

���
 




-


�
t�TT����������E0

-


+


�
8�TT�������`��E0

+


 

���
-


-

�p@@�������p��


+


+

��#@@�������p��


 


������
-

�@@�<���

+

�#@@�<���

 


-


?
Ԁ�xx�<���ET@

+


g$Ԁ�%xx�<���ET@

 



-

�Ԁ�@@����������


+

�%Ԁp/TT����������E0

+


+

���
+


+

��D@@����������


 

������
-

�@@�<p��

+

�E@@�<p��

 


-

�Ԁ�xx�<���ET?

+

FԀ�Fxx�<���ET?

 



-

�ԀQ@@����������


+

�GԀ�RTT����������E0

+



+

���
+




+


��[@@����������


 

������
-

�@@�<���

+

�[@@�<���

 


-

;Ԁxx�<���ET@

+

T\ԀI]xx�<���ET@

 


-


%Ԁ�@@�������
��


+


Y]Ԁ�|@@�������
��


 

������
-


�	@@�<���

+


�}@@�<���

 



-

�	Ԁ
-xx�<
��ET?

+

�}Ԁ2~xx�<
��ET?

 


-


tԀ�TT����������E0

+


'Ԁ�TT����������E0

 


 

���
 


-

���TT����������E0

+

��xx�<���ET@

 



-

���
-




-


���TT������� 
��E0

-


-

���
-


-

��xx�<���ET@

-



-

�Ԁ
xx�<0
��ET?

+

�Ԁ
xx�< 
��ET?

 



 

Ԁ�xx�<���ET@

 


-


�Ԁ�xx�<@
��ET?

-


-


Ԁ��TT����������E0

+


�ԀLxx�<0
��ET?

 


+


@Ԁ0TT�������@
��E0

+


 

���
-


-

���TT����������E0

+


+

�fTT����������E0

 



 

���
 




-


���TT�������P
��E0

-


+


���TT����������E0

+


 

���
-


-

�j�TT�������`
��E0

+


+

�0TT�������P
��E0

 


 

���
 


-

���TT�������p
��E0

+

��'TT�������`
��E0

 


 

���
 


-

�8
-@@��������
��


-

������
-


D�TT��������
��E0	

+

��'TT�������p
��E0

 


 

���
 


-

�8
-@@��������
��


-

������
-


:�TT��������
��E0
-

+

�TT��������
��E0

 


 

���
 


-

�8
-@@��������
��


-

������
-


�TT��������
��E0

+

�p/TT��������
��E0	

 


 

���
 


-

�	8
-@@��������
��


-

������
-


	��TT��������
��E0

+

�	�+TT��������
��E0
+

 


 

���
 


diff -Naur ns-3.17/src/aodv/test/bug-606-test-2-0.pcap ns-3.18/src/aodv/test/bug-606-test-2-0.pcap
--- ns-3.17/src/aodv/test/bug-606-test-2-0.pcap	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/aodv/test/bug-606-test-2-0.pcap	2013-10-26 07:07:29.635364382 -0700
@@ -1,119 +1,113 @@
-��i�
XX���������E4

+��i�XX���������E4

 


 

��� 
(


 


-



�
@@���������


+



0(@@���������


 

������
-

O@@�<��

+

3)@@�<��

 


-

_Ԁ�TT�<��E0

+

C)Ԁ�)TT�<��E0

 


 

��
 


-


+�rԀ�@@������� ��


+


+�V*Ԁ�I@@������� ��


 

������
-


ZԀ:TT�<0��E0


+


�JԀyKTT�<0��E0


 


 


��

 


-


+�!	@@�<@��

+


+�3X@@�<@��

 


-


t
-ԀN@@�������P��


+


�YԀTy@@�������P��


 

������
-

p@@�< ��

+

vy@@�< ��

 


-

ԀQ
xx�<`��ET?

+

#zԀW{xx�<`��ET?

 



-

a
Ԁ�
xx�<0��ET
@

+

g{Ԁ�{xx�<0��ET
@

 


-


�Ԁ�xx�<p��ET
?

+


�|Ԁ�}xx�<p��ET
?

 


-


��TT�������@��E0

+


��TT�������@��E0

 


 

���
 


-

�X
TT����������E0

-


-

���
-


-

�
�Ԁ
�
xx�<���ET?

+

�
�Ԁ
�
xx�<���ET?

 



 



�
Ԁ
,xx�<P��ET@

 


-




!Ԁ
xx�<���ET?

+




!Ԁ
1xx�<���ET?

 


-




�TT�������`��E0

+




�TT����������E0

+


+

���
+


+

�
��TT�������`��E0

 


 

���
 


-

�
��TT����������E0

+

�*$@@�<���

+


+


�%Ԁ�/TT����������E0

 


 

���
 


-

�
@@�<���

-


-


�Ԁ\@@����������


+

�fE@@����������


 

������
-

~@@�<p��

+

�E@@�<p��

 


-

+Ԁ�xx�<���ET?

+

5FԀ�Gxx�<���ET?

 



-

�Ԁ�@@����������


+

�GԀ[@@����������


 

������
-

�@@�<���

+

\@@�<���

 


-

Ԁ]xx�<���ET@

+

(\Ԁ�\xx�<���ET@

 


-


QԀF	@@�������
��


+


�]Ԁ�|@@�������
��


 

������
-



-Ԁ7xx�<
��ET?

+


�}Ԁ�~xx�<
��ET?

 


-


X�TT����������E0

+


��TT����������E0

 


 

���
 


-

�x�TT������� 
��E0

-


-

���
-


-

��Ԁ�
xx�<0
��ET?

+

��Ԁ�
xx�< 
��ET?

 



 

�
Ԁ,xx�<���ET@

 


-


!ԀCxx�<@
��ET?

+


!Ԁxx�<0
��ET?

 


-


�TT����������E0

-


-

���
-


-

�0�TT�������P
��E0

+


�TT�������@
��E0

 


 

���
 


-

�V�TT����������E0	

+

�p�TT����������E0

+


+

���
+


+

�ȯTT����������E0	

 


 

���
 


-

���TT����������E0
+

�@�TT����������E0
 

 


 

���
 


-

�ԭTT����������E0

+

���TT����������E0

 


 

���
 


-

���TT�������
��E0

+

���TT�������
��E0

 


 

���
 


-

�ިTT�������
��E0


+

�X�TT�������
��E0


 


 

���
 


-

�	@�TT������� 
��E0

+

�	@�TT������� 
��E0

 


 

���
 


diff -Naur ns-3.17/src/aodv/test/bug-772.h ns-3.18/src/aodv/test/bug-772.h
--- ns-3.17/src/aodv/test/bug-772.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/aodv/test/bug-772.h	2013-10-26 07:07:29.635364382 -0700
@@ -31,9 +31,9 @@
 /**
  * \ingroup aodv
  * 
- * \brief AODV deferred route lookup test case (see bug 772)
+ * \brief AODV deferred route lookup test case (see \bugid{772})
  * 
- * TODO: describe expected packet trace 
+ * \todo describe expected packet trace 
  */
 class Bug772ChainTest : public TestCase
 {
@@ -50,7 +50,7 @@
   ~Bug772ChainTest ();
 
 private:
-  /// XXX It is important to have pointers here
+  /// \internal It is important to have pointers here
   NodeContainer * m_nodes;
 
   /// PCAP file names prefix
diff -Naur ns-3.17/src/aodv/test/tcp-chain-test-0-0.pcap ns-3.18/src/aodv/test/tcp-chain-test-0-0.pcap
--- ns-3.17/src/aodv/test/tcp-chain-test-0-0.pcap	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/aodv/test/tcp-chain-test-0-0.pcap	2013-10-26 07:07:29.635364382 -0700
@@ -1,298 +1,300 @@
-��i�TT���������E0

+��iX
TT���������E0

 


 

���
 


-

�8D
TT���������E0

+

���
TT���������E0

 



 

���
 



-


�
XX���������E4

+


�
@XX���������E4

 



 

��� 
(

 


 
-




B
XX���������E4


+




pGXX���������E4


 


 

��� 
(


 


 
-




�@@�< ��

+




G(
@@�< ��

 


-


Ԁ
�@@�������0��


+


�)
Ԁ
�-
@@�������0��


 

������
-



�@@�< ��

+



�-
@@�< ��

 



-


xԀ
� TT�<@��E0

+


�.
Ԁ
�/
TT�<@��E0

 


 


��
 


 
-




� Ԁ
!@@�������0��


+




�/
Ԁ
�R
@@�������0��


 


������
-


Q"@@�<P��

+


�S
@@�<P��

 


-



a"Ԁ
�"LL�<@��E(
@
+



T
Ԁ
VT
LL�<@��E(
@
 



 


-�
	P��
l#Ԁ
X$@@�������`��


+�
	P��
U
Ԁ
/Y
@@�������`��


 

������
-


'%Ԁ
#&LL�<p��E(
?
+


�Y
Ԁ
�Z
LL�<p��E(
?
 



 


-�
	P��
j>Ԁ
?LL�<���E(
8
+�
	P��
��
Ԁ
+�
LL�<���E(8
 


 
-


	�

P��
?Ԁ
j?LL�<P��E(@
+


	�

P��
;�
Ԁ
��
LL�<P��E(@
 



 


-�
	

P��
'@Ԁ
�@LL�<���E(?
+�
	

P��
F�
Ԁ
�
LL�<���E(?
 



 


-�
	

P��
��TT����������E0

-


-

���
-


-

�
�B
TT�������`��E0

-



-

���
-




-


�
�Idd�<p��E@@
+�
	

P��
�Idd�<`��E@@
 



 


-�
	

P��
tMԀ
�Pdd�<���E@?
+�
	

P��
tMԀ
�Pdd�<���E@?
 



 


-�
	

P��
�qԀ
arLL�<���E(8
+�
	

P��
�qԀ
arLL�<���E(8
 


 
-


	�

P��
qrԀ
�rdd�<���E@@
+


	�

P��
qrԀ
�rdd�<p��E@@
 



 


-�
	
P��
CvԀ
�ydd�<���E@?
+�
	
P��
CvԀ
�ydd�<���E@?
 



 


-�
	
P��
nz���<���E�@
+�
	
P��
�z���<���E�@
 



 


-�
	1
P��
}���<���E�@
+�
	1
P��
�|���<���E�@
 



 


-�
	1
P��
�~���<���E�@
+�
	1
P��
�����<���E�@
 



 


-�
	1
P��
�Ԁ
�����<���E�?
+�
	1
P��
�Ԁ
M����<���E�?
 



 


-�
	1
P��
h����<���E�?
+�
	1
P��
X�Ԁ
��LL�<���E(8
+


+
+


	�

�P��

+�Ԁ
ߓdd�<���E@@
 



 


-�
	1
P��
��Ԁ
9�LL�<���E(8
+�
	�
P��
d�Ԁ
Κdd�<���E@?
+



 


-
-


	�

�P��
I�Ԁ
ߓdd�<���E@@
+�
	�
P��
Y�dd�<���E@@
 



 


-�
	�
P��
d�Ԁ
Κdd�<
��E@?
+�
	�
P��
_�dd�<���E@@
 



 


-�
	�
P��
P�dd�<���E@	@
+�
	�
P��
�Ԁ
N�dd�<
��E@?
 



 


-�
	�
P��
D�dd�<���E@	@
+�
	�
P��
Ǧ���<���E�	@
 



 


-�
	�
P��
ɢԀ
3�dd�<
��E@	?
+�
	�
P��
,�Ԁ
�����<
��E�	?
 



 


-�
	�
P��
�����<���E�
+�
	�
P��
Q�Ԁ
��LL�< 
��E(8
+


+
+


	�

�P��
�Ԁ
��dd�<���E@
 @
 



 


-�
	�
P��
�Ԁ
R����< 
��E�
+�
		a
P��
T�Ԁ
��dd�<0
��E@
 ?
 



 


-�
	�
P��
�Ԁ
��LL�<0
��E(8
+�
		a
P��
��dd�<���E@@
+



 


-
-


	�

�P��
��Ԁ
��dd�<���E@@
+�
	y
P��
a�dd�<���E@@
 



 


-�
		a
P��
T�Ԁ
��dd�<@
��E@?
+�
	y
P��
��Ԁ
P�dd�<@
��E@?
 



 


-�
		a
P��
.�dd�<���E@@
+�
	y
P��
����<���E�@
 



 


-�
	y
P��
��dd�<���E@@
+�
	
�
P��
c����<���E�@
 



 


-�
	y
P��
%�Ԁ
��dd�<P
��E@?
+�
	
�
P��
*����<���E�@
 



 


-�
	y
P��
P����<���E�
@
+�
	
�
P��
��Ԁ
�����<P
��E�?
 



 


-�
	
�
P��
��Ԁ
�����<`
��E�
?
+�
	
�
P��
a����<P
��E�?
 



 


-�
	
�
P��
*Ԁ
�*LL�<p
��E(8
+�
	
�
P��
Ԁ
�LL�<`
��E(8
 


 
-


	�

yP��
�*Ԁ
#:Ԁ
�:LL�<�
��E(8
+


	�

yP��
�Ԁ
�%Ԁ
Z&LL�<p
��E(8
 


 
-


	�

P��
�:Ԁ
�'	dd�<
��E@@
+


	�

P��
j&Ԁ
�'	dd�<���E@
@
 



 


-�
	
P��
D+	Ԁ
�.	dd�<�
��E@?
+�
	
P��
D+	Ԁ
�.	dd�<�
��E@
?
 



 


-�
	
P��
9/	dd�<
��E@@
+�
	
P��
o/	dd�<
��E@@
 



 


-�
	)
P��
�3	dd�<
��E@@
+�
	)
P��
24	dd�<
��E@@
 



 


-�
	)
P��
97	Ԁ
�:	dd�<�
��E@?
+�
	)
P��
�7	Ԁ
!;	dd�<�
��E@?
 



 


-�
	)
P��
�;	���< 
��E�@
+�
	)
P��
�;	���<
��E�@
 



 


-�
	A
P��
>	���< 
��E�@
+�
	A
P��
X>	���<
��E�@
 



 


-�
	A
P��
CA	���< 
��E�@
+�
	A
P��
�@	���<
��E�@
 



 


-�
	A
P��
�B	Ԁ
�C	���<�
��E�?
+�
	A
P��
*B	Ԁ
tC	���<�
��E�?
 



 


-�
	A
P��
^a	Ԁ
b	LL�<�
��E(8
-


-
-


	�

AP��
b	Ԁ
�qdd�<0
��E@@
+�
	A
P��
�E	���<�
��E�?
 



 


-�
	�
P��
4uԀ
Vudd�<@
��E@@
+�
	A
P��
{	Ԁ
�{	LL�<�
��E(8
+


+
+


	�

AP��
�{	Ԁ
�qdd�< 
��E@@
 



 


-�
	�
P��
ydd�<@
��E@@
+�
	�
P��
4uԀ
Vudd�<0
��E@@
 



 


-�
	�
P��
5}dd�<@
��E@@
+�
	�
P��
Aydd�<0
��E@@
 



 


-�
	�
P��
��Ԁ
$�dd�<�
��E@?
+�
	�
P��
�~dd�<0
��E@@
 



 


-�
	�
P��
����<P
��E�@
+�
	�
P��
"�Ԁ
��dd�<�
��E@?
 



 


-�
	�
P��
7����<P
��E�@
+�
	�
P��
D����<@
��E�@
 



 


-�
	�
P��
e����<P
��E�@
+�
	�
P��
��Ԁ
����<�
��E�?
 



 


-�
	�
P��
ʊԀ
����<�
��E�?
+�
	�
P��
�����<�
��E�?
 



 


-�
	�
P��
�����<�
��E�?
+�
	�
P��
�����<�
��E�?
 



 


-�
	�
P��
��Ԁ
R�LL�<��E(	8
+�
	�
P��
�Ԁ
��LL�<�
��E(	8
 


 
-


	�

�P��
b�Ԁ
��Ԁ
W�LL�<��E(
+


	�

�P��
��Ԁ
y�Ԁ
�LL�<��E(
 8
 


 
-


	�

qP��
g�Ԁ
��
dd�<`
��E@@
+


	�

qP��
+�Ԁ
��
dd�<P
��E@@
+



+


+�
	q
P��
$�
Ԁ
��
dd�<��E@?
 



 


-�
	q
P��
$�
Ԁ
��
dd�< ��E@?
+�
	q
P��
O�
dd�<`
��E@@
 



 


-�
	q
P��
F�
dd�<p
��E@@
+�
	�
P��
��
dd�<`
��E@@
 



 


-�
	�
P��
�
dd�<p
��E@@
+�
	�
P��
F�
Ԁ
��
dd�< ��E@?
 



 


-�
	�
P��
��
Ԁ

�
dd�<0��E@?
+�
	�
P��
��
���<p
��E�@
 



 


-�
	�
P��
��
���<�
��E�@
+�
	�
P��
��
���<p
��E�@
 



 


-�
	�
P��
��
���<�
��E�@
+�
	�
P��
��
���<p
��E�@
 



 


-�
	�
P��
t�
���<�
��E�@
+�
	�
P��
�
Ԁ
]�
���<0��E�?
 



 


-�
	�
P��
��
Ԁ
#�
���<@��E�?
+�
	�
P��
��
���<0��E�?
 



 


-�
	�
P��
~�
Ԁ
 �
LL�<P��E(8
+�
	�
P��
��
Ԁ
H�
LL�<@��E(8
 


 
-


	�

�P��
0�
Ԁ��TT�������`��E0

+


	�

�P��
X�
Ԁ�TT��������
��E0

+



+

���
+




+


��?TT�������P��E0

 


 

���
 


-

�O�@@��������
��


-


������
-

R�@@�<p��

-


-


b�Ԁ.�dd�<�
��E@@
+

�O�dd�<�
��E@@
 



 


-�
	!
P����ԀE�@@����������


-

������
-

��dd�<�
��E@@
+�
	!
P����Ԁ>�dd�<`��E@?
 



 


-�
	9
P����dd�<�
��E@@
+�
	!
P���dd�<�
��E@@
 



 


-�
	9
P��d�dd�<�
��E@@
+�
	9
P����dd�<�
��E@@
 



 


-�
	9
P����ԀS�dd�<���E@?
+�
	9
P��G�Ԁ��dd�<p��E@?
 



 


-�
	9
P�������<�
��E�@
+�
	9
P��r����<�
��E�@
 



 


-�
	 Q
P��K�Ԁ��dd�<���E@?
+�
	 Q
P������<�
��E�@
 



 


-�
	9
P��*����<���E�?
+�
	 Q
P��y����<�
��E�@
 



 


-�
	 Q
P��j����<���E�?
+�
	 Q
P����Ԁ(����<���E�?
 



 


-�
	 Q
P��}����<���E�?
+�
	 Q
P��;����<���E�?
 



 


-�
	 Q
P���?
TT��������
��E0

-



-

���
-




-


� �
dd�<�
��E@@
+�
	 Q
P���
@@��������
��


+


������
+

�
@@�<���

+


+


�
Ԁ��
dd�<�
��E@@
 



 


-�
	�
P����
Ԁ�
dd�<���E@?
+�
	�
P��d�
Ԁh�
@@����������


+

������
+

7�
Ԁ��
dd�<���E@?
 



 


-�
	�
P����dd�<�
��E@@
+�
	�
P����dd�<�
��E@@
 



 


-�
	�
P��%�Ԁ��dd�<���E@?
+�
	�
P��M�Ԁ��dd�<���E@?
 



 


 �
	�
P��
\ No newline at end of file
diff -Naur ns-3.17/src/aodv/test/tcp-chain-test-9-0.pcap ns-3.18/src/aodv/test/tcp-chain-test-9-0.pcap
--- ns-3.17/src/aodv/test/tcp-chain-test-9-0.pcap	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/aodv/test/tcp-chain-test-9-0.pcap	2013-10-26 07:07:29.635364382 -0700
@@ -1,69 +1,65 @@
-��i8�TT���������E0

+��id
TT���������E0

+

	
+

���
+

	
+

	�p�
TT���������E0

 


 
 

���
 


 
 


-�x�TT���������E0

-

	
-

���
-

	
-

	�
@@���������


-

	������
-


�@@������� ��


+�
��@@���������


 

	������
+


��Ԁ
N�TT�< ��E0


+

	
+

��@

 


-
�@@�<��

+
+




w�@@�������0��


+

	������
 


-
-

	
$@@�<��

+
��@@�<��

 


 
-

	
�Ԁ
{	TT�<0��E0

+

	
F�Ԁ
8�TT�<@��E0

 

	
 


 ��
 




 


-_
�	Ԁ
�
-Ԁ
xTT�<@��E0


+_
H�Ԁ
!�@@�<P��

+

	
+


4�Ԁ
�D
TT�������`��E0

 

	
-

��@

+

���
+

	
+

	�
0o
TT������� ��E0


+


+
+

���
 


 
-




�@@�<P��

-

	
-


�Ԁ
�4Ԁ
\5LL�<`��E(
8
+


+�
8�
Ԁ
ڵ
LL�<p��E(
8
 



 


-�
	P��
l5Ԁ
�5@@������� ��


+�
	P��
�
Ԁ
2�
@@�������0��


 


 ������
-

	
)7@@�<p��

+

	
5�
@@�<���

 

	
 


-
97Ԁ
�7LL�<0��E(
@
+
E�
Ԁ
��
LL�<@��E(@
 


 
-


	�

P��
C8Ԁ
�8LL�<���E(
?
+


	�

P��
P�
Ԁ
�
LL�<���E(?
 


 
-


	�

P��
rFԀ
GLL�<���E(8
+


	�

P��
��
Ԁ
2�
LL�<���E(8
 



 


-�
	

P��
$GԀ
��TT�������@��E0

-


-
-

���
-


-
-


-�
:�TT����������E0

-

	
-

���
-

	
-

	�

gԀ
kjdd�<���E@8
+�
	

P��
B�
Ԁ

gԀ
kjdd�<���E@8
 



 


 �
	

P��
{jԀ
�jLL�<P��E(@
@@ -72,22 +68,22 @@
 


	�

P��
�kԀ
LlLL�<���E(?
 


 
-


	�

P��
��Ԁ
g�dd�<���E@8
+


	�

P��
�Ԁ
^�dd�<���E@8
 



 


-�
	
P��
w�Ԁ
՗Ԁ
����<���E�8
+�
	
P��
n�Ԁ
��Ԁ
�����<���E�8
 



 


-�
	1
P��
/�Ԁ
}�LL�<`��E(@
+�
	1
P��
�Ԁ
>�LL�<`��E(@
 


 
-


	�

�P��
:�Ԁ
$�LL�<���E(?
+


	�

�P��
��Ԁ
�LL�<���E(?
 


 
-


	�

�P��
�Ԁ
[�dd�<
��E@8
+


	�

�P��
�Ԁ
[�dd�<
��E@8
 



 


-�
	�
P��
k�Ԁ
;�Ԁ
��dd�<
��E@	8
+�
	�
P��
k�Ԁ
;�Ԁ
��dd�<
��E@8
 



 


 �
	�
P��
��Ԁ
�LL�<p��E(@
@@ -99,11 +95,11 @@
 


	�

�P��
�LL�< 
��E(?
 


 
-


	�

�P��
��Ԁ
�����<0
��E�
-8
+


	�

�P��
��Ԁ
:����<0
��E�	8
 



 


-�
	�
P��
��Ԁ
��Ԁ
K�dd�<@
��E@8
+�
	�
P��
J�Ԁ
��Ԁ
K�dd�<@
��E@
+8
 



 


 �
		a
P��
[�Ԁ
��LL�<���E(@
@@ -112,132 +108,165 @@
 


	�

yP��
f�Ԁ
>LL�<P
��E(?
 


 
-


	�

yP��
T*Ԁ
�-dd�<`
��E@8
-



+


	�

yP��
j
LL�<P
��E(?
 


-�
	y
P��
�-Ԁ
s1Ԁ
�2���<p
��E�
8
-



+
+


	�

yP��
�LL�<P
��E(?
 


-�
	
�
P��
�2Ԁ
3LL�<���E(@
+
+


	�

yP��
{LL�<P
��E(?
+


+
+


	�

yP��
mLL�<P
��E(?
+


+
+


	�

yP��
Ԁ
=LL�<P
��E(?
 


 
-


	�

P��
�3Ԁ
�4LL�<�
��E(?
+


	�

yP��
�Ԁ
�LL�<P
��E(?
 


 
-


	�

P��
�D	Ԁ
;H	dd�<�
��E@8
+


	�

yP��
�dd�<`
��E@8
 



 


-�
	
P��
KH	Ԁ
�Q	Ԁ
�T	dd�<�
��E@8
+�
	y
P��
�Ԁ
@���<p
��E�8
 



 


-�
	)
P��
�T	Ԁ
KU	LL�<���E(@
+�
	
�
P��
PԀ
�LL�<���E(@
 


 
-


	�

AP��
V	Ԁ
�V	LL�<�
��E(?
+


	�

P��
[Ԁ
E LL�<�
��E(?
 


 
-


	�

AP��
�\	Ԁ
�]	���<�
��E�8
+


	�

P��
�D	Ԁ
;H	dd�<�
��E@
8
 



 


-�
	A
P��
^	Ԁ
��Ԁ
+�dd�<�
��E@8
+�
	
P��
KH	Ԁ
IR	Ԁ
�U	dd�<�
��E@8
 



 


-�
	�
P��
;�Ԁ
��LL�<���E(	@
+�
	)
P��
�U	Ԁ
V	LL�<���E(@
+


+
+


	�

AP��
�V	Ԁ
�W	LL�<�
��E(?
+


+
+


	�

AP��
Y	LL�<�
��E(?
 


 
-


	�

�P��
F�Ԁ
0�LL�<�
��E(	?
+


	�

AP��
Z	LL�<�
��E(?
 


 
-


	�

�P��
+�LL�<�
��E(	?
+


	�

AP��
k_	LL�<�
��E(?
 


 
-


	�

�P��
ژLL�<�
��E(	?
+


	�

AP��
d	LL�<�
��E(?
 


 
-


	�

�P��
+�Ԁ
��dd�<�
��E@8
+


	�

AP��
r	Ԁ
�u	LL�<�
��E(?
+


+
+


	�

AP��
x	���<�
��E�8
 



 


-�
	�
P��
��Ԁ
<�Ԁ
�����<��E�8
+�
	A
P��
%x	Ԁ
��Ԁ
+�dd�<�
��E@8
 



 


-�
	�
P��
��Ԁ
�LL�<���E(
-@
+�
	�
P��
;�Ԁ
��LL�<���E(	@
 


 
-


	�

qP��
��Ԁ
C�LL�<��E(
-?
+


	�

�P��
F�Ԁ
�LL�<�
��E(	?
 


 
-


	�

qP��
��
Ԁ
�
dd�< ��E@8
+


	�

�P��
L�Ԁ
��dd�<�
��E@8
 



 


-�
	q
P��
+�
Ԁ
D�
Ԁ
��
dd�<0��E@8
+�
	�
P��
ƶԀ
��Ԁ
����<��E�8
 



 


-�
	�
P��
��
Ԁ
�
LL�<���E(@
+�
	�
P��
�Ԁ
`�LL�<���E(
+@
 


 
-


	�

�P��
��
Ԁ
��
LL�<@��E(?
+


	�

qP��
�Ԁ
�LL�<��E(
+?
 


 
-


	�

�P��
�
LL�<@��E(?
+


	�

qP��
��
Ԁ
�
dd�< ��E@8
+



 


-
-


	�

�P��
�
Ԁ
L�
���<P��E�8
+�
	q
P��
+�
Ԁ
��
Ԁ
B�
dd�<0��E@8
 



 


-�
	�
P��
\�
Ԁ��TT����������E0

+�
	�
P��
R�
Ԁ
��
LL�<���E(@
 


 
-

���
+


	�

�P��
]�
Ԁ
�
LL�<@��E(?
 


-
+
+


	�

�P��
�
LL�<@��E(?
 


-���TT�������`��E0

-

	
-

���
-

	
-

	�1�@@�<p��

+
+


	�

�P��
��
Ԁ
>�
���<P��E�8
+



+


+�
	�
P��
N�
Ԁ��@@�<`��

 

	
-

�Ԁ��@@����������


+

�Ԁ��@@�������p��


 

	������
 


-�@@�<���

+��@@�<���

 


 
-

	��Ԁe�dd�<���E@8
+

	d�Ԁ��dd�<���E@8
 



 


-�
	!
P��u�Ԁ��@@�������
��


+�
	!
P����Ԁ"�LL�<���E(@
 


-������
-

	;�@@�<���

-

	
+
+


	�

9P��r�LL�<���E(@
 


-K�Ԁ��LL�<
��E(
@
+
+


	�

9P����LL�<���E(@
 


 
-


	�

9P��q�ԀK�@@����������


+


	�

9P����Ԁ^�@@����������


 

	������
-

��Ԁ�
dd�<���E@8
+

�
ԀC
dd�<���E@8
 



 


-�
	9
P��	
Ԁl
Ԁ�
���<���E�8
+�
	9
P��S
ԀL
Ԁ�

���<���E�8
 



 


-�
	 Q
P���
Ԁ	
LL�< 
��E(@
+�
	 Q
P���

Ԁ�

LL�<
��E(
@
+


+
+


	�

 �P���
Ԁ`
TT����������E0

+

	
+

���
+

	
+

	�`g
TT�������
��E0

 


 
-


	�

 �P���	
Ԁ2�
Ԁ��
dd�<���E@8
+

���
+


+
+


+��hԀfldd�<���E@8
 



 


-�
	�
P����
Ԁ��
LL�<0
��E(@
+�
	�
P��vlԀփ@@������� 
��


+


+������
+

	ل@@�<���

+

	
+


+�Ԁv�LL�<0
��E(@
 


 
-


	�

 �P����
Ԁ��Ԁ�dd�<���E@8
+


	�

 �P��3�Ԁ��ԀD�dd�<���E@8
 



 


-�
	�
P��,�Ԁz�LL�<@
��E(@
+�
	�
P��T�Ԁ��LL�<@
��E(@
 


 
-


	�

 �P��7�Ԁ
\ No newline at end of file
+


	�

 �P��_�Ԁ
\ No newline at end of file
diff -Naur ns-3.17/src/aodv/test/udp-chain-test-0-0.pcap ns-3.18/src/aodv/test/udp-chain-test-0-0.pcap
--- ns-3.17/src/aodv/test/udp-chain-test-0-0.pcap	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/aodv/test/udp-chain-test-0-0.pcap	2013-10-26 07:07:29.635364382 -0700
@@ -1,75 +1,75 @@
-��ixiTT�������		��E0

-



-

���
-



-


�P-
TT�������
+��i��TT�������
 
 ��E0

 


 

���
 


-

�
8hTT�������		��E0


+

���TT�������		��E0

+



+

���
+



+


�
p
TT�������		��E0


 



 

���
 



-


�
-
TT�������
+


�
�
TT�������
 
 ��E0


 


 

���
 


-

�
�IXX�������		 ��E4

+

�
�YXX�������		 ��E4

 



 

��� 
(

 


 
-




2KXX�������
+




�yXX�������
 
  ��E4

 


 

��� 
(


 


 
-




�d@@�<
+





�@@�<
 
 0��

 
 


-


IfԀ
g@@�������
+


x�Ԁ
|�@@�������
 
 @��


 
 

������
-



<g@@�<
+



��@@�<
 		0��
	
 



 
-


�gԀ	
�hTT�<	
+


K�Ԁ	
=�TT�<	
 
 P��E0

 


 


��
 


 
-


�
�hԀ
-
9i@@�������		@��

	
+


E
M�Ԁ
+

�@@�������		@��

	
 


������
-


�j@@�<	
+


�@@�<	
 
 `��

 
 

	
-



�jԀ
-
�j���<
+



 �Ԁ
+
w����<
 		P��E�@
 



 


-�	�
�qԀ	
�r@@�������
+�	�
c�Ԁ	
�@@�������
 
 p��


 
 

������
-


�sԀ
z���<
+


N�Ԁ
2����<
 
 ���E�?
 



@@ -119,54 +119,53 @@
 ���E�?
 



 


-�	�eTT�������		���E0	

-



-

���
-




-


�O����<
-		���E�
-@
+�	�O����<
+		���E�	@
 



 


 �	�<�Ԁ	����<
 
-���E�
-?
+���E�	?
 



 


-�	�T)
TT�������
+�	��YTT�������		���E0
+

+



+

���
+




+


��^TT�������
 
 ���E0

 


 

���
 


-

�?
@@�������		���

	
+

�?
���<
+		���E�@
+



+


+�	�,Ԁ	����<
+
+
��E�?
+



+


+�	�[@@�������		���

	
 


������
-

B@@�<	
+

\@@�<	
 
-
��

+
��

 
 

	
-


RԀ
-����<
-		���E�@
+


*\Ԁ
+�\���<
+		���E�@
 



 


-�	��Ԁ	g@@�������
+�	�wcԀ	@@�������
 
-
��


+ 
��


 
 

������
-

6Ԁ���<
-
- 
��E�?
-



-


-�	�/W���<
-		���E�@
-



-


-�	�^Ԁ	�d���<
+

�Ԁ�����<
 
 0
��E�?
 



diff -Naur ns-3.17/src/aodv/test/udp-chain-test-9-0.pcap ns-3.18/src/aodv/test/udp-chain-test-9-0.pcap
--- ns-3.17/src/aodv/test/udp-chain-test-9-0.pcap	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/aodv/test/udp-chain-test-9-0.pcap	2013-10-26 07:07:29.635364382 -0700
@@ -1,52 +1,52 @@
-��i?TT���������E0

+��i�yTT���������E0

 

	
 

���
 

	
-

	���
TT���������E0

+

	��_
TT���������E0

 


 
 

���
 


 
 


-�
�;TT���������E0


+�
`ZTT���������E0


 

	
 

���
 

	
-

	�

TT���������E0


+

	�
P@
TT���������E0


 


 
 

���
 


 
 


-�
�O@@������� ��


-

	������
-


�P@@�������0��


+�
c
+@@������� ��


 

	������
 


-

Q@@�< ��

+
�
+@@�< ��

 


 
-

	
�QԀ
�RԀ
tSTT�<@��E0

+

	
2Ԁ
6TT�<0��E0

 

	
 


 ��
 




 


-_
�SԀ
mTTT�<P��E0

+_
FԀ
@@�������@��


+

	������
+


�Ԁ
�TT�<P��E0

 

	
 

��@

 


 
-


�
�V@@�<`��

-

	
-


RY@@�<`��

+


E

4@@�<`��

 

	
-


iZԀ
l�Ԁ
>����<p��E�8
+


�6Ԁ
|iԀ
Np���<p��E�8
 



 


-�	�
N�Ԁ
1�Ԁ
����<���E�8
+�	�
^pԀ
1�Ԁ
����<���E�8
 



 


 �	�
�Ԁ
!Ԁ
����<���E�8
@@ -61,36 +61,35 @@
 �	�
�Ԁ
��
Ԁ
��
���<���E�8
 



 


-�	�
��
Ԁ ;TT����������E0

+�	�
��
Ԁ�uTT����������E0

 

	
 

���
 

	
-

	���Ԁs
���<���E�
-8
+

	���Ԁs
���<���E�	8
 



 


-�	��
Ԁ0~
TT�������0��E0

+�	��
Ԁ�8
TT�������0��E0

 


 
 

���
 


 
 


-��K@@�<���

+��V@@�<���

 

	
-

pSԀ/T@@�������
��


+

^^Ԁ�}@@�������
��


 

	������
 


-QT@@�<@��

+�}@@�<@��

 


 
-

	�TԀ3\���<
��E�8
+

	�~Ԁͅ���<
��E�8
 



 


-�	�C\Ԁ��ԀS����< 
��E�8
+�	�݅Ԁ%!Ԁ�'���< 
��E�8
 



 


-�	�c�Ԁq�ԀC����<0
��E�
8
+�	�(Ԁq�ԀC����<0
��E�
8
 



 


 �	�S�Ԁa#
diff -Naur ns-3.17/src/applications/bindings/modulegen__gcc_ILP32.py ns-3.18/src/applications/bindings/modulegen__gcc_ILP32.py
--- ns-3.17/src/applications/bindings/modulegen__gcc_ILP32.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/applications/bindings/modulegen__gcc_ILP32.py	2013-10-26 07:07:30.587364407 -0700
@@ -40,8 +40,8 @@
     module.add_class('AttributeConstructionList', import_from_module='ns.core')
     ## attribute-construction-list.h (module 'core'): ns3::AttributeConstructionList::Item [struct]
     module.add_class('Item', import_from_module='ns.core', outer_class=root_module['ns3::AttributeConstructionList'])
-    ## average.h (module 'tools'): ns3::Average<double> [class]
-    module.add_class('Average', import_from_module='ns.tools', template_parameters=['double'])
+    ## average.h (module 'stats'): ns3::Average<double> [class]
+    module.add_class('Average', import_from_module='ns.stats', template_parameters=['double'])
     ## buffer.h (module 'network'): ns3::Buffer [class]
     module.add_class('Buffer', import_from_module='ns.network')
     ## buffer.h (module 'network'): ns3::Buffer::Iterator [class]
@@ -66,8 +66,12 @@
     module.add_class('DataOutputCallback', allow_subclassing=True, import_from_module='ns.stats')
     ## data-rate.h (module 'network'): ns3::DataRate [class]
     module.add_class('DataRate', import_from_module='ns.network')
+    ## delay-jitter-estimation.h (module 'network'): ns3::DelayJitterEstimation [class]
+    module.add_class('DelayJitterEstimation', import_from_module='ns.network')
     ## event-id.h (module 'core'): ns3::EventId [class]
     module.add_class('EventId', import_from_module='ns.core')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress [class]
     module.add_class('Inet6SocketAddress', import_from_module='ns.network')
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress [class]
@@ -88,6 +92,10 @@
     root_module['ns3::Ipv6Address'].implicitly_converts_to(root_module['ns3::Address'])
     ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix [class]
     module.add_class('Ipv6Prefix', import_from_module='ns.network')
+    ## mac16-address.h (module 'network'): ns3::Mac16Address [class]
+    module.add_class('Mac16Address', import_from_module='ns.network')
+    ## mac16-address.h (module 'network'): ns3::Mac16Address [class]
+    root_module['ns3::Mac16Address'].implicitly_converts_to(root_module['ns3::Address'])
     ## mac48-address.h (module 'network'): ns3::Mac48Address [class]
     module.add_class('Mac48Address', import_from_module='ns.network')
     ## mac48-address.h (module 'network'): ns3::Mac48Address [class]
@@ -136,6 +144,8 @@
     module.add_class('PacketTagList', import_from_module='ns.network')
     ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct]
     module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration]
+    module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network')
     ## packetbb.h (module 'network'): ns3::PbbAddressTlvBlock [class]
     module.add_class('PbbAddressTlvBlock', import_from_module='ns.network')
     ## packetbb.h (module 'network'): ns3::PbbTlvBlock [class]
@@ -150,6 +160,8 @@
     module.add_class('PcapHelperForDevice', allow_subclassing=True, import_from_module='ns.network')
     ## ping6-helper.h (module 'applications'): ns3::Ping6Helper [class]
     module.add_class('Ping6Helper')
+    ## radvd-helper.h (module 'applications'): ns3::RadvdHelper [class]
+    module.add_class('RadvdHelper')
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter> [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simulator.h (module 'core'): ns3::Simulator [class]
@@ -238,6 +250,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::NixVector', 'ns3::empty', 'ns3::DefaultDeleter<ns3::NixVector>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> > [class]
@@ -324,6 +338,8 @@
     module.add_class('ConstantRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
     ## data-calculator.h (module 'stats'): ns3::DataCalculator [class]
     module.add_class('DataCalculator', import_from_module='ns.stats', parent=root_module['ns3::Object'])
+    ## data-collection-object.h (module 'stats'): ns3::DataCollectionObject [class]
+    module.add_class('DataCollectionObject', import_from_module='ns.stats', parent=root_module['ns3::Object'])
     ## data-output-interface.h (module 'stats'): ns3::DataOutputInterface [class]
     module.add_class('DataOutputInterface', import_from_module='ns.stats', parent=root_module['ns3::Object'])
     ## data-rate.h (module 'network'): ns3::DataRateChecker [class]
@@ -332,12 +348,18 @@
     module.add_class('DataRateValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
     ## random-variable-stream.h (module 'core'): ns3::DeterministicRandomVariable [class]
     module.add_class('DeterministicRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## double.h (module 'core'): ns3::DoubleValue [class]
+    module.add_class('DoubleValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## drop-tail-queue.h (module 'network'): ns3::DropTailQueue [class]
     module.add_class('DropTailQueue', import_from_module='ns.network', parent=root_module['ns3::Queue'])
     ## random-variable-stream.h (module 'core'): ns3::EmpiricalRandomVariable [class]
     module.add_class('EmpiricalRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
     ## attribute.h (module 'core'): ns3::EmptyAttributeValue [class]
     module.add_class('EmptyAttributeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
+    ## enum.h (module 'core'): ns3::EnumChecker [class]
+    module.add_class('EnumChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
+    ## enum.h (module 'core'): ns3::EnumValue [class]
+    module.add_class('EnumValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## random-variable-stream.h (module 'core'): ns3::ErlangRandomVariable [class]
     module.add_class('ErlangRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
     ## error-model.h (module 'network'): ns3::ErrorModel [class]
@@ -352,6 +374,8 @@
     module.add_class('ExponentialRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
     ## random-variable-stream.h (module 'core'): ns3::GammaRandomVariable [class]
     module.add_class('GammaRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## integer.h (module 'core'): ns3::IntegerValue [class]
+    module.add_class('IntegerValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## ipv4-address.h (module 'network'): ns3::Ipv4AddressChecker [class]
     module.add_class('Ipv4AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
     ## ipv4-address.h (module 'network'): ns3::Ipv4AddressValue [class]
@@ -372,12 +396,22 @@
     module.add_class('ListErrorModel', import_from_module='ns.network', parent=root_module['ns3::ErrorModel'])
     ## random-variable-stream.h (module 'core'): ns3::LogNormalRandomVariable [class]
     module.add_class('LogNormalRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## mac16-address.h (module 'network'): ns3::Mac16AddressChecker [class]
+    module.add_class('Mac16AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
+    ## mac16-address.h (module 'network'): ns3::Mac16AddressValue [class]
+    module.add_class('Mac16AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
     ## mac48-address.h (module 'network'): ns3::Mac48AddressChecker [class]
     module.add_class('Mac48AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
     ## mac48-address.h (module 'network'): ns3::Mac48AddressValue [class]
     module.add_class('Mac48AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
+    ## mac64-address.h (module 'network'): ns3::Mac64AddressChecker [class]
+    module.add_class('Mac64AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
+    ## mac64-address.h (module 'network'): ns3::Mac64AddressValue [class]
+    module.add_class('Mac64AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
     ## basic-data-calculators.h (module 'stats'): ns3::MinMaxAvgTotalCalculator<double> [class]
     module.add_class('MinMaxAvgTotalCalculator', import_from_module='ns.stats', template_parameters=['double'], parent=[root_module['ns3::DataCalculator'], root_module['ns3::StatisticalSummary']])
+    ## basic-data-calculators.h (module 'stats'): ns3::MinMaxAvgTotalCalculator<unsigned int> [class]
+    module.add_class('MinMaxAvgTotalCalculator', import_from_module='ns.stats', template_parameters=['unsigned int'], parent=[root_module['ns3::DataCalculator'], root_module['ns3::StatisticalSummary']])
     ## net-device.h (module 'network'): ns3::NetDevice [class]
     module.add_class('NetDevice', import_from_module='ns.network', parent=root_module['ns3::Object'])
     ## net-device.h (module 'network'): ns3::NetDevice::PacketType [enumeration]
@@ -400,6 +434,8 @@
     module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
     ## packet-sink.h (module 'applications'): ns3::PacketSink [class]
     module.add_class('PacketSink', parent=root_module['ns3::Application'])
+    ## packet-data-calculators.h (module 'network'): ns3::PacketSizeMinMaxAvgTotalCalculator [class]
+    module.add_class('PacketSizeMinMaxAvgTotalCalculator', import_from_module='ns.network', parent=root_module['ns3::MinMaxAvgTotalCalculator< unsigned int >'])
     ## packet-socket.h (module 'network'): ns3::PacketSocket [class]
     module.add_class('PacketSocket', import_from_module='ns.network', parent=root_module['ns3::Socket'])
     ## packet-socket-factory.h (module 'network'): ns3::PacketSocketFactory [class]
@@ -424,6 +460,8 @@
     module.add_class('PbbTlv', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::PbbTlv, ns3::empty, ns3::DefaultDeleter<ns3::PbbTlv> >'])
     ## ping6.h (module 'applications'): ns3::Ping6 [class]
     module.add_class('Ping6', parent=root_module['ns3::Application'])
+    ## probe.h (module 'stats'): ns3::Probe [class]
+    module.add_class('Probe', import_from_module='ns.stats', parent=root_module['ns3::DataCollectionObject'])
     ## radvd.h (module 'applications'): ns3::Radvd [class]
     module.add_class('Radvd', parent=root_module['ns3::Application'])
     ## radvd-interface.h (module 'applications'): ns3::RadvdInterface [class]
@@ -440,8 +478,6 @@
     module.add_class('SimpleChannel', import_from_module='ns.network', parent=root_module['ns3::Channel'])
     ## simple-net-device.h (module 'network'): ns3::SimpleNetDevice [class]
     module.add_class('SimpleNetDevice', import_from_module='ns.network', parent=root_module['ns3::NetDevice'])
-    ## nstime.h (module 'core'): ns3::TimeChecker [class]
-    module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
     module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
@@ -458,14 +494,24 @@
     module.add_class('UdpServer', parent=root_module['ns3::Application'])
     ## udp-trace-client.h (module 'applications'): ns3::UdpTraceClient [class]
     module.add_class('UdpTraceClient', parent=root_module['ns3::Application'])
+    ## uinteger.h (module 'core'): ns3::UintegerValue [class]
+    module.add_class('UintegerValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## v4ping.h (module 'applications'): ns3::V4Ping [class]
     module.add_class('V4Ping', parent=root_module['ns3::Application'])
     ## address.h (module 'network'): ns3::AddressChecker [class]
     module.add_class('AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
     ## address.h (module 'network'): ns3::AddressValue [class]
     module.add_class('AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
+    ## application-packet-probe.h (module 'applications'): ns3::ApplicationPacketProbe [class]
+    module.add_class('ApplicationPacketProbe', parent=root_module['ns3::Probe'])
     ## error-model.h (module 'network'): ns3::BurstErrorModel [class]
     module.add_class('BurstErrorModel', import_from_module='ns.network', parent=root_module['ns3::ErrorModel'])
+    ## basic-data-calculators.h (module 'stats'): ns3::CounterCalculator<unsigned int> [class]
+    module.add_class('CounterCalculator', import_from_module='ns.stats', template_parameters=['unsigned int'], parent=root_module['ns3::DataCalculator'])
+    ## packet-data-calculators.h (module 'network'): ns3::PacketCounterCalculator [class]
+    module.add_class('PacketCounterCalculator', import_from_module='ns.network', parent=root_module['ns3::CounterCalculator< unsigned int >'])
+    ## packet-probe.h (module 'network'): ns3::PacketProbe [class]
+    module.add_class('PacketProbe', import_from_module='ns.network', parent=root_module['ns3::Probe'])
     ## packetbb.h (module 'network'): ns3::PbbAddressTlv [class]
     module.add_class('PbbAddressTlv', import_from_module='ns.network', parent=root_module['ns3::PbbTlv'])
     module.add_container('std::vector< ns3::Ipv6Address >', 'ns3::Ipv6Address', container_type='vector')
@@ -473,6 +519,9 @@
     module.add_container('std::list< unsigned int >', 'unsigned int', container_type='list')
     module.add_container('std::list< ns3::Ptr< ns3::Socket > >', 'ns3::Ptr< ns3::Socket >', container_type='list')
     module.add_container('std::list< ns3::Ptr< ns3::RadvdPrefix > >', 'ns3::Ptr< ns3::RadvdPrefix >', container_type='list')
+    typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxEndCallback')
+    typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxEndCallback*')
+    typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxEndCallback&')
     typehandlers.add_type_alias('ns3::SequenceNumber< short unsigned int, short int >', 'ns3::SequenceNumber16')
     typehandlers.add_type_alias('ns3::SequenceNumber< short unsigned int, short int >*', 'ns3::SequenceNumber16*')
     typehandlers.add_type_alias('ns3::SequenceNumber< short unsigned int, short int >&', 'ns3::SequenceNumber16&')
@@ -488,9 +537,6 @@
     typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxStartCallback')
     typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxStartCallback*')
     typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxStartCallback&')
-    typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxEndCallback')
-    typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxEndCallback*')
-    typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxEndCallback&')
     typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyRxEndOkCallback')
     typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyRxEndOkCallback*')
     typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyRxEndOkCallback&')
@@ -501,20 +547,66 @@
     register_types_ns3_FatalImpl(nested_module)
     
     
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
+    
     ## Register a nested module for the namespace addressUtils
     
     nested_module = module.add_cpp_namespace('addressUtils')
     register_types_ns3_addressUtils(nested_module)
     
+    
+    ## Register a nested module for the namespace internal
+    
+    nested_module = module.add_cpp_namespace('internal')
+    register_types_ns3_internal(nested_module)
+    
 
 def register_types_ns3_FatalImpl(module):
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_types_ns3_addressUtils(module):
     root_module = module.get_root()
     
 
+def register_types_ns3_internal(module):
+    root_module = module.get_root()
+    
+
 def register_methods(root_module):
     register_Ns3Address_methods(root_module, root_module['ns3::Address'])
     register_Ns3ApplicationContainer_methods(root_module, root_module['ns3::ApplicationContainer'])
@@ -536,13 +628,16 @@
     register_Ns3ChannelList_methods(root_module, root_module['ns3::ChannelList'])
     register_Ns3DataOutputCallback_methods(root_module, root_module['ns3::DataOutputCallback'])
     register_Ns3DataRate_methods(root_module, root_module['ns3::DataRate'])
+    register_Ns3DelayJitterEstimation_methods(root_module, root_module['ns3::DelayJitterEstimation'])
     register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3Inet6SocketAddress_methods(root_module, root_module['ns3::Inet6SocketAddress'])
     register_Ns3InetSocketAddress_methods(root_module, root_module['ns3::InetSocketAddress'])
     register_Ns3Ipv4Address_methods(root_module, root_module['ns3::Ipv4Address'])
     register_Ns3Ipv4Mask_methods(root_module, root_module['ns3::Ipv4Mask'])
     register_Ns3Ipv6Address_methods(root_module, root_module['ns3::Ipv6Address'])
     register_Ns3Ipv6Prefix_methods(root_module, root_module['ns3::Ipv6Prefix'])
+    register_Ns3Mac16Address_methods(root_module, root_module['ns3::Mac16Address'])
     register_Ns3Mac48Address_methods(root_module, root_module['ns3::Mac48Address'])
     register_Ns3Mac64Address_methods(root_module, root_module['ns3::Mac64Address'])
     register_Ns3NetDeviceContainer_methods(root_module, root_module['ns3::NetDeviceContainer'])
@@ -569,6 +664,7 @@
     register_Ns3PcapHelper_methods(root_module, root_module['ns3::PcapHelper'])
     register_Ns3PcapHelperForDevice_methods(root_module, root_module['ns3::PcapHelperForDevice'])
     register_Ns3Ping6Helper_methods(root_module, root_module['ns3::Ping6Helper'])
+    register_Ns3RadvdHelper_methods(root_module, root_module['ns3::RadvdHelper'])
     register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >'])
     register_Ns3Simulator_methods(root_module, root_module['ns3::Simulator'])
     register_Ns3StatisticalSummary_methods(root_module, root_module['ns3::StatisticalSummary'])
@@ -608,6 +704,7 @@
     register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
     register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
     register_Ns3SimpleRefCount__Ns3OutputStreamWrapper_Ns3Empty_Ns3DefaultDeleter__lt__ns3OutputStreamWrapper__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> >'])
     register_Ns3SimpleRefCount__Ns3Packet_Ns3Empty_Ns3DefaultDeleter__lt__ns3Packet__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
@@ -647,13 +744,17 @@
     register_Ns3Channel_methods(root_module, root_module['ns3::Channel'])
     register_Ns3ConstantRandomVariable_methods(root_module, root_module['ns3::ConstantRandomVariable'])
     register_Ns3DataCalculator_methods(root_module, root_module['ns3::DataCalculator'])
+    register_Ns3DataCollectionObject_methods(root_module, root_module['ns3::DataCollectionObject'])
     register_Ns3DataOutputInterface_methods(root_module, root_module['ns3::DataOutputInterface'])
     register_Ns3DataRateChecker_methods(root_module, root_module['ns3::DataRateChecker'])
     register_Ns3DataRateValue_methods(root_module, root_module['ns3::DataRateValue'])
     register_Ns3DeterministicRandomVariable_methods(root_module, root_module['ns3::DeterministicRandomVariable'])
+    register_Ns3DoubleValue_methods(root_module, root_module['ns3::DoubleValue'])
     register_Ns3DropTailQueue_methods(root_module, root_module['ns3::DropTailQueue'])
     register_Ns3EmpiricalRandomVariable_methods(root_module, root_module['ns3::EmpiricalRandomVariable'])
     register_Ns3EmptyAttributeValue_methods(root_module, root_module['ns3::EmptyAttributeValue'])
+    register_Ns3EnumChecker_methods(root_module, root_module['ns3::EnumChecker'])
+    register_Ns3EnumValue_methods(root_module, root_module['ns3::EnumValue'])
     register_Ns3ErlangRandomVariable_methods(root_module, root_module['ns3::ErlangRandomVariable'])
     register_Ns3ErrorModel_methods(root_module, root_module['ns3::ErrorModel'])
     register_Ns3EthernetHeader_methods(root_module, root_module['ns3::EthernetHeader'])
@@ -661,6 +762,7 @@
     register_Ns3EventImpl_methods(root_module, root_module['ns3::EventImpl'])
     register_Ns3ExponentialRandomVariable_methods(root_module, root_module['ns3::ExponentialRandomVariable'])
     register_Ns3GammaRandomVariable_methods(root_module, root_module['ns3::GammaRandomVariable'])
+    register_Ns3IntegerValue_methods(root_module, root_module['ns3::IntegerValue'])
     register_Ns3Ipv4AddressChecker_methods(root_module, root_module['ns3::Ipv4AddressChecker'])
     register_Ns3Ipv4AddressValue_methods(root_module, root_module['ns3::Ipv4AddressValue'])
     register_Ns3Ipv4MaskChecker_methods(root_module, root_module['ns3::Ipv4MaskChecker'])
@@ -671,9 +773,14 @@
     register_Ns3Ipv6PrefixValue_methods(root_module, root_module['ns3::Ipv6PrefixValue'])
     register_Ns3ListErrorModel_methods(root_module, root_module['ns3::ListErrorModel'])
     register_Ns3LogNormalRandomVariable_methods(root_module, root_module['ns3::LogNormalRandomVariable'])
+    register_Ns3Mac16AddressChecker_methods(root_module, root_module['ns3::Mac16AddressChecker'])
+    register_Ns3Mac16AddressValue_methods(root_module, root_module['ns3::Mac16AddressValue'])
     register_Ns3Mac48AddressChecker_methods(root_module, root_module['ns3::Mac48AddressChecker'])
     register_Ns3Mac48AddressValue_methods(root_module, root_module['ns3::Mac48AddressValue'])
+    register_Ns3Mac64AddressChecker_methods(root_module, root_module['ns3::Mac64AddressChecker'])
+    register_Ns3Mac64AddressValue_methods(root_module, root_module['ns3::Mac64AddressValue'])
     register_Ns3MinMaxAvgTotalCalculator__Double_methods(root_module, root_module['ns3::MinMaxAvgTotalCalculator< double >'])
+    register_Ns3MinMaxAvgTotalCalculator__Unsigned_int_methods(root_module, root_module['ns3::MinMaxAvgTotalCalculator< unsigned int >'])
     register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice'])
     register_Ns3NixVector_methods(root_module, root_module['ns3::NixVector'])
     register_Ns3Node_methods(root_module, root_module['ns3::Node'])
@@ -684,6 +791,7 @@
     register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper'])
     register_Ns3Packet_methods(root_module, root_module['ns3::Packet'])
     register_Ns3PacketSink_methods(root_module, root_module['ns3::PacketSink'])
+    register_Ns3PacketSizeMinMaxAvgTotalCalculator_methods(root_module, root_module['ns3::PacketSizeMinMaxAvgTotalCalculator'])
     register_Ns3PacketSocket_methods(root_module, root_module['ns3::PacketSocket'])
     register_Ns3PacketSocketFactory_methods(root_module, root_module['ns3::PacketSocketFactory'])
     register_Ns3ParetoRandomVariable_methods(root_module, root_module['ns3::ParetoRandomVariable'])
@@ -696,6 +804,7 @@
     register_Ns3PbbPacket_methods(root_module, root_module['ns3::PbbPacket'])
     register_Ns3PbbTlv_methods(root_module, root_module['ns3::PbbTlv'])
     register_Ns3Ping6_methods(root_module, root_module['ns3::Ping6'])
+    register_Ns3Probe_methods(root_module, root_module['ns3::Probe'])
     register_Ns3Radvd_methods(root_module, root_module['ns3::Radvd'])
     register_Ns3RadvdInterface_methods(root_module, root_module['ns3::RadvdInterface'])
     register_Ns3RadvdPrefix_methods(root_module, root_module['ns3::RadvdPrefix'])
@@ -703,7 +812,6 @@
     register_Ns3ReceiveListErrorModel_methods(root_module, root_module['ns3::ReceiveListErrorModel'])
     register_Ns3SimpleChannel_methods(root_module, root_module['ns3::SimpleChannel'])
     register_Ns3SimpleNetDevice_methods(root_module, root_module['ns3::SimpleNetDevice'])
-    register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
     register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
@@ -712,11 +820,21 @@
     register_Ns3UdpEchoServer_methods(root_module, root_module['ns3::UdpEchoServer'])
     register_Ns3UdpServer_methods(root_module, root_module['ns3::UdpServer'])
     register_Ns3UdpTraceClient_methods(root_module, root_module['ns3::UdpTraceClient'])
+    register_Ns3UintegerValue_methods(root_module, root_module['ns3::UintegerValue'])
     register_Ns3V4Ping_methods(root_module, root_module['ns3::V4Ping'])
     register_Ns3AddressChecker_methods(root_module, root_module['ns3::AddressChecker'])
     register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue'])
+    register_Ns3ApplicationPacketProbe_methods(root_module, root_module['ns3::ApplicationPacketProbe'])
     register_Ns3BurstErrorModel_methods(root_module, root_module['ns3::BurstErrorModel'])
+    register_Ns3CounterCalculator__Unsigned_int_methods(root_module, root_module['ns3::CounterCalculator< unsigned int >'])
+    register_Ns3PacketCounterCalculator_methods(root_module, root_module['ns3::PacketCounterCalculator'])
+    register_Ns3PacketProbe_methods(root_module, root_module['ns3::PacketProbe'])
     register_Ns3PbbAddressTlv_methods(root_module, root_module['ns3::PbbAddressTlv'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     return
 
 def register_Ns3Address_methods(root_module, cls):
@@ -881,42 +999,42 @@
     cls.add_method('CreateFileStream', 
                    'ns3::Ptr< ns3::OutputStreamWrapper >', 
                    [param('std::string', 'filename'), param('std::_Ios_Openmode', 'filemode', default_value='std::ios_base::out')])
-    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('DefaultDequeueSinkWithContext', 
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
                    is_static=True)
-    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('DefaultDequeueSinkWithoutContext', 
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
                    is_static=True)
-    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDropSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDropSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('DefaultDropSinkWithContext', 
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
                    is_static=True)
-    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDropSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDropSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('DefaultDropSinkWithoutContext', 
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
                    is_static=True)
-    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultEnqueueSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultEnqueueSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('DefaultEnqueueSinkWithContext', 
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
                    is_static=True)
-    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultEnqueueSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultEnqueueSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('DefaultEnqueueSinkWithoutContext', 
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
                    is_static=True)
-    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultReceiveSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultReceiveSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('DefaultReceiveSinkWithContext', 
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
                    is_static=True)
-    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultReceiveSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultReceiveSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('DefaultReceiveSinkWithoutContext', 
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
@@ -1031,64 +1149,64 @@
     return
 
 def register_Ns3Average__Double_methods(root_module, cls):
-    ## average.h (module 'tools'): ns3::Average<double>::Average(ns3::Average<double> const & arg0) [copy constructor]
+    ## average.h (module 'stats'): ns3::Average<double>::Average(ns3::Average<double> const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::Average< double > const &', 'arg0')])
-    ## average.h (module 'tools'): ns3::Average<double>::Average() [constructor]
+    ## average.h (module 'stats'): ns3::Average<double>::Average() [constructor]
     cls.add_constructor([])
-    ## average.h (module 'tools'): double ns3::Average<double>::Avg() const [member function]
+    ## average.h (module 'stats'): double ns3::Average<double>::Avg() const [member function]
     cls.add_method('Avg', 
                    'double', 
                    [], 
                    is_const=True)
-    ## average.h (module 'tools'): uint32_t ns3::Average<double>::Count() const [member function]
+    ## average.h (module 'stats'): uint32_t ns3::Average<double>::Count() const [member function]
     cls.add_method('Count', 
                    'uint32_t', 
                    [], 
                    is_const=True)
-    ## average.h (module 'tools'): double ns3::Average<double>::Error90() const [member function]
+    ## average.h (module 'stats'): double ns3::Average<double>::Error90() const [member function]
     cls.add_method('Error90', 
                    'double', 
                    [], 
                    is_const=True)
-    ## average.h (module 'tools'): double ns3::Average<double>::Error95() const [member function]
+    ## average.h (module 'stats'): double ns3::Average<double>::Error95() const [member function]
     cls.add_method('Error95', 
                    'double', 
                    [], 
                    is_const=True)
-    ## average.h (module 'tools'): double ns3::Average<double>::Error99() const [member function]
+    ## average.h (module 'stats'): double ns3::Average<double>::Error99() const [member function]
     cls.add_method('Error99', 
                    'double', 
                    [], 
                    is_const=True)
-    ## average.h (module 'tools'): double ns3::Average<double>::Max() const [member function]
+    ## average.h (module 'stats'): double ns3::Average<double>::Max() const [member function]
     cls.add_method('Max', 
                    'double', 
                    [], 
                    is_const=True)
-    ## average.h (module 'tools'): double ns3::Average<double>::Mean() const [member function]
+    ## average.h (module 'stats'): double ns3::Average<double>::Mean() const [member function]
     cls.add_method('Mean', 
                    'double', 
                    [], 
                    is_const=True)
-    ## average.h (module 'tools'): double ns3::Average<double>::Min() const [member function]
+    ## average.h (module 'stats'): double ns3::Average<double>::Min() const [member function]
     cls.add_method('Min', 
                    'double', 
                    [], 
                    is_const=True)
-    ## average.h (module 'tools'): void ns3::Average<double>::Reset() [member function]
+    ## average.h (module 'stats'): void ns3::Average<double>::Reset() [member function]
     cls.add_method('Reset', 
                    'void', 
                    [])
-    ## average.h (module 'tools'): double ns3::Average<double>::Stddev() const [member function]
+    ## average.h (module 'stats'): double ns3::Average<double>::Stddev() const [member function]
     cls.add_method('Stddev', 
                    'double', 
                    [], 
                    is_const=True)
-    ## average.h (module 'tools'): void ns3::Average<double>::Update(double const & x) [member function]
+    ## average.h (module 'stats'): void ns3::Average<double>::Update(double const & x) [member function]
     cls.add_method('Update', 
                    'void', 
                    [param('double const &', 'x')])
-    ## average.h (module 'tools'): double ns3::Average<double>::Var() const [member function]
+    ## average.h (module 'stats'): double ns3::Average<double>::Var() const [member function]
     cls.add_method('Var', 
                    'double', 
                    [], 
@@ -1587,6 +1705,32 @@
                    is_const=True)
     return
 
+def register_Ns3DelayJitterEstimation_methods(root_module, cls):
+    ## delay-jitter-estimation.h (module 'network'): ns3::DelayJitterEstimation::DelayJitterEstimation(ns3::DelayJitterEstimation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::DelayJitterEstimation const &', 'arg0')])
+    ## delay-jitter-estimation.h (module 'network'): ns3::DelayJitterEstimation::DelayJitterEstimation() [constructor]
+    cls.add_constructor([])
+    ## delay-jitter-estimation.h (module 'network'): ns3::Time ns3::DelayJitterEstimation::GetLastDelay() const [member function]
+    cls.add_method('GetLastDelay', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## delay-jitter-estimation.h (module 'network'): uint64_t ns3::DelayJitterEstimation::GetLastJitter() const [member function]
+    cls.add_method('GetLastJitter', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## delay-jitter-estimation.h (module 'network'): static void ns3::DelayJitterEstimation::PrepareTx(ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('PrepareTx', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')], 
+                   is_static=True)
+    ## delay-jitter-estimation.h (module 'network'): void ns3::DelayJitterEstimation::RecordRx(ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('RecordRx', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    return
+
 def register_Ns3EventId_methods(root_module, cls):
     cls.add_binary_comparison_operator('!=')
     cls.add_binary_comparison_operator('==')
@@ -1632,6 +1776,35 @@
                    is_const=True)
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3Inet6SocketAddress_methods(root_module, cls):
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress::Inet6SocketAddress(ns3::Inet6SocketAddress const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::Inet6SocketAddress const &', 'arg0')])
@@ -1983,6 +2156,11 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
     cls.add_method('IsEqual', 
                    'bool', 
@@ -2022,16 +2200,36 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
     cls.add_method('MakeAutoconfiguredAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
     cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'mac')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
     cls.add_method('MakeIpv4MappedAddress', 
                    'ns3::Ipv6Address', 
@@ -2120,6 +2318,43 @@
                    is_const=True)
     return
 
+def register_Ns3Mac16Address_methods(root_module, cls):
+    cls.add_binary_comparison_operator('!=')
+    cls.add_binary_comparison_operator('<')
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    ## mac16-address.h (module 'network'): ns3::Mac16Address::Mac16Address(ns3::Mac16Address const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Mac16Address const &', 'arg0')])
+    ## mac16-address.h (module 'network'): ns3::Mac16Address::Mac16Address() [constructor]
+    cls.add_constructor([])
+    ## mac16-address.h (module 'network'): ns3::Mac16Address::Mac16Address(char const * str) [constructor]
+    cls.add_constructor([param('char const *', 'str')])
+    ## mac16-address.h (module 'network'): static ns3::Mac16Address ns3::Mac16Address::Allocate() [member function]
+    cls.add_method('Allocate', 
+                   'ns3::Mac16Address', 
+                   [], 
+                   is_static=True)
+    ## mac16-address.h (module 'network'): static ns3::Mac16Address ns3::Mac16Address::ConvertFrom(ns3::Address const & address) [member function]
+    cls.add_method('ConvertFrom', 
+                   'ns3::Mac16Address', 
+                   [param('ns3::Address const &', 'address')], 
+                   is_static=True)
+    ## mac16-address.h (module 'network'): void ns3::Mac16Address::CopyFrom(uint8_t const * buffer) [member function]
+    cls.add_method('CopyFrom', 
+                   'void', 
+                   [param('uint8_t const *', 'buffer')])
+    ## mac16-address.h (module 'network'): void ns3::Mac16Address::CopyTo(uint8_t * buffer) const [member function]
+    cls.add_method('CopyTo', 
+                   'void', 
+                   [param('uint8_t *', 'buffer')], 
+                   is_const=True)
+    ## mac16-address.h (module 'network'): static bool ns3::Mac16Address::IsMatchingType(ns3::Address const & address) [member function]
+    cls.add_method('IsMatchingType', 
+                   'bool', 
+                   [param('ns3::Address const &', 'address')], 
+                   is_static=True)
+    return
+
 def register_Ns3Mac48Address_methods(root_module, cls):
     cls.add_binary_comparison_operator('!=')
     cls.add_binary_comparison_operator('<')
@@ -2194,6 +2429,7 @@
 
 def register_Ns3Mac64Address_methods(root_module, cls):
     cls.add_binary_comparison_operator('!=')
+    cls.add_binary_comparison_operator('<')
     cls.add_output_stream_operator()
     cls.add_binary_comparison_operator('==')
     ## mac64-address.h (module 'network'): ns3::Mac64Address::Mac64Address(ns3::Mac64Address const & arg0) [copy constructor]
@@ -2808,6 +3044,10 @@
     cls.add_method('RemoveAll', 
                    'void', 
                    [])
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function]
+    cls.add_method('Replace', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     return
 
 def register_Ns3PacketTagListTagData_methods(root_module, cls):
@@ -3105,11 +3345,11 @@
     cls.add_method('Write', 
                    'void', 
                    [param('uint32_t', 'tsSec'), param('uint32_t', 'tsUsec'), param('uint8_t const * const', 'data'), param('uint32_t', 'totalLen')])
-    ## pcap-file.h (module 'network'): void ns3::PcapFile::Write(uint32_t tsSec, uint32_t tsUsec, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## pcap-file.h (module 'network'): void ns3::PcapFile::Write(uint32_t tsSec, uint32_t tsUsec, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('Write', 
                    'void', 
                    [param('uint32_t', 'tsSec'), param('uint32_t', 'tsUsec'), param('ns3::Ptr< ns3::Packet const >', 'p')])
-    ## pcap-file.h (module 'network'): void ns3::PcapFile::Write(uint32_t tsSec, uint32_t tsUsec, ns3::Header & header, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## pcap-file.h (module 'network'): void ns3::PcapFile::Write(uint32_t tsSec, uint32_t tsUsec, ns3::Header & header, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('Write', 
                    'void', 
                    [param('uint32_t', 'tsSec'), param('uint32_t', 'tsUsec'), param('ns3::Header &', 'header'), param('ns3::Ptr< ns3::Packet const >', 'p')])
@@ -3205,6 +3445,41 @@
                    [param('std::vector< ns3::Ipv6Address >', 'routers')])
     return
 
+def register_Ns3RadvdHelper_methods(root_module, cls):
+    ## radvd-helper.h (module 'applications'): ns3::RadvdHelper::RadvdHelper(ns3::RadvdHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::RadvdHelper const &', 'arg0')])
+    ## radvd-helper.h (module 'applications'): ns3::RadvdHelper::RadvdHelper() [constructor]
+    cls.add_constructor([])
+    ## radvd-helper.h (module 'applications'): void ns3::RadvdHelper::AddAnnouncedPrefix(uint32_t interface, ns3::Ipv6Address prefix, uint32_t prefixLength) [member function]
+    cls.add_method('AddAnnouncedPrefix', 
+                   'void', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv6Address', 'prefix'), param('uint32_t', 'prefixLength')])
+    ## radvd-helper.h (module 'applications'): void ns3::RadvdHelper::ClearPrefixes() [member function]
+    cls.add_method('ClearPrefixes', 
+                   'void', 
+                   [])
+    ## radvd-helper.h (module 'applications'): void ns3::RadvdHelper::DisableDefaultRouterForInterface(uint32_t interface) [member function]
+    cls.add_method('DisableDefaultRouterForInterface', 
+                   'void', 
+                   [param('uint32_t', 'interface')])
+    ## radvd-helper.h (module 'applications'): void ns3::RadvdHelper::EnableDefaultRouterForInterface(uint32_t interface) [member function]
+    cls.add_method('EnableDefaultRouterForInterface', 
+                   'void', 
+                   [param('uint32_t', 'interface')])
+    ## radvd-helper.h (module 'applications'): ns3::Ptr<ns3::RadvdInterface> ns3::RadvdHelper::GetRadvdInterface(uint32_t interface) [member function]
+    cls.add_method('GetRadvdInterface', 
+                   'ns3::Ptr< ns3::RadvdInterface >', 
+                   [param('uint32_t', 'interface')])
+    ## radvd-helper.h (module 'applications'): ns3::ApplicationContainer ns3::RadvdHelper::Install(ns3::Ptr<ns3::Node> node) [member function]
+    cls.add_method('Install', 
+                   'ns3::ApplicationContainer', 
+                   [param('ns3::Ptr< ns3::Node >', 'node')])
+    ## radvd-helper.h (module 'applications'): void ns3::RadvdHelper::SetAttribute(std::string name, ns3::AttributeValue const & value) [member function]
+    cls.add_method('SetAttribute', 
+                   'void', 
+                   [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')])
+    return
+
 def register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter>::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -3517,6 +3792,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -3576,6 +3856,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -4319,11 +4609,11 @@
     cls.add_method('Init', 
                    'void', 
                    [param('uint32_t', 'dataLinkType'), param('uint32_t', 'snapLen', default_value='std::numeric_limits<unsigned int>::max()'), param('int32_t', 'tzCorrection', default_value='ns3::PcapFile::ZONE_DEFAULT')])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::Write(ns3::Time t, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::Write(ns3::Time t, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('Write', 
                    'void', 
                    [param('ns3::Time', 't'), param('ns3::Ptr< ns3::Packet const >', 'p')])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::Write(ns3::Time t, ns3::Header & header, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::Write(ns3::Time t, ns3::Header & header, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('Write', 
                    'void', 
                    [param('ns3::Time', 't'), param('ns3::Header &', 'header'), param('ns3::Ptr< ns3::Packet const >', 'p')])
@@ -4418,7 +4708,7 @@
                    'bool', 
                    [], 
                    is_const=True)
-    ## queue.h (module 'network'): ns3::Ptr<const ns3::Packet> ns3::Queue::Peek() const [member function]
+    ## queue.h (module 'network'): ns3::Ptr<ns3::Packet const> ns3::Queue::Peek() const [member function]
     cls.add_method('Peek', 
                    'ns3::Ptr< ns3::Packet const >', 
                    [], 
@@ -4442,7 +4732,7 @@
                    'bool', 
                    [param('ns3::Ptr< ns3::Packet >', 'p')], 
                    is_pure_virtual=True, visibility='private', is_virtual=True)
-    ## queue.h (module 'network'): ns3::Ptr<const ns3::Packet> ns3::Queue::DoPeek() const [member function]
+    ## queue.h (module 'network'): ns3::Ptr<ns3::Packet const> ns3::Queue::DoPeek() const [member function]
     cls.add_method('DoPeek', 
                    'ns3::Ptr< ns3::Packet const >', 
                    [], 
@@ -4636,7 +4926,7 @@
                    'bool', 
                    [param('ns3::Ptr< ns3::Packet >', 'p')], 
                    visibility='private', is_virtual=True)
-    ## red-queue.h (module 'network'): ns3::Ptr<const ns3::Packet> ns3::RedQueue::DoPeek() const [member function]
+    ## red-queue.h (module 'network'): ns3::Ptr<ns3::Packet const> ns3::RedQueue::DoPeek() const [member function]
     cls.add_method('DoPeek', 
                    'ns3::Ptr< ns3::Packet const >', 
                    [], 
@@ -4807,6 +5097,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -5689,11 +5991,26 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
     cls.add_method('SetResolution', 
                    'void', 
                    [param('ns3::Time::Unit', 'resolution')], 
                    is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
     cls.add_method('To', 
                    'ns3::int64x64_t', 
@@ -6348,6 +6665,40 @@
                    visibility='protected', is_virtual=True)
     return
 
+def register_Ns3DataCollectionObject_methods(root_module, cls):
+    ## data-collection-object.h (module 'stats'): ns3::DataCollectionObject::DataCollectionObject(ns3::DataCollectionObject const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::DataCollectionObject const &', 'arg0')])
+    ## data-collection-object.h (module 'stats'): ns3::DataCollectionObject::DataCollectionObject() [constructor]
+    cls.add_constructor([])
+    ## data-collection-object.h (module 'stats'): void ns3::DataCollectionObject::Disable() [member function]
+    cls.add_method('Disable', 
+                   'void', 
+                   [])
+    ## data-collection-object.h (module 'stats'): void ns3::DataCollectionObject::Enable() [member function]
+    cls.add_method('Enable', 
+                   'void', 
+                   [])
+    ## data-collection-object.h (module 'stats'): std::string ns3::DataCollectionObject::GetName() const [member function]
+    cls.add_method('GetName', 
+                   'std::string', 
+                   [], 
+                   is_const=True)
+    ## data-collection-object.h (module 'stats'): static ns3::TypeId ns3::DataCollectionObject::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## data-collection-object.h (module 'stats'): bool ns3::DataCollectionObject::IsEnabled() const [member function]
+    cls.add_method('IsEnabled', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## data-collection-object.h (module 'stats'): void ns3::DataCollectionObject::SetName(std::string name) [member function]
+    cls.add_method('SetName', 
+                   'void', 
+                   [param('std::string', 'name')])
+    return
+
 def register_Ns3DataOutputInterface_methods(root_module, cls):
     ## data-output-interface.h (module 'stats'): ns3::DataOutputInterface::DataOutputInterface(ns3::DataOutputInterface const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::DataOutputInterface const &', 'arg0')])
@@ -6438,6 +6789,39 @@
                    is_virtual=True)
     return
 
+def register_Ns3DoubleValue_methods(root_module, cls):
+    ## double.h (module 'core'): ns3::DoubleValue::DoubleValue() [constructor]
+    cls.add_constructor([])
+    ## double.h (module 'core'): ns3::DoubleValue::DoubleValue(ns3::DoubleValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::DoubleValue const &', 'arg0')])
+    ## double.h (module 'core'): ns3::DoubleValue::DoubleValue(double const & value) [constructor]
+    cls.add_constructor([param('double const &', 'value')])
+    ## double.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::DoubleValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## double.h (module 'core'): bool ns3::DoubleValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## double.h (module 'core'): double ns3::DoubleValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## double.h (module 'core'): std::string ns3::DoubleValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## double.h (module 'core'): void ns3::DoubleValue::Set(double const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('double const &', 'value')])
+    return
+
 def register_Ns3DropTailQueue_methods(root_module, cls):
     ## drop-tail-queue.h (module 'network'): ns3::DropTailQueue::DropTailQueue(ns3::DropTailQueue const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::DropTailQueue const &', 'arg0')])
@@ -6466,7 +6850,7 @@
                    'bool', 
                    [param('ns3::Ptr< ns3::Packet >', 'p')], 
                    visibility='private', is_virtual=True)
-    ## drop-tail-queue.h (module 'network'): ns3::Ptr<const ns3::Packet> ns3::DropTailQueue::DoPeek() const [member function]
+    ## drop-tail-queue.h (module 'network'): ns3::Ptr<ns3::Packet const> ns3::DropTailQueue::DoPeek() const [member function]
     cls.add_method('DoPeek', 
                    'ns3::Ptr< ns3::Packet const >', 
                    [], 
@@ -6529,6 +6913,84 @@
                    is_const=True, visibility='private', is_virtual=True)
     return
 
+def register_Ns3EnumChecker_methods(root_module, cls):
+    ## enum.h (module 'core'): ns3::EnumChecker::EnumChecker(ns3::EnumChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::EnumChecker const &', 'arg0')])
+    ## enum.h (module 'core'): ns3::EnumChecker::EnumChecker() [constructor]
+    cls.add_constructor([])
+    ## enum.h (module 'core'): void ns3::EnumChecker::Add(int v, std::string name) [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('int', 'v'), param('std::string', 'name')])
+    ## enum.h (module 'core'): void ns3::EnumChecker::AddDefault(int v, std::string name) [member function]
+    cls.add_method('AddDefault', 
+                   'void', 
+                   [param('int', 'v'), param('std::string', 'name')])
+    ## enum.h (module 'core'): bool ns3::EnumChecker::Check(ns3::AttributeValue const & value) const [member function]
+    cls.add_method('Check', 
+                   'bool', 
+                   [param('ns3::AttributeValue const &', 'value')], 
+                   is_const=True, is_virtual=True)
+    ## enum.h (module 'core'): bool ns3::EnumChecker::Copy(ns3::AttributeValue const & src, ns3::AttributeValue & dst) const [member function]
+    cls.add_method('Copy', 
+                   'bool', 
+                   [param('ns3::AttributeValue const &', 'src'), param('ns3::AttributeValue &', 'dst')], 
+                   is_const=True, is_virtual=True)
+    ## enum.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::EnumChecker::Create() const [member function]
+    cls.add_method('Create', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## enum.h (module 'core'): std::string ns3::EnumChecker::GetUnderlyingTypeInformation() const [member function]
+    cls.add_method('GetUnderlyingTypeInformation', 
+                   'std::string', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## enum.h (module 'core'): std::string ns3::EnumChecker::GetValueTypeName() const [member function]
+    cls.add_method('GetValueTypeName', 
+                   'std::string', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## enum.h (module 'core'): bool ns3::EnumChecker::HasUnderlyingTypeInformation() const [member function]
+    cls.add_method('HasUnderlyingTypeInformation', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    return
+
+def register_Ns3EnumValue_methods(root_module, cls):
+    ## enum.h (module 'core'): ns3::EnumValue::EnumValue(ns3::EnumValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::EnumValue const &', 'arg0')])
+    ## enum.h (module 'core'): ns3::EnumValue::EnumValue() [constructor]
+    cls.add_constructor([])
+    ## enum.h (module 'core'): ns3::EnumValue::EnumValue(int v) [constructor]
+    cls.add_constructor([param('int', 'v')])
+    ## enum.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::EnumValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## enum.h (module 'core'): bool ns3::EnumValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## enum.h (module 'core'): int ns3::EnumValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'int', 
+                   [], 
+                   is_const=True)
+    ## enum.h (module 'core'): std::string ns3::EnumValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## enum.h (module 'core'): void ns3::EnumValue::Set(int v) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('int', 'v')])
+    return
+
 def register_Ns3ErlangRandomVariable_methods(root_module, cls):
     ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::ErlangRandomVariable::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
@@ -6700,11 +7162,11 @@
     cls.add_constructor([param('ns3::EthernetTrailer const &', 'arg0')])
     ## ethernet-trailer.h (module 'network'): ns3::EthernetTrailer::EthernetTrailer() [constructor]
     cls.add_constructor([])
-    ## ethernet-trailer.h (module 'network'): void ns3::EthernetTrailer::CalcFcs(ns3::Ptr<const ns3::Packet> p) [member function]
+    ## ethernet-trailer.h (module 'network'): void ns3::EthernetTrailer::CalcFcs(ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('CalcFcs', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet const >', 'p')])
-    ## ethernet-trailer.h (module 'network'): bool ns3::EthernetTrailer::CheckFcs(ns3::Ptr<const ns3::Packet> p) const [member function]
+    ## ethernet-trailer.h (module 'network'): bool ns3::EthernetTrailer::CheckFcs(ns3::Ptr<ns3::Packet const> p) const [member function]
     cls.add_method('CheckFcs', 
                    'bool', 
                    [param('ns3::Ptr< ns3::Packet const >', 'p')], 
@@ -6858,6 +7320,39 @@
                    is_virtual=True)
     return
 
+def register_Ns3IntegerValue_methods(root_module, cls):
+    ## integer.h (module 'core'): ns3::IntegerValue::IntegerValue() [constructor]
+    cls.add_constructor([])
+    ## integer.h (module 'core'): ns3::IntegerValue::IntegerValue(ns3::IntegerValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::IntegerValue const &', 'arg0')])
+    ## integer.h (module 'core'): ns3::IntegerValue::IntegerValue(int64_t const & value) [constructor]
+    cls.add_constructor([param('int64_t const &', 'value')])
+    ## integer.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::IntegerValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## integer.h (module 'core'): bool ns3::IntegerValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## integer.h (module 'core'): int64_t ns3::IntegerValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## integer.h (module 'core'): std::string ns3::IntegerValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## integer.h (module 'core'): void ns3::IntegerValue::Set(int64_t const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('int64_t const &', 'value')])
+    return
+
 def register_Ns3Ipv4AddressChecker_methods(root_module, cls):
     ## ipv4-address.h (module 'network'): ns3::Ipv4AddressChecker::Ipv4AddressChecker() [constructor]
     cls.add_constructor([])
@@ -7087,6 +7582,46 @@
                    is_virtual=True)
     return
 
+def register_Ns3Mac16AddressChecker_methods(root_module, cls):
+    ## mac16-address.h (module 'network'): ns3::Mac16AddressChecker::Mac16AddressChecker() [constructor]
+    cls.add_constructor([])
+    ## mac16-address.h (module 'network'): ns3::Mac16AddressChecker::Mac16AddressChecker(ns3::Mac16AddressChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Mac16AddressChecker const &', 'arg0')])
+    return
+
+def register_Ns3Mac16AddressValue_methods(root_module, cls):
+    ## mac16-address.h (module 'network'): ns3::Mac16AddressValue::Mac16AddressValue() [constructor]
+    cls.add_constructor([])
+    ## mac16-address.h (module 'network'): ns3::Mac16AddressValue::Mac16AddressValue(ns3::Mac16AddressValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Mac16AddressValue const &', 'arg0')])
+    ## mac16-address.h (module 'network'): ns3::Mac16AddressValue::Mac16AddressValue(ns3::Mac16Address const & value) [constructor]
+    cls.add_constructor([param('ns3::Mac16Address const &', 'value')])
+    ## mac16-address.h (module 'network'): ns3::Ptr<ns3::AttributeValue> ns3::Mac16AddressValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mac16-address.h (module 'network'): bool ns3::Mac16AddressValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## mac16-address.h (module 'network'): ns3::Mac16Address ns3::Mac16AddressValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::Mac16Address', 
+                   [], 
+                   is_const=True)
+    ## mac16-address.h (module 'network'): std::string ns3::Mac16AddressValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## mac16-address.h (module 'network'): void ns3::Mac16AddressValue::Set(ns3::Mac16Address const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::Mac16Address const &', 'value')])
+    return
+
 def register_Ns3Mac48AddressChecker_methods(root_module, cls):
     ## mac48-address.h (module 'network'): ns3::Mac48AddressChecker::Mac48AddressChecker() [constructor]
     cls.add_constructor([])
@@ -7127,6 +7662,46 @@
                    [param('ns3::Mac48Address const &', 'value')])
     return
 
+def register_Ns3Mac64AddressChecker_methods(root_module, cls):
+    ## mac64-address.h (module 'network'): ns3::Mac64AddressChecker::Mac64AddressChecker() [constructor]
+    cls.add_constructor([])
+    ## mac64-address.h (module 'network'): ns3::Mac64AddressChecker::Mac64AddressChecker(ns3::Mac64AddressChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Mac64AddressChecker const &', 'arg0')])
+    return
+
+def register_Ns3Mac64AddressValue_methods(root_module, cls):
+    ## mac64-address.h (module 'network'): ns3::Mac64AddressValue::Mac64AddressValue() [constructor]
+    cls.add_constructor([])
+    ## mac64-address.h (module 'network'): ns3::Mac64AddressValue::Mac64AddressValue(ns3::Mac64AddressValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Mac64AddressValue const &', 'arg0')])
+    ## mac64-address.h (module 'network'): ns3::Mac64AddressValue::Mac64AddressValue(ns3::Mac64Address const & value) [constructor]
+    cls.add_constructor([param('ns3::Mac64Address const &', 'value')])
+    ## mac64-address.h (module 'network'): ns3::Ptr<ns3::AttributeValue> ns3::Mac64AddressValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mac64-address.h (module 'network'): bool ns3::Mac64AddressValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## mac64-address.h (module 'network'): ns3::Mac64Address ns3::Mac64AddressValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::Mac64Address', 
+                   [], 
+                   is_const=True)
+    ## mac64-address.h (module 'network'): std::string ns3::Mac64AddressValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## mac64-address.h (module 'network'): void ns3::Mac64AddressValue::Set(ns3::Mac64Address const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::Mac64Address const &', 'value')])
+    return
+
 def register_Ns3MinMaxAvgTotalCalculator__Double_methods(root_module, cls):
     ## basic-data-calculators.h (module 'stats'): ns3::MinMaxAvgTotalCalculator<double>::MinMaxAvgTotalCalculator(ns3::MinMaxAvgTotalCalculator<double> const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::MinMaxAvgTotalCalculator< double > const &', 'arg0')])
@@ -7192,6 +7767,71 @@
                    visibility='protected', is_virtual=True)
     return
 
+def register_Ns3MinMaxAvgTotalCalculator__Unsigned_int_methods(root_module, cls):
+    ## basic-data-calculators.h (module 'stats'): ns3::MinMaxAvgTotalCalculator<unsigned int>::MinMaxAvgTotalCalculator(ns3::MinMaxAvgTotalCalculator<unsigned int> const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MinMaxAvgTotalCalculator< unsigned int > const &', 'arg0')])
+    ## basic-data-calculators.h (module 'stats'): ns3::MinMaxAvgTotalCalculator<unsigned int>::MinMaxAvgTotalCalculator() [constructor]
+    cls.add_constructor([])
+    ## basic-data-calculators.h (module 'stats'): void ns3::MinMaxAvgTotalCalculator<unsigned int>::Output(ns3::DataOutputCallback & callback) const [member function]
+    cls.add_method('Output', 
+                   'void', 
+                   [param('ns3::DataOutputCallback &', 'callback')], 
+                   is_const=True, is_virtual=True)
+    ## basic-data-calculators.h (module 'stats'): void ns3::MinMaxAvgTotalCalculator<unsigned int>::Reset() [member function]
+    cls.add_method('Reset', 
+                   'void', 
+                   [])
+    ## basic-data-calculators.h (module 'stats'): void ns3::MinMaxAvgTotalCalculator<unsigned int>::Update(unsigned int const i) [member function]
+    cls.add_method('Update', 
+                   'void', 
+                   [param('unsigned int const', 'i')])
+    ## basic-data-calculators.h (module 'stats'): long int ns3::MinMaxAvgTotalCalculator<unsigned int>::getCount() const [member function]
+    cls.add_method('getCount', 
+                   'long int', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## basic-data-calculators.h (module 'stats'): double ns3::MinMaxAvgTotalCalculator<unsigned int>::getMax() const [member function]
+    cls.add_method('getMax', 
+                   'double', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## basic-data-calculators.h (module 'stats'): double ns3::MinMaxAvgTotalCalculator<unsigned int>::getMean() const [member function]
+    cls.add_method('getMean', 
+                   'double', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## basic-data-calculators.h (module 'stats'): double ns3::MinMaxAvgTotalCalculator<unsigned int>::getMin() const [member function]
+    cls.add_method('getMin', 
+                   'double', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## basic-data-calculators.h (module 'stats'): double ns3::MinMaxAvgTotalCalculator<unsigned int>::getSqrSum() const [member function]
+    cls.add_method('getSqrSum', 
+                   'double', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## basic-data-calculators.h (module 'stats'): double ns3::MinMaxAvgTotalCalculator<unsigned int>::getStddev() const [member function]
+    cls.add_method('getStddev', 
+                   'double', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## basic-data-calculators.h (module 'stats'): double ns3::MinMaxAvgTotalCalculator<unsigned int>::getSum() const [member function]
+    cls.add_method('getSum', 
+                   'double', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## basic-data-calculators.h (module 'stats'): double ns3::MinMaxAvgTotalCalculator<unsigned int>::getVariance() const [member function]
+    cls.add_method('getVariance', 
+                   'double', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## basic-data-calculators.h (module 'stats'): void ns3::MinMaxAvgTotalCalculator<unsigned int>::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    return
+
 def register_Ns3NetDevice_methods(root_module, cls):
     ## net-device.h (module 'network'): ns3::NetDevice::NetDevice() [constructor]
     cls.add_constructor([])
@@ -7601,7 +8241,7 @@
     cls.add_constructor([param('uint8_t const *', 'buffer'), param('uint32_t', 'size'), param('bool', 'magic')])
     ## packet.h (module 'network'): ns3::Packet::Packet(uint8_t const * buffer, uint32_t size) [constructor]
     cls.add_constructor([param('uint8_t const *', 'buffer'), param('uint32_t', 'size')])
-    ## packet.h (module 'network'): void ns3::Packet::AddAtEnd(ns3::Ptr<const ns3::Packet> packet) [member function]
+    ## packet.h (module 'network'): void ns3::Packet::AddAtEnd(ns3::Ptr<ns3::Packet const> packet) [member function]
     cls.add_method('AddAtEnd', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet const >', 'packet')])
@@ -7759,6 +8399,10 @@
     cls.add_method('RemoveTrailer', 
                    'uint32_t', 
                    [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('ReplacePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
     cls.add_method('Serialize', 
                    'uint32_t', 
@@ -7812,6 +8456,26 @@
                    visibility='private', is_virtual=True)
     return
 
+def register_Ns3PacketSizeMinMaxAvgTotalCalculator_methods(root_module, cls):
+    ## packet-data-calculators.h (module 'network'): ns3::PacketSizeMinMaxAvgTotalCalculator::PacketSizeMinMaxAvgTotalCalculator(ns3::PacketSizeMinMaxAvgTotalCalculator const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PacketSizeMinMaxAvgTotalCalculator const &', 'arg0')])
+    ## packet-data-calculators.h (module 'network'): ns3::PacketSizeMinMaxAvgTotalCalculator::PacketSizeMinMaxAvgTotalCalculator() [constructor]
+    cls.add_constructor([])
+    ## packet-data-calculators.h (module 'network'): void ns3::PacketSizeMinMaxAvgTotalCalculator::FrameUpdate(std::string path, ns3::Ptr<ns3::Packet const> packet, ns3::Mac48Address realto) [member function]
+    cls.add_method('FrameUpdate', 
+                   'void', 
+                   [param('std::string', 'path'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Mac48Address', 'realto')])
+    ## packet-data-calculators.h (module 'network'): void ns3::PacketSizeMinMaxAvgTotalCalculator::PacketUpdate(std::string path, ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('PacketUpdate', 
+                   'void', 
+                   [param('std::string', 'path'), param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## packet-data-calculators.h (module 'network'): void ns3::PacketSizeMinMaxAvgTotalCalculator::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    return
+
 def register_Ns3PacketSocket_methods(root_module, cls):
     ## packet-socket.h (module 'network'): ns3::PacketSocket::PacketSocket(ns3::PacketSocket const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::PacketSocket const &', 'arg0')])
@@ -9021,6 +9685,33 @@
                    visibility='private', is_virtual=True)
     return
 
+def register_Ns3Probe_methods(root_module, cls):
+    ## probe.h (module 'stats'): ns3::Probe::Probe(ns3::Probe const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Probe const &', 'arg0')])
+    ## probe.h (module 'stats'): ns3::Probe::Probe() [constructor]
+    cls.add_constructor([])
+    ## probe.h (module 'stats'): bool ns3::Probe::ConnectByObject(std::string traceSource, ns3::Ptr<ns3::Object> obj) [member function]
+    cls.add_method('ConnectByObject', 
+                   'bool', 
+                   [param('std::string', 'traceSource'), param('ns3::Ptr< ns3::Object >', 'obj')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## probe.h (module 'stats'): void ns3::Probe::ConnectByPath(std::string path) [member function]
+    cls.add_method('ConnectByPath', 
+                   'void', 
+                   [param('std::string', 'path')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## probe.h (module 'stats'): static ns3::TypeId ns3::Probe::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## probe.h (module 'stats'): bool ns3::Probe::IsEnabled() const [member function]
+    cls.add_method('IsEnabled', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    return
+
 def register_Ns3Radvd_methods(root_module, cls):
     ## radvd.h (module 'applications'): ns3::Radvd::Radvd(ns3::Radvd const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::Radvd const &', 'arg0')])
@@ -9595,13 +10286,6 @@
                    visibility='protected', is_virtual=True)
     return
 
-def register_Ns3TimeChecker_methods(root_module, cls):
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor]
-    cls.add_constructor([])
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')])
-    return
-
 def register_Ns3TimeValue_methods(root_module, cls):
     ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
     cls.add_constructor([])
@@ -9900,6 +10584,39 @@
                    visibility='private', is_virtual=True)
     return
 
+def register_Ns3UintegerValue_methods(root_module, cls):
+    ## uinteger.h (module 'core'): ns3::UintegerValue::UintegerValue() [constructor]
+    cls.add_constructor([])
+    ## uinteger.h (module 'core'): ns3::UintegerValue::UintegerValue(ns3::UintegerValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::UintegerValue const &', 'arg0')])
+    ## uinteger.h (module 'core'): ns3::UintegerValue::UintegerValue(uint64_t const & value) [constructor]
+    cls.add_constructor([param('uint64_t const &', 'value')])
+    ## uinteger.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::UintegerValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## uinteger.h (module 'core'): bool ns3::UintegerValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## uinteger.h (module 'core'): uint64_t ns3::UintegerValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## uinteger.h (module 'core'): std::string ns3::UintegerValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## uinteger.h (module 'core'): void ns3::UintegerValue::Set(uint64_t const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('uint64_t const &', 'value')])
+    return
+
 def register_Ns3V4Ping_methods(root_module, cls):
     ## v4ping.h (module 'applications'): ns3::V4Ping::V4Ping(ns3::V4Ping const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::V4Ping const &', 'arg0')])
@@ -9967,6 +10684,37 @@
                    [param('ns3::Address const &', 'value')])
     return
 
+def register_Ns3ApplicationPacketProbe_methods(root_module, cls):
+    ## application-packet-probe.h (module 'applications'): ns3::ApplicationPacketProbe::ApplicationPacketProbe(ns3::ApplicationPacketProbe const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ApplicationPacketProbe const &', 'arg0')])
+    ## application-packet-probe.h (module 'applications'): ns3::ApplicationPacketProbe::ApplicationPacketProbe() [constructor]
+    cls.add_constructor([])
+    ## application-packet-probe.h (module 'applications'): bool ns3::ApplicationPacketProbe::ConnectByObject(std::string traceSource, ns3::Ptr<ns3::Object> obj) [member function]
+    cls.add_method('ConnectByObject', 
+                   'bool', 
+                   [param('std::string', 'traceSource'), param('ns3::Ptr< ns3::Object >', 'obj')], 
+                   is_virtual=True)
+    ## application-packet-probe.h (module 'applications'): void ns3::ApplicationPacketProbe::ConnectByPath(std::string path) [member function]
+    cls.add_method('ConnectByPath', 
+                   'void', 
+                   [param('std::string', 'path')], 
+                   is_virtual=True)
+    ## application-packet-probe.h (module 'applications'): static ns3::TypeId ns3::ApplicationPacketProbe::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## application-packet-probe.h (module 'applications'): void ns3::ApplicationPacketProbe::SetValue(ns3::Ptr<ns3::Packet const> packet, ns3::Address const & address) [member function]
+    cls.add_method('SetValue', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Address const &', 'address')])
+    ## application-packet-probe.h (module 'applications'): static void ns3::ApplicationPacketProbe::SetValueByPath(std::string path, ns3::Ptr<ns3::Packet const> packet, ns3::Address const & address) [member function]
+    cls.add_method('SetValueByPath', 
+                   'void', 
+                   [param('std::string', 'path'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Address const &', 'address')], 
+                   is_static=True)
+    return
+
 def register_Ns3BurstErrorModel_methods(root_module, cls):
     ## error-model.h (module 'network'): ns3::BurstErrorModel::BurstErrorModel(ns3::BurstErrorModel const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::BurstErrorModel const &', 'arg0')])
@@ -10010,6 +10758,87 @@
                    visibility='private', is_virtual=True)
     return
 
+def register_Ns3CounterCalculator__Unsigned_int_methods(root_module, cls):
+    ## basic-data-calculators.h (module 'stats'): ns3::CounterCalculator<unsigned int>::CounterCalculator(ns3::CounterCalculator<unsigned int> const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::CounterCalculator< unsigned int > const &', 'arg0')])
+    ## basic-data-calculators.h (module 'stats'): ns3::CounterCalculator<unsigned int>::CounterCalculator() [constructor]
+    cls.add_constructor([])
+    ## basic-data-calculators.h (module 'stats'): unsigned int ns3::CounterCalculator<unsigned int>::GetCount() const [member function]
+    cls.add_method('GetCount', 
+                   'unsigned int', 
+                   [], 
+                   is_const=True)
+    ## basic-data-calculators.h (module 'stats'): void ns3::CounterCalculator<unsigned int>::Output(ns3::DataOutputCallback & callback) const [member function]
+    cls.add_method('Output', 
+                   'void', 
+                   [param('ns3::DataOutputCallback &', 'callback')], 
+                   is_const=True, is_virtual=True)
+    ## basic-data-calculators.h (module 'stats'): void ns3::CounterCalculator<unsigned int>::Update() [member function]
+    cls.add_method('Update', 
+                   'void', 
+                   [])
+    ## basic-data-calculators.h (module 'stats'): void ns3::CounterCalculator<unsigned int>::Update(unsigned int const i) [member function]
+    cls.add_method('Update', 
+                   'void', 
+                   [param('unsigned int const', 'i')])
+    ## basic-data-calculators.h (module 'stats'): void ns3::CounterCalculator<unsigned int>::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    return
+
+def register_Ns3PacketCounterCalculator_methods(root_module, cls):
+    ## packet-data-calculators.h (module 'network'): ns3::PacketCounterCalculator::PacketCounterCalculator(ns3::PacketCounterCalculator const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PacketCounterCalculator const &', 'arg0')])
+    ## packet-data-calculators.h (module 'network'): ns3::PacketCounterCalculator::PacketCounterCalculator() [constructor]
+    cls.add_constructor([])
+    ## packet-data-calculators.h (module 'network'): void ns3::PacketCounterCalculator::FrameUpdate(std::string path, ns3::Ptr<ns3::Packet const> packet, ns3::Mac48Address realto) [member function]
+    cls.add_method('FrameUpdate', 
+                   'void', 
+                   [param('std::string', 'path'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Mac48Address', 'realto')])
+    ## packet-data-calculators.h (module 'network'): void ns3::PacketCounterCalculator::PacketUpdate(std::string path, ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('PacketUpdate', 
+                   'void', 
+                   [param('std::string', 'path'), param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## packet-data-calculators.h (module 'network'): void ns3::PacketCounterCalculator::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    return
+
+def register_Ns3PacketProbe_methods(root_module, cls):
+    ## packet-probe.h (module 'network'): ns3::PacketProbe::PacketProbe(ns3::PacketProbe const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PacketProbe const &', 'arg0')])
+    ## packet-probe.h (module 'network'): ns3::PacketProbe::PacketProbe() [constructor]
+    cls.add_constructor([])
+    ## packet-probe.h (module 'network'): bool ns3::PacketProbe::ConnectByObject(std::string traceSource, ns3::Ptr<ns3::Object> obj) [member function]
+    cls.add_method('ConnectByObject', 
+                   'bool', 
+                   [param('std::string', 'traceSource'), param('ns3::Ptr< ns3::Object >', 'obj')], 
+                   is_virtual=True)
+    ## packet-probe.h (module 'network'): void ns3::PacketProbe::ConnectByPath(std::string path) [member function]
+    cls.add_method('ConnectByPath', 
+                   'void', 
+                   [param('std::string', 'path')], 
+                   is_virtual=True)
+    ## packet-probe.h (module 'network'): static ns3::TypeId ns3::PacketProbe::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## packet-probe.h (module 'network'): void ns3::PacketProbe::SetValue(ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('SetValue', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## packet-probe.h (module 'network'): static void ns3::PacketProbe::SetValueByPath(std::string path, ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('SetValueByPath', 
+                   'void', 
+                   [param('std::string', 'path'), param('ns3::Ptr< ns3::Packet const >', 'packet')], 
+                   is_static=True)
+    return
+
 def register_Ns3PbbAddressTlv_methods(root_module, cls):
     ## packetbb.h (module 'network'): ns3::PbbAddressTlv::PbbAddressTlv() [constructor]
     cls.add_constructor([])
@@ -10054,18 +10883,135 @@
                    [param('bool', 'isMultivalue')])
     return
 
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_functions(root_module):
     module = root_module
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
+    register_functions_ns3_internal(module.get_submodule('internal'), root_module)
     return
 
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def register_functions_ns3_addressUtils(module, root_module):
     return
 
+def register_functions_ns3_internal(module, root_module):
+    return
+
 def main():
     out = FileCodeSink(sys.stdout)
     root_module = module_init()
diff -Naur ns-3.17/src/applications/bindings/modulegen__gcc_LP64.py ns-3.18/src/applications/bindings/modulegen__gcc_LP64.py
--- ns-3.17/src/applications/bindings/modulegen__gcc_LP64.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/applications/bindings/modulegen__gcc_LP64.py	2013-10-26 07:07:30.579364407 -0700
@@ -40,8 +40,8 @@
     module.add_class('AttributeConstructionList', import_from_module='ns.core')
     ## attribute-construction-list.h (module 'core'): ns3::AttributeConstructionList::Item [struct]
     module.add_class('Item', import_from_module='ns.core', outer_class=root_module['ns3::AttributeConstructionList'])
-    ## average.h (module 'tools'): ns3::Average<double> [class]
-    module.add_class('Average', import_from_module='ns.tools', template_parameters=['double'])
+    ## average.h (module 'stats'): ns3::Average<double> [class]
+    module.add_class('Average', import_from_module='ns.stats', template_parameters=['double'])
     ## buffer.h (module 'network'): ns3::Buffer [class]
     module.add_class('Buffer', import_from_module='ns.network')
     ## buffer.h (module 'network'): ns3::Buffer::Iterator [class]
@@ -66,8 +66,12 @@
     module.add_class('DataOutputCallback', allow_subclassing=True, import_from_module='ns.stats')
     ## data-rate.h (module 'network'): ns3::DataRate [class]
     module.add_class('DataRate', import_from_module='ns.network')
+    ## delay-jitter-estimation.h (module 'network'): ns3::DelayJitterEstimation [class]
+    module.add_class('DelayJitterEstimation', import_from_module='ns.network')
     ## event-id.h (module 'core'): ns3::EventId [class]
     module.add_class('EventId', import_from_module='ns.core')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress [class]
     module.add_class('Inet6SocketAddress', import_from_module='ns.network')
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress [class]
@@ -88,6 +92,10 @@
     root_module['ns3::Ipv6Address'].implicitly_converts_to(root_module['ns3::Address'])
     ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix [class]
     module.add_class('Ipv6Prefix', import_from_module='ns.network')
+    ## mac16-address.h (module 'network'): ns3::Mac16Address [class]
+    module.add_class('Mac16Address', import_from_module='ns.network')
+    ## mac16-address.h (module 'network'): ns3::Mac16Address [class]
+    root_module['ns3::Mac16Address'].implicitly_converts_to(root_module['ns3::Address'])
     ## mac48-address.h (module 'network'): ns3::Mac48Address [class]
     module.add_class('Mac48Address', import_from_module='ns.network')
     ## mac48-address.h (module 'network'): ns3::Mac48Address [class]
@@ -136,6 +144,8 @@
     module.add_class('PacketTagList', import_from_module='ns.network')
     ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct]
     module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration]
+    module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network')
     ## packetbb.h (module 'network'): ns3::PbbAddressTlvBlock [class]
     module.add_class('PbbAddressTlvBlock', import_from_module='ns.network')
     ## packetbb.h (module 'network'): ns3::PbbTlvBlock [class]
@@ -150,6 +160,8 @@
     module.add_class('PcapHelperForDevice', allow_subclassing=True, import_from_module='ns.network')
     ## ping6-helper.h (module 'applications'): ns3::Ping6Helper [class]
     module.add_class('Ping6Helper')
+    ## radvd-helper.h (module 'applications'): ns3::RadvdHelper [class]
+    module.add_class('RadvdHelper')
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter> [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simulator.h (module 'core'): ns3::Simulator [class]
@@ -238,6 +250,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::NixVector', 'ns3::empty', 'ns3::DefaultDeleter<ns3::NixVector>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> > [class]
@@ -324,6 +338,8 @@
     module.add_class('ConstantRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
     ## data-calculator.h (module 'stats'): ns3::DataCalculator [class]
     module.add_class('DataCalculator', import_from_module='ns.stats', parent=root_module['ns3::Object'])
+    ## data-collection-object.h (module 'stats'): ns3::DataCollectionObject [class]
+    module.add_class('DataCollectionObject', import_from_module='ns.stats', parent=root_module['ns3::Object'])
     ## data-output-interface.h (module 'stats'): ns3::DataOutputInterface [class]
     module.add_class('DataOutputInterface', import_from_module='ns.stats', parent=root_module['ns3::Object'])
     ## data-rate.h (module 'network'): ns3::DataRateChecker [class]
@@ -332,12 +348,18 @@
     module.add_class('DataRateValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
     ## random-variable-stream.h (module 'core'): ns3::DeterministicRandomVariable [class]
     module.add_class('DeterministicRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## double.h (module 'core'): ns3::DoubleValue [class]
+    module.add_class('DoubleValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## drop-tail-queue.h (module 'network'): ns3::DropTailQueue [class]
     module.add_class('DropTailQueue', import_from_module='ns.network', parent=root_module['ns3::Queue'])
     ## random-variable-stream.h (module 'core'): ns3::EmpiricalRandomVariable [class]
     module.add_class('EmpiricalRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
     ## attribute.h (module 'core'): ns3::EmptyAttributeValue [class]
     module.add_class('EmptyAttributeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
+    ## enum.h (module 'core'): ns3::EnumChecker [class]
+    module.add_class('EnumChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
+    ## enum.h (module 'core'): ns3::EnumValue [class]
+    module.add_class('EnumValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## random-variable-stream.h (module 'core'): ns3::ErlangRandomVariable [class]
     module.add_class('ErlangRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
     ## error-model.h (module 'network'): ns3::ErrorModel [class]
@@ -352,6 +374,8 @@
     module.add_class('ExponentialRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
     ## random-variable-stream.h (module 'core'): ns3::GammaRandomVariable [class]
     module.add_class('GammaRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## integer.h (module 'core'): ns3::IntegerValue [class]
+    module.add_class('IntegerValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## ipv4-address.h (module 'network'): ns3::Ipv4AddressChecker [class]
     module.add_class('Ipv4AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
     ## ipv4-address.h (module 'network'): ns3::Ipv4AddressValue [class]
@@ -372,12 +396,22 @@
     module.add_class('ListErrorModel', import_from_module='ns.network', parent=root_module['ns3::ErrorModel'])
     ## random-variable-stream.h (module 'core'): ns3::LogNormalRandomVariable [class]
     module.add_class('LogNormalRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## mac16-address.h (module 'network'): ns3::Mac16AddressChecker [class]
+    module.add_class('Mac16AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
+    ## mac16-address.h (module 'network'): ns3::Mac16AddressValue [class]
+    module.add_class('Mac16AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
     ## mac48-address.h (module 'network'): ns3::Mac48AddressChecker [class]
     module.add_class('Mac48AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
     ## mac48-address.h (module 'network'): ns3::Mac48AddressValue [class]
     module.add_class('Mac48AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
+    ## mac64-address.h (module 'network'): ns3::Mac64AddressChecker [class]
+    module.add_class('Mac64AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
+    ## mac64-address.h (module 'network'): ns3::Mac64AddressValue [class]
+    module.add_class('Mac64AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
     ## basic-data-calculators.h (module 'stats'): ns3::MinMaxAvgTotalCalculator<double> [class]
     module.add_class('MinMaxAvgTotalCalculator', import_from_module='ns.stats', template_parameters=['double'], parent=[root_module['ns3::DataCalculator'], root_module['ns3::StatisticalSummary']])
+    ## basic-data-calculators.h (module 'stats'): ns3::MinMaxAvgTotalCalculator<unsigned int> [class]
+    module.add_class('MinMaxAvgTotalCalculator', import_from_module='ns.stats', template_parameters=['unsigned int'], parent=[root_module['ns3::DataCalculator'], root_module['ns3::StatisticalSummary']])
     ## net-device.h (module 'network'): ns3::NetDevice [class]
     module.add_class('NetDevice', import_from_module='ns.network', parent=root_module['ns3::Object'])
     ## net-device.h (module 'network'): ns3::NetDevice::PacketType [enumeration]
@@ -400,6 +434,8 @@
     module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
     ## packet-sink.h (module 'applications'): ns3::PacketSink [class]
     module.add_class('PacketSink', parent=root_module['ns3::Application'])
+    ## packet-data-calculators.h (module 'network'): ns3::PacketSizeMinMaxAvgTotalCalculator [class]
+    module.add_class('PacketSizeMinMaxAvgTotalCalculator', import_from_module='ns.network', parent=root_module['ns3::MinMaxAvgTotalCalculator< unsigned int >'])
     ## packet-socket.h (module 'network'): ns3::PacketSocket [class]
     module.add_class('PacketSocket', import_from_module='ns.network', parent=root_module['ns3::Socket'])
     ## packet-socket-factory.h (module 'network'): ns3::PacketSocketFactory [class]
@@ -424,6 +460,8 @@
     module.add_class('PbbTlv', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::PbbTlv, ns3::empty, ns3::DefaultDeleter<ns3::PbbTlv> >'])
     ## ping6.h (module 'applications'): ns3::Ping6 [class]
     module.add_class('Ping6', parent=root_module['ns3::Application'])
+    ## probe.h (module 'stats'): ns3::Probe [class]
+    module.add_class('Probe', import_from_module='ns.stats', parent=root_module['ns3::DataCollectionObject'])
     ## radvd.h (module 'applications'): ns3::Radvd [class]
     module.add_class('Radvd', parent=root_module['ns3::Application'])
     ## radvd-interface.h (module 'applications'): ns3::RadvdInterface [class]
@@ -440,8 +478,6 @@
     module.add_class('SimpleChannel', import_from_module='ns.network', parent=root_module['ns3::Channel'])
     ## simple-net-device.h (module 'network'): ns3::SimpleNetDevice [class]
     module.add_class('SimpleNetDevice', import_from_module='ns.network', parent=root_module['ns3::NetDevice'])
-    ## nstime.h (module 'core'): ns3::TimeChecker [class]
-    module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
     module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
@@ -458,14 +494,24 @@
     module.add_class('UdpServer', parent=root_module['ns3::Application'])
     ## udp-trace-client.h (module 'applications'): ns3::UdpTraceClient [class]
     module.add_class('UdpTraceClient', parent=root_module['ns3::Application'])
+    ## uinteger.h (module 'core'): ns3::UintegerValue [class]
+    module.add_class('UintegerValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## v4ping.h (module 'applications'): ns3::V4Ping [class]
     module.add_class('V4Ping', parent=root_module['ns3::Application'])
     ## address.h (module 'network'): ns3::AddressChecker [class]
     module.add_class('AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
     ## address.h (module 'network'): ns3::AddressValue [class]
     module.add_class('AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
+    ## application-packet-probe.h (module 'applications'): ns3::ApplicationPacketProbe [class]
+    module.add_class('ApplicationPacketProbe', parent=root_module['ns3::Probe'])
     ## error-model.h (module 'network'): ns3::BurstErrorModel [class]
     module.add_class('BurstErrorModel', import_from_module='ns.network', parent=root_module['ns3::ErrorModel'])
+    ## basic-data-calculators.h (module 'stats'): ns3::CounterCalculator<unsigned int> [class]
+    module.add_class('CounterCalculator', import_from_module='ns.stats', template_parameters=['unsigned int'], parent=root_module['ns3::DataCalculator'])
+    ## packet-data-calculators.h (module 'network'): ns3::PacketCounterCalculator [class]
+    module.add_class('PacketCounterCalculator', import_from_module='ns.network', parent=root_module['ns3::CounterCalculator< unsigned int >'])
+    ## packet-probe.h (module 'network'): ns3::PacketProbe [class]
+    module.add_class('PacketProbe', import_from_module='ns.network', parent=root_module['ns3::Probe'])
     ## packetbb.h (module 'network'): ns3::PbbAddressTlv [class]
     module.add_class('PbbAddressTlv', import_from_module='ns.network', parent=root_module['ns3::PbbTlv'])
     module.add_container('std::vector< ns3::Ipv6Address >', 'ns3::Ipv6Address', container_type='vector')
@@ -473,6 +519,9 @@
     module.add_container('std::list< unsigned int >', 'unsigned int', container_type='list')
     module.add_container('std::list< ns3::Ptr< ns3::Socket > >', 'ns3::Ptr< ns3::Socket >', container_type='list')
     module.add_container('std::list< ns3::Ptr< ns3::RadvdPrefix > >', 'ns3::Ptr< ns3::RadvdPrefix >', container_type='list')
+    typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxEndCallback')
+    typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxEndCallback*')
+    typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxEndCallback&')
     typehandlers.add_type_alias('ns3::SequenceNumber< short unsigned int, short int >', 'ns3::SequenceNumber16')
     typehandlers.add_type_alias('ns3::SequenceNumber< short unsigned int, short int >*', 'ns3::SequenceNumber16*')
     typehandlers.add_type_alias('ns3::SequenceNumber< short unsigned int, short int >&', 'ns3::SequenceNumber16&')
@@ -488,9 +537,6 @@
     typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxStartCallback')
     typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxStartCallback*')
     typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxStartCallback&')
-    typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxEndCallback')
-    typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxEndCallback*')
-    typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxEndCallback&')
     typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyRxEndOkCallback')
     typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyRxEndOkCallback*')
     typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyRxEndOkCallback&')
@@ -501,20 +547,66 @@
     register_types_ns3_FatalImpl(nested_module)
     
     
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
+    
     ## Register a nested module for the namespace addressUtils
     
     nested_module = module.add_cpp_namespace('addressUtils')
     register_types_ns3_addressUtils(nested_module)
     
+    
+    ## Register a nested module for the namespace internal
+    
+    nested_module = module.add_cpp_namespace('internal')
+    register_types_ns3_internal(nested_module)
+    
 
 def register_types_ns3_FatalImpl(module):
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_types_ns3_addressUtils(module):
     root_module = module.get_root()
     
 
+def register_types_ns3_internal(module):
+    root_module = module.get_root()
+    
+
 def register_methods(root_module):
     register_Ns3Address_methods(root_module, root_module['ns3::Address'])
     register_Ns3ApplicationContainer_methods(root_module, root_module['ns3::ApplicationContainer'])
@@ -536,13 +628,16 @@
     register_Ns3ChannelList_methods(root_module, root_module['ns3::ChannelList'])
     register_Ns3DataOutputCallback_methods(root_module, root_module['ns3::DataOutputCallback'])
     register_Ns3DataRate_methods(root_module, root_module['ns3::DataRate'])
+    register_Ns3DelayJitterEstimation_methods(root_module, root_module['ns3::DelayJitterEstimation'])
     register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3Inet6SocketAddress_methods(root_module, root_module['ns3::Inet6SocketAddress'])
     register_Ns3InetSocketAddress_methods(root_module, root_module['ns3::InetSocketAddress'])
     register_Ns3Ipv4Address_methods(root_module, root_module['ns3::Ipv4Address'])
     register_Ns3Ipv4Mask_methods(root_module, root_module['ns3::Ipv4Mask'])
     register_Ns3Ipv6Address_methods(root_module, root_module['ns3::Ipv6Address'])
     register_Ns3Ipv6Prefix_methods(root_module, root_module['ns3::Ipv6Prefix'])
+    register_Ns3Mac16Address_methods(root_module, root_module['ns3::Mac16Address'])
     register_Ns3Mac48Address_methods(root_module, root_module['ns3::Mac48Address'])
     register_Ns3Mac64Address_methods(root_module, root_module['ns3::Mac64Address'])
     register_Ns3NetDeviceContainer_methods(root_module, root_module['ns3::NetDeviceContainer'])
@@ -569,6 +664,7 @@
     register_Ns3PcapHelper_methods(root_module, root_module['ns3::PcapHelper'])
     register_Ns3PcapHelperForDevice_methods(root_module, root_module['ns3::PcapHelperForDevice'])
     register_Ns3Ping6Helper_methods(root_module, root_module['ns3::Ping6Helper'])
+    register_Ns3RadvdHelper_methods(root_module, root_module['ns3::RadvdHelper'])
     register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >'])
     register_Ns3Simulator_methods(root_module, root_module['ns3::Simulator'])
     register_Ns3StatisticalSummary_methods(root_module, root_module['ns3::StatisticalSummary'])
@@ -608,6 +704,7 @@
     register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
     register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
     register_Ns3SimpleRefCount__Ns3OutputStreamWrapper_Ns3Empty_Ns3DefaultDeleter__lt__ns3OutputStreamWrapper__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> >'])
     register_Ns3SimpleRefCount__Ns3Packet_Ns3Empty_Ns3DefaultDeleter__lt__ns3Packet__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
@@ -647,13 +744,17 @@
     register_Ns3Channel_methods(root_module, root_module['ns3::Channel'])
     register_Ns3ConstantRandomVariable_methods(root_module, root_module['ns3::ConstantRandomVariable'])
     register_Ns3DataCalculator_methods(root_module, root_module['ns3::DataCalculator'])
+    register_Ns3DataCollectionObject_methods(root_module, root_module['ns3::DataCollectionObject'])
     register_Ns3DataOutputInterface_methods(root_module, root_module['ns3::DataOutputInterface'])
     register_Ns3DataRateChecker_methods(root_module, root_module['ns3::DataRateChecker'])
     register_Ns3DataRateValue_methods(root_module, root_module['ns3::DataRateValue'])
     register_Ns3DeterministicRandomVariable_methods(root_module, root_module['ns3::DeterministicRandomVariable'])
+    register_Ns3DoubleValue_methods(root_module, root_module['ns3::DoubleValue'])
     register_Ns3DropTailQueue_methods(root_module, root_module['ns3::DropTailQueue'])
     register_Ns3EmpiricalRandomVariable_methods(root_module, root_module['ns3::EmpiricalRandomVariable'])
     register_Ns3EmptyAttributeValue_methods(root_module, root_module['ns3::EmptyAttributeValue'])
+    register_Ns3EnumChecker_methods(root_module, root_module['ns3::EnumChecker'])
+    register_Ns3EnumValue_methods(root_module, root_module['ns3::EnumValue'])
     register_Ns3ErlangRandomVariable_methods(root_module, root_module['ns3::ErlangRandomVariable'])
     register_Ns3ErrorModel_methods(root_module, root_module['ns3::ErrorModel'])
     register_Ns3EthernetHeader_methods(root_module, root_module['ns3::EthernetHeader'])
@@ -661,6 +762,7 @@
     register_Ns3EventImpl_methods(root_module, root_module['ns3::EventImpl'])
     register_Ns3ExponentialRandomVariable_methods(root_module, root_module['ns3::ExponentialRandomVariable'])
     register_Ns3GammaRandomVariable_methods(root_module, root_module['ns3::GammaRandomVariable'])
+    register_Ns3IntegerValue_methods(root_module, root_module['ns3::IntegerValue'])
     register_Ns3Ipv4AddressChecker_methods(root_module, root_module['ns3::Ipv4AddressChecker'])
     register_Ns3Ipv4AddressValue_methods(root_module, root_module['ns3::Ipv4AddressValue'])
     register_Ns3Ipv4MaskChecker_methods(root_module, root_module['ns3::Ipv4MaskChecker'])
@@ -671,9 +773,14 @@
     register_Ns3Ipv6PrefixValue_methods(root_module, root_module['ns3::Ipv6PrefixValue'])
     register_Ns3ListErrorModel_methods(root_module, root_module['ns3::ListErrorModel'])
     register_Ns3LogNormalRandomVariable_methods(root_module, root_module['ns3::LogNormalRandomVariable'])
+    register_Ns3Mac16AddressChecker_methods(root_module, root_module['ns3::Mac16AddressChecker'])
+    register_Ns3Mac16AddressValue_methods(root_module, root_module['ns3::Mac16AddressValue'])
     register_Ns3Mac48AddressChecker_methods(root_module, root_module['ns3::Mac48AddressChecker'])
     register_Ns3Mac48AddressValue_methods(root_module, root_module['ns3::Mac48AddressValue'])
+    register_Ns3Mac64AddressChecker_methods(root_module, root_module['ns3::Mac64AddressChecker'])
+    register_Ns3Mac64AddressValue_methods(root_module, root_module['ns3::Mac64AddressValue'])
     register_Ns3MinMaxAvgTotalCalculator__Double_methods(root_module, root_module['ns3::MinMaxAvgTotalCalculator< double >'])
+    register_Ns3MinMaxAvgTotalCalculator__Unsigned_int_methods(root_module, root_module['ns3::MinMaxAvgTotalCalculator< unsigned int >'])
     register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice'])
     register_Ns3NixVector_methods(root_module, root_module['ns3::NixVector'])
     register_Ns3Node_methods(root_module, root_module['ns3::Node'])
@@ -684,6 +791,7 @@
     register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper'])
     register_Ns3Packet_methods(root_module, root_module['ns3::Packet'])
     register_Ns3PacketSink_methods(root_module, root_module['ns3::PacketSink'])
+    register_Ns3PacketSizeMinMaxAvgTotalCalculator_methods(root_module, root_module['ns3::PacketSizeMinMaxAvgTotalCalculator'])
     register_Ns3PacketSocket_methods(root_module, root_module['ns3::PacketSocket'])
     register_Ns3PacketSocketFactory_methods(root_module, root_module['ns3::PacketSocketFactory'])
     register_Ns3ParetoRandomVariable_methods(root_module, root_module['ns3::ParetoRandomVariable'])
@@ -696,6 +804,7 @@
     register_Ns3PbbPacket_methods(root_module, root_module['ns3::PbbPacket'])
     register_Ns3PbbTlv_methods(root_module, root_module['ns3::PbbTlv'])
     register_Ns3Ping6_methods(root_module, root_module['ns3::Ping6'])
+    register_Ns3Probe_methods(root_module, root_module['ns3::Probe'])
     register_Ns3Radvd_methods(root_module, root_module['ns3::Radvd'])
     register_Ns3RadvdInterface_methods(root_module, root_module['ns3::RadvdInterface'])
     register_Ns3RadvdPrefix_methods(root_module, root_module['ns3::RadvdPrefix'])
@@ -703,7 +812,6 @@
     register_Ns3ReceiveListErrorModel_methods(root_module, root_module['ns3::ReceiveListErrorModel'])
     register_Ns3SimpleChannel_methods(root_module, root_module['ns3::SimpleChannel'])
     register_Ns3SimpleNetDevice_methods(root_module, root_module['ns3::SimpleNetDevice'])
-    register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
     register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
@@ -712,11 +820,21 @@
     register_Ns3UdpEchoServer_methods(root_module, root_module['ns3::UdpEchoServer'])
     register_Ns3UdpServer_methods(root_module, root_module['ns3::UdpServer'])
     register_Ns3UdpTraceClient_methods(root_module, root_module['ns3::UdpTraceClient'])
+    register_Ns3UintegerValue_methods(root_module, root_module['ns3::UintegerValue'])
     register_Ns3V4Ping_methods(root_module, root_module['ns3::V4Ping'])
     register_Ns3AddressChecker_methods(root_module, root_module['ns3::AddressChecker'])
     register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue'])
+    register_Ns3ApplicationPacketProbe_methods(root_module, root_module['ns3::ApplicationPacketProbe'])
     register_Ns3BurstErrorModel_methods(root_module, root_module['ns3::BurstErrorModel'])
+    register_Ns3CounterCalculator__Unsigned_int_methods(root_module, root_module['ns3::CounterCalculator< unsigned int >'])
+    register_Ns3PacketCounterCalculator_methods(root_module, root_module['ns3::PacketCounterCalculator'])
+    register_Ns3PacketProbe_methods(root_module, root_module['ns3::PacketProbe'])
     register_Ns3PbbAddressTlv_methods(root_module, root_module['ns3::PbbAddressTlv'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     return
 
 def register_Ns3Address_methods(root_module, cls):
@@ -881,42 +999,42 @@
     cls.add_method('CreateFileStream', 
                    'ns3::Ptr< ns3::OutputStreamWrapper >', 
                    [param('std::string', 'filename'), param('std::_Ios_Openmode', 'filemode', default_value='std::ios_base::out')])
-    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('DefaultDequeueSinkWithContext', 
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
                    is_static=True)
-    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('DefaultDequeueSinkWithoutContext', 
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
                    is_static=True)
-    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDropSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDropSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('DefaultDropSinkWithContext', 
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
                    is_static=True)
-    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDropSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDropSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('DefaultDropSinkWithoutContext', 
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
                    is_static=True)
-    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultEnqueueSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultEnqueueSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('DefaultEnqueueSinkWithContext', 
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
                    is_static=True)
-    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultEnqueueSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultEnqueueSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('DefaultEnqueueSinkWithoutContext', 
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
                    is_static=True)
-    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultReceiveSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultReceiveSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('DefaultReceiveSinkWithContext', 
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
                    is_static=True)
-    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultReceiveSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultReceiveSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('DefaultReceiveSinkWithoutContext', 
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
@@ -1031,64 +1149,64 @@
     return
 
 def register_Ns3Average__Double_methods(root_module, cls):
-    ## average.h (module 'tools'): ns3::Average<double>::Average(ns3::Average<double> const & arg0) [copy constructor]
+    ## average.h (module 'stats'): ns3::Average<double>::Average(ns3::Average<double> const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::Average< double > const &', 'arg0')])
-    ## average.h (module 'tools'): ns3::Average<double>::Average() [constructor]
+    ## average.h (module 'stats'): ns3::Average<double>::Average() [constructor]
     cls.add_constructor([])
-    ## average.h (module 'tools'): double ns3::Average<double>::Avg() const [member function]
+    ## average.h (module 'stats'): double ns3::Average<double>::Avg() const [member function]
     cls.add_method('Avg', 
                    'double', 
                    [], 
                    is_const=True)
-    ## average.h (module 'tools'): uint32_t ns3::Average<double>::Count() const [member function]
+    ## average.h (module 'stats'): uint32_t ns3::Average<double>::Count() const [member function]
     cls.add_method('Count', 
                    'uint32_t', 
                    [], 
                    is_const=True)
-    ## average.h (module 'tools'): double ns3::Average<double>::Error90() const [member function]
+    ## average.h (module 'stats'): double ns3::Average<double>::Error90() const [member function]
     cls.add_method('Error90', 
                    'double', 
                    [], 
                    is_const=True)
-    ## average.h (module 'tools'): double ns3::Average<double>::Error95() const [member function]
+    ## average.h (module 'stats'): double ns3::Average<double>::Error95() const [member function]
     cls.add_method('Error95', 
                    'double', 
                    [], 
                    is_const=True)
-    ## average.h (module 'tools'): double ns3::Average<double>::Error99() const [member function]
+    ## average.h (module 'stats'): double ns3::Average<double>::Error99() const [member function]
     cls.add_method('Error99', 
                    'double', 
                    [], 
                    is_const=True)
-    ## average.h (module 'tools'): double ns3::Average<double>::Max() const [member function]
+    ## average.h (module 'stats'): double ns3::Average<double>::Max() const [member function]
     cls.add_method('Max', 
                    'double', 
                    [], 
                    is_const=True)
-    ## average.h (module 'tools'): double ns3::Average<double>::Mean() const [member function]
+    ## average.h (module 'stats'): double ns3::Average<double>::Mean() const [member function]
     cls.add_method('Mean', 
                    'double', 
                    [], 
                    is_const=True)
-    ## average.h (module 'tools'): double ns3::Average<double>::Min() const [member function]
+    ## average.h (module 'stats'): double ns3::Average<double>::Min() const [member function]
     cls.add_method('Min', 
                    'double', 
                    [], 
                    is_const=True)
-    ## average.h (module 'tools'): void ns3::Average<double>::Reset() [member function]
+    ## average.h (module 'stats'): void ns3::Average<double>::Reset() [member function]
     cls.add_method('Reset', 
                    'void', 
                    [])
-    ## average.h (module 'tools'): double ns3::Average<double>::Stddev() const [member function]
+    ## average.h (module 'stats'): double ns3::Average<double>::Stddev() const [member function]
     cls.add_method('Stddev', 
                    'double', 
                    [], 
                    is_const=True)
-    ## average.h (module 'tools'): void ns3::Average<double>::Update(double const & x) [member function]
+    ## average.h (module 'stats'): void ns3::Average<double>::Update(double const & x) [member function]
     cls.add_method('Update', 
                    'void', 
                    [param('double const &', 'x')])
-    ## average.h (module 'tools'): double ns3::Average<double>::Var() const [member function]
+    ## average.h (module 'stats'): double ns3::Average<double>::Var() const [member function]
     cls.add_method('Var', 
                    'double', 
                    [], 
@@ -1587,6 +1705,32 @@
                    is_const=True)
     return
 
+def register_Ns3DelayJitterEstimation_methods(root_module, cls):
+    ## delay-jitter-estimation.h (module 'network'): ns3::DelayJitterEstimation::DelayJitterEstimation(ns3::DelayJitterEstimation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::DelayJitterEstimation const &', 'arg0')])
+    ## delay-jitter-estimation.h (module 'network'): ns3::DelayJitterEstimation::DelayJitterEstimation() [constructor]
+    cls.add_constructor([])
+    ## delay-jitter-estimation.h (module 'network'): ns3::Time ns3::DelayJitterEstimation::GetLastDelay() const [member function]
+    cls.add_method('GetLastDelay', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## delay-jitter-estimation.h (module 'network'): uint64_t ns3::DelayJitterEstimation::GetLastJitter() const [member function]
+    cls.add_method('GetLastJitter', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## delay-jitter-estimation.h (module 'network'): static void ns3::DelayJitterEstimation::PrepareTx(ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('PrepareTx', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')], 
+                   is_static=True)
+    ## delay-jitter-estimation.h (module 'network'): void ns3::DelayJitterEstimation::RecordRx(ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('RecordRx', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    return
+
 def register_Ns3EventId_methods(root_module, cls):
     cls.add_binary_comparison_operator('!=')
     cls.add_binary_comparison_operator('==')
@@ -1632,6 +1776,35 @@
                    is_const=True)
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3Inet6SocketAddress_methods(root_module, cls):
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress::Inet6SocketAddress(ns3::Inet6SocketAddress const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::Inet6SocketAddress const &', 'arg0')])
@@ -1983,6 +2156,11 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
     cls.add_method('IsEqual', 
                    'bool', 
@@ -2022,16 +2200,36 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
     cls.add_method('MakeAutoconfiguredAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
     cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'mac')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
     cls.add_method('MakeIpv4MappedAddress', 
                    'ns3::Ipv6Address', 
@@ -2120,6 +2318,43 @@
                    is_const=True)
     return
 
+def register_Ns3Mac16Address_methods(root_module, cls):
+    cls.add_binary_comparison_operator('!=')
+    cls.add_binary_comparison_operator('<')
+    cls.add_output_stream_operator()
+    cls.add_binary_comparison_operator('==')
+    ## mac16-address.h (module 'network'): ns3::Mac16Address::Mac16Address(ns3::Mac16Address const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Mac16Address const &', 'arg0')])
+    ## mac16-address.h (module 'network'): ns3::Mac16Address::Mac16Address() [constructor]
+    cls.add_constructor([])
+    ## mac16-address.h (module 'network'): ns3::Mac16Address::Mac16Address(char const * str) [constructor]
+    cls.add_constructor([param('char const *', 'str')])
+    ## mac16-address.h (module 'network'): static ns3::Mac16Address ns3::Mac16Address::Allocate() [member function]
+    cls.add_method('Allocate', 
+                   'ns3::Mac16Address', 
+                   [], 
+                   is_static=True)
+    ## mac16-address.h (module 'network'): static ns3::Mac16Address ns3::Mac16Address::ConvertFrom(ns3::Address const & address) [member function]
+    cls.add_method('ConvertFrom', 
+                   'ns3::Mac16Address', 
+                   [param('ns3::Address const &', 'address')], 
+                   is_static=True)
+    ## mac16-address.h (module 'network'): void ns3::Mac16Address::CopyFrom(uint8_t const * buffer) [member function]
+    cls.add_method('CopyFrom', 
+                   'void', 
+                   [param('uint8_t const *', 'buffer')])
+    ## mac16-address.h (module 'network'): void ns3::Mac16Address::CopyTo(uint8_t * buffer) const [member function]
+    cls.add_method('CopyTo', 
+                   'void', 
+                   [param('uint8_t *', 'buffer')], 
+                   is_const=True)
+    ## mac16-address.h (module 'network'): static bool ns3::Mac16Address::IsMatchingType(ns3::Address const & address) [member function]
+    cls.add_method('IsMatchingType', 
+                   'bool', 
+                   [param('ns3::Address const &', 'address')], 
+                   is_static=True)
+    return
+
 def register_Ns3Mac48Address_methods(root_module, cls):
     cls.add_binary_comparison_operator('!=')
     cls.add_binary_comparison_operator('<')
@@ -2194,6 +2429,7 @@
 
 def register_Ns3Mac64Address_methods(root_module, cls):
     cls.add_binary_comparison_operator('!=')
+    cls.add_binary_comparison_operator('<')
     cls.add_output_stream_operator()
     cls.add_binary_comparison_operator('==')
     ## mac64-address.h (module 'network'): ns3::Mac64Address::Mac64Address(ns3::Mac64Address const & arg0) [copy constructor]
@@ -2808,6 +3044,10 @@
     cls.add_method('RemoveAll', 
                    'void', 
                    [])
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function]
+    cls.add_method('Replace', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     return
 
 def register_Ns3PacketTagListTagData_methods(root_module, cls):
@@ -3105,11 +3345,11 @@
     cls.add_method('Write', 
                    'void', 
                    [param('uint32_t', 'tsSec'), param('uint32_t', 'tsUsec'), param('uint8_t const * const', 'data'), param('uint32_t', 'totalLen')])
-    ## pcap-file.h (module 'network'): void ns3::PcapFile::Write(uint32_t tsSec, uint32_t tsUsec, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## pcap-file.h (module 'network'): void ns3::PcapFile::Write(uint32_t tsSec, uint32_t tsUsec, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('Write', 
                    'void', 
                    [param('uint32_t', 'tsSec'), param('uint32_t', 'tsUsec'), param('ns3::Ptr< ns3::Packet const >', 'p')])
-    ## pcap-file.h (module 'network'): void ns3::PcapFile::Write(uint32_t tsSec, uint32_t tsUsec, ns3::Header & header, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## pcap-file.h (module 'network'): void ns3::PcapFile::Write(uint32_t tsSec, uint32_t tsUsec, ns3::Header & header, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('Write', 
                    'void', 
                    [param('uint32_t', 'tsSec'), param('uint32_t', 'tsUsec'), param('ns3::Header &', 'header'), param('ns3::Ptr< ns3::Packet const >', 'p')])
@@ -3205,6 +3445,41 @@
                    [param('std::vector< ns3::Ipv6Address >', 'routers')])
     return
 
+def register_Ns3RadvdHelper_methods(root_module, cls):
+    ## radvd-helper.h (module 'applications'): ns3::RadvdHelper::RadvdHelper(ns3::RadvdHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::RadvdHelper const &', 'arg0')])
+    ## radvd-helper.h (module 'applications'): ns3::RadvdHelper::RadvdHelper() [constructor]
+    cls.add_constructor([])
+    ## radvd-helper.h (module 'applications'): void ns3::RadvdHelper::AddAnnouncedPrefix(uint32_t interface, ns3::Ipv6Address prefix, uint32_t prefixLength) [member function]
+    cls.add_method('AddAnnouncedPrefix', 
+                   'void', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv6Address', 'prefix'), param('uint32_t', 'prefixLength')])
+    ## radvd-helper.h (module 'applications'): void ns3::RadvdHelper::ClearPrefixes() [member function]
+    cls.add_method('ClearPrefixes', 
+                   'void', 
+                   [])
+    ## radvd-helper.h (module 'applications'): void ns3::RadvdHelper::DisableDefaultRouterForInterface(uint32_t interface) [member function]
+    cls.add_method('DisableDefaultRouterForInterface', 
+                   'void', 
+                   [param('uint32_t', 'interface')])
+    ## radvd-helper.h (module 'applications'): void ns3::RadvdHelper::EnableDefaultRouterForInterface(uint32_t interface) [member function]
+    cls.add_method('EnableDefaultRouterForInterface', 
+                   'void', 
+                   [param('uint32_t', 'interface')])
+    ## radvd-helper.h (module 'applications'): ns3::Ptr<ns3::RadvdInterface> ns3::RadvdHelper::GetRadvdInterface(uint32_t interface) [member function]
+    cls.add_method('GetRadvdInterface', 
+                   'ns3::Ptr< ns3::RadvdInterface >', 
+                   [param('uint32_t', 'interface')])
+    ## radvd-helper.h (module 'applications'): ns3::ApplicationContainer ns3::RadvdHelper::Install(ns3::Ptr<ns3::Node> node) [member function]
+    cls.add_method('Install', 
+                   'ns3::ApplicationContainer', 
+                   [param('ns3::Ptr< ns3::Node >', 'node')])
+    ## radvd-helper.h (module 'applications'): void ns3::RadvdHelper::SetAttribute(std::string name, ns3::AttributeValue const & value) [member function]
+    cls.add_method('SetAttribute', 
+                   'void', 
+                   [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')])
+    return
+
 def register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter>::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -3517,6 +3792,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -3576,6 +3856,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -4319,11 +4609,11 @@
     cls.add_method('Init', 
                    'void', 
                    [param('uint32_t', 'dataLinkType'), param('uint32_t', 'snapLen', default_value='std::numeric_limits<unsigned int>::max()'), param('int32_t', 'tzCorrection', default_value='ns3::PcapFile::ZONE_DEFAULT')])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::Write(ns3::Time t, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::Write(ns3::Time t, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('Write', 
                    'void', 
                    [param('ns3::Time', 't'), param('ns3::Ptr< ns3::Packet const >', 'p')])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::Write(ns3::Time t, ns3::Header & header, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::Write(ns3::Time t, ns3::Header & header, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('Write', 
                    'void', 
                    [param('ns3::Time', 't'), param('ns3::Header &', 'header'), param('ns3::Ptr< ns3::Packet const >', 'p')])
@@ -4418,7 +4708,7 @@
                    'bool', 
                    [], 
                    is_const=True)
-    ## queue.h (module 'network'): ns3::Ptr<const ns3::Packet> ns3::Queue::Peek() const [member function]
+    ## queue.h (module 'network'): ns3::Ptr<ns3::Packet const> ns3::Queue::Peek() const [member function]
     cls.add_method('Peek', 
                    'ns3::Ptr< ns3::Packet const >', 
                    [], 
@@ -4442,7 +4732,7 @@
                    'bool', 
                    [param('ns3::Ptr< ns3::Packet >', 'p')], 
                    is_pure_virtual=True, visibility='private', is_virtual=True)
-    ## queue.h (module 'network'): ns3::Ptr<const ns3::Packet> ns3::Queue::DoPeek() const [member function]
+    ## queue.h (module 'network'): ns3::Ptr<ns3::Packet const> ns3::Queue::DoPeek() const [member function]
     cls.add_method('DoPeek', 
                    'ns3::Ptr< ns3::Packet const >', 
                    [], 
@@ -4636,7 +4926,7 @@
                    'bool', 
                    [param('ns3::Ptr< ns3::Packet >', 'p')], 
                    visibility='private', is_virtual=True)
-    ## red-queue.h (module 'network'): ns3::Ptr<const ns3::Packet> ns3::RedQueue::DoPeek() const [member function]
+    ## red-queue.h (module 'network'): ns3::Ptr<ns3::Packet const> ns3::RedQueue::DoPeek() const [member function]
     cls.add_method('DoPeek', 
                    'ns3::Ptr< ns3::Packet const >', 
                    [], 
@@ -4807,6 +5097,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -5689,11 +5991,26 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
     cls.add_method('SetResolution', 
                    'void', 
                    [param('ns3::Time::Unit', 'resolution')], 
                    is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
     cls.add_method('To', 
                    'ns3::int64x64_t', 
@@ -6348,6 +6665,40 @@
                    visibility='protected', is_virtual=True)
     return
 
+def register_Ns3DataCollectionObject_methods(root_module, cls):
+    ## data-collection-object.h (module 'stats'): ns3::DataCollectionObject::DataCollectionObject(ns3::DataCollectionObject const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::DataCollectionObject const &', 'arg0')])
+    ## data-collection-object.h (module 'stats'): ns3::DataCollectionObject::DataCollectionObject() [constructor]
+    cls.add_constructor([])
+    ## data-collection-object.h (module 'stats'): void ns3::DataCollectionObject::Disable() [member function]
+    cls.add_method('Disable', 
+                   'void', 
+                   [])
+    ## data-collection-object.h (module 'stats'): void ns3::DataCollectionObject::Enable() [member function]
+    cls.add_method('Enable', 
+                   'void', 
+                   [])
+    ## data-collection-object.h (module 'stats'): std::string ns3::DataCollectionObject::GetName() const [member function]
+    cls.add_method('GetName', 
+                   'std::string', 
+                   [], 
+                   is_const=True)
+    ## data-collection-object.h (module 'stats'): static ns3::TypeId ns3::DataCollectionObject::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## data-collection-object.h (module 'stats'): bool ns3::DataCollectionObject::IsEnabled() const [member function]
+    cls.add_method('IsEnabled', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## data-collection-object.h (module 'stats'): void ns3::DataCollectionObject::SetName(std::string name) [member function]
+    cls.add_method('SetName', 
+                   'void', 
+                   [param('std::string', 'name')])
+    return
+
 def register_Ns3DataOutputInterface_methods(root_module, cls):
     ## data-output-interface.h (module 'stats'): ns3::DataOutputInterface::DataOutputInterface(ns3::DataOutputInterface const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::DataOutputInterface const &', 'arg0')])
@@ -6438,6 +6789,39 @@
                    is_virtual=True)
     return
 
+def register_Ns3DoubleValue_methods(root_module, cls):
+    ## double.h (module 'core'): ns3::DoubleValue::DoubleValue() [constructor]
+    cls.add_constructor([])
+    ## double.h (module 'core'): ns3::DoubleValue::DoubleValue(ns3::DoubleValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::DoubleValue const &', 'arg0')])
+    ## double.h (module 'core'): ns3::DoubleValue::DoubleValue(double const & value) [constructor]
+    cls.add_constructor([param('double const &', 'value')])
+    ## double.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::DoubleValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## double.h (module 'core'): bool ns3::DoubleValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## double.h (module 'core'): double ns3::DoubleValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'double', 
+                   [], 
+                   is_const=True)
+    ## double.h (module 'core'): std::string ns3::DoubleValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## double.h (module 'core'): void ns3::DoubleValue::Set(double const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('double const &', 'value')])
+    return
+
 def register_Ns3DropTailQueue_methods(root_module, cls):
     ## drop-tail-queue.h (module 'network'): ns3::DropTailQueue::DropTailQueue(ns3::DropTailQueue const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::DropTailQueue const &', 'arg0')])
@@ -6466,7 +6850,7 @@
                    'bool', 
                    [param('ns3::Ptr< ns3::Packet >', 'p')], 
                    visibility='private', is_virtual=True)
-    ## drop-tail-queue.h (module 'network'): ns3::Ptr<const ns3::Packet> ns3::DropTailQueue::DoPeek() const [member function]
+    ## drop-tail-queue.h (module 'network'): ns3::Ptr<ns3::Packet const> ns3::DropTailQueue::DoPeek() const [member function]
     cls.add_method('DoPeek', 
                    'ns3::Ptr< ns3::Packet const >', 
                    [], 
@@ -6529,6 +6913,84 @@
                    is_const=True, visibility='private', is_virtual=True)
     return
 
+def register_Ns3EnumChecker_methods(root_module, cls):
+    ## enum.h (module 'core'): ns3::EnumChecker::EnumChecker(ns3::EnumChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::EnumChecker const &', 'arg0')])
+    ## enum.h (module 'core'): ns3::EnumChecker::EnumChecker() [constructor]
+    cls.add_constructor([])
+    ## enum.h (module 'core'): void ns3::EnumChecker::Add(int v, std::string name) [member function]
+    cls.add_method('Add', 
+                   'void', 
+                   [param('int', 'v'), param('std::string', 'name')])
+    ## enum.h (module 'core'): void ns3::EnumChecker::AddDefault(int v, std::string name) [member function]
+    cls.add_method('AddDefault', 
+                   'void', 
+                   [param('int', 'v'), param('std::string', 'name')])
+    ## enum.h (module 'core'): bool ns3::EnumChecker::Check(ns3::AttributeValue const & value) const [member function]
+    cls.add_method('Check', 
+                   'bool', 
+                   [param('ns3::AttributeValue const &', 'value')], 
+                   is_const=True, is_virtual=True)
+    ## enum.h (module 'core'): bool ns3::EnumChecker::Copy(ns3::AttributeValue const & src, ns3::AttributeValue & dst) const [member function]
+    cls.add_method('Copy', 
+                   'bool', 
+                   [param('ns3::AttributeValue const &', 'src'), param('ns3::AttributeValue &', 'dst')], 
+                   is_const=True, is_virtual=True)
+    ## enum.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::EnumChecker::Create() const [member function]
+    cls.add_method('Create', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## enum.h (module 'core'): std::string ns3::EnumChecker::GetUnderlyingTypeInformation() const [member function]
+    cls.add_method('GetUnderlyingTypeInformation', 
+                   'std::string', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## enum.h (module 'core'): std::string ns3::EnumChecker::GetValueTypeName() const [member function]
+    cls.add_method('GetValueTypeName', 
+                   'std::string', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## enum.h (module 'core'): bool ns3::EnumChecker::HasUnderlyingTypeInformation() const [member function]
+    cls.add_method('HasUnderlyingTypeInformation', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    return
+
+def register_Ns3EnumValue_methods(root_module, cls):
+    ## enum.h (module 'core'): ns3::EnumValue::EnumValue(ns3::EnumValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::EnumValue const &', 'arg0')])
+    ## enum.h (module 'core'): ns3::EnumValue::EnumValue() [constructor]
+    cls.add_constructor([])
+    ## enum.h (module 'core'): ns3::EnumValue::EnumValue(int v) [constructor]
+    cls.add_constructor([param('int', 'v')])
+    ## enum.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::EnumValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## enum.h (module 'core'): bool ns3::EnumValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## enum.h (module 'core'): int ns3::EnumValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'int', 
+                   [], 
+                   is_const=True)
+    ## enum.h (module 'core'): std::string ns3::EnumValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## enum.h (module 'core'): void ns3::EnumValue::Set(int v) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('int', 'v')])
+    return
+
 def register_Ns3ErlangRandomVariable_methods(root_module, cls):
     ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::ErlangRandomVariable::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
@@ -6700,11 +7162,11 @@
     cls.add_constructor([param('ns3::EthernetTrailer const &', 'arg0')])
     ## ethernet-trailer.h (module 'network'): ns3::EthernetTrailer::EthernetTrailer() [constructor]
     cls.add_constructor([])
-    ## ethernet-trailer.h (module 'network'): void ns3::EthernetTrailer::CalcFcs(ns3::Ptr<const ns3::Packet> p) [member function]
+    ## ethernet-trailer.h (module 'network'): void ns3::EthernetTrailer::CalcFcs(ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('CalcFcs', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet const >', 'p')])
-    ## ethernet-trailer.h (module 'network'): bool ns3::EthernetTrailer::CheckFcs(ns3::Ptr<const ns3::Packet> p) const [member function]
+    ## ethernet-trailer.h (module 'network'): bool ns3::EthernetTrailer::CheckFcs(ns3::Ptr<ns3::Packet const> p) const [member function]
     cls.add_method('CheckFcs', 
                    'bool', 
                    [param('ns3::Ptr< ns3::Packet const >', 'p')], 
@@ -6858,6 +7320,39 @@
                    is_virtual=True)
     return
 
+def register_Ns3IntegerValue_methods(root_module, cls):
+    ## integer.h (module 'core'): ns3::IntegerValue::IntegerValue() [constructor]
+    cls.add_constructor([])
+    ## integer.h (module 'core'): ns3::IntegerValue::IntegerValue(ns3::IntegerValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::IntegerValue const &', 'arg0')])
+    ## integer.h (module 'core'): ns3::IntegerValue::IntegerValue(int64_t const & value) [constructor]
+    cls.add_constructor([param('int64_t const &', 'value')])
+    ## integer.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::IntegerValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## integer.h (module 'core'): bool ns3::IntegerValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## integer.h (module 'core'): int64_t ns3::IntegerValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'int64_t', 
+                   [], 
+                   is_const=True)
+    ## integer.h (module 'core'): std::string ns3::IntegerValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## integer.h (module 'core'): void ns3::IntegerValue::Set(int64_t const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('int64_t const &', 'value')])
+    return
+
 def register_Ns3Ipv4AddressChecker_methods(root_module, cls):
     ## ipv4-address.h (module 'network'): ns3::Ipv4AddressChecker::Ipv4AddressChecker() [constructor]
     cls.add_constructor([])
@@ -7087,6 +7582,46 @@
                    is_virtual=True)
     return
 
+def register_Ns3Mac16AddressChecker_methods(root_module, cls):
+    ## mac16-address.h (module 'network'): ns3::Mac16AddressChecker::Mac16AddressChecker() [constructor]
+    cls.add_constructor([])
+    ## mac16-address.h (module 'network'): ns3::Mac16AddressChecker::Mac16AddressChecker(ns3::Mac16AddressChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Mac16AddressChecker const &', 'arg0')])
+    return
+
+def register_Ns3Mac16AddressValue_methods(root_module, cls):
+    ## mac16-address.h (module 'network'): ns3::Mac16AddressValue::Mac16AddressValue() [constructor]
+    cls.add_constructor([])
+    ## mac16-address.h (module 'network'): ns3::Mac16AddressValue::Mac16AddressValue(ns3::Mac16AddressValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Mac16AddressValue const &', 'arg0')])
+    ## mac16-address.h (module 'network'): ns3::Mac16AddressValue::Mac16AddressValue(ns3::Mac16Address const & value) [constructor]
+    cls.add_constructor([param('ns3::Mac16Address const &', 'value')])
+    ## mac16-address.h (module 'network'): ns3::Ptr<ns3::AttributeValue> ns3::Mac16AddressValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mac16-address.h (module 'network'): bool ns3::Mac16AddressValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## mac16-address.h (module 'network'): ns3::Mac16Address ns3::Mac16AddressValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::Mac16Address', 
+                   [], 
+                   is_const=True)
+    ## mac16-address.h (module 'network'): std::string ns3::Mac16AddressValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## mac16-address.h (module 'network'): void ns3::Mac16AddressValue::Set(ns3::Mac16Address const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::Mac16Address const &', 'value')])
+    return
+
 def register_Ns3Mac48AddressChecker_methods(root_module, cls):
     ## mac48-address.h (module 'network'): ns3::Mac48AddressChecker::Mac48AddressChecker() [constructor]
     cls.add_constructor([])
@@ -7127,6 +7662,46 @@
                    [param('ns3::Mac48Address const &', 'value')])
     return
 
+def register_Ns3Mac64AddressChecker_methods(root_module, cls):
+    ## mac64-address.h (module 'network'): ns3::Mac64AddressChecker::Mac64AddressChecker() [constructor]
+    cls.add_constructor([])
+    ## mac64-address.h (module 'network'): ns3::Mac64AddressChecker::Mac64AddressChecker(ns3::Mac64AddressChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Mac64AddressChecker const &', 'arg0')])
+    return
+
+def register_Ns3Mac64AddressValue_methods(root_module, cls):
+    ## mac64-address.h (module 'network'): ns3::Mac64AddressValue::Mac64AddressValue() [constructor]
+    cls.add_constructor([])
+    ## mac64-address.h (module 'network'): ns3::Mac64AddressValue::Mac64AddressValue(ns3::Mac64AddressValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Mac64AddressValue const &', 'arg0')])
+    ## mac64-address.h (module 'network'): ns3::Mac64AddressValue::Mac64AddressValue(ns3::Mac64Address const & value) [constructor]
+    cls.add_constructor([param('ns3::Mac64Address const &', 'value')])
+    ## mac64-address.h (module 'network'): ns3::Ptr<ns3::AttributeValue> ns3::Mac64AddressValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mac64-address.h (module 'network'): bool ns3::Mac64AddressValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## mac64-address.h (module 'network'): ns3::Mac64Address ns3::Mac64AddressValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::Mac64Address', 
+                   [], 
+                   is_const=True)
+    ## mac64-address.h (module 'network'): std::string ns3::Mac64AddressValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## mac64-address.h (module 'network'): void ns3::Mac64AddressValue::Set(ns3::Mac64Address const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::Mac64Address const &', 'value')])
+    return
+
 def register_Ns3MinMaxAvgTotalCalculator__Double_methods(root_module, cls):
     ## basic-data-calculators.h (module 'stats'): ns3::MinMaxAvgTotalCalculator<double>::MinMaxAvgTotalCalculator(ns3::MinMaxAvgTotalCalculator<double> const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::MinMaxAvgTotalCalculator< double > const &', 'arg0')])
@@ -7192,6 +7767,71 @@
                    visibility='protected', is_virtual=True)
     return
 
+def register_Ns3MinMaxAvgTotalCalculator__Unsigned_int_methods(root_module, cls):
+    ## basic-data-calculators.h (module 'stats'): ns3::MinMaxAvgTotalCalculator<unsigned int>::MinMaxAvgTotalCalculator(ns3::MinMaxAvgTotalCalculator<unsigned int> const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MinMaxAvgTotalCalculator< unsigned int > const &', 'arg0')])
+    ## basic-data-calculators.h (module 'stats'): ns3::MinMaxAvgTotalCalculator<unsigned int>::MinMaxAvgTotalCalculator() [constructor]
+    cls.add_constructor([])
+    ## basic-data-calculators.h (module 'stats'): void ns3::MinMaxAvgTotalCalculator<unsigned int>::Output(ns3::DataOutputCallback & callback) const [member function]
+    cls.add_method('Output', 
+                   'void', 
+                   [param('ns3::DataOutputCallback &', 'callback')], 
+                   is_const=True, is_virtual=True)
+    ## basic-data-calculators.h (module 'stats'): void ns3::MinMaxAvgTotalCalculator<unsigned int>::Reset() [member function]
+    cls.add_method('Reset', 
+                   'void', 
+                   [])
+    ## basic-data-calculators.h (module 'stats'): void ns3::MinMaxAvgTotalCalculator<unsigned int>::Update(unsigned int const i) [member function]
+    cls.add_method('Update', 
+                   'void', 
+                   [param('unsigned int const', 'i')])
+    ## basic-data-calculators.h (module 'stats'): long int ns3::MinMaxAvgTotalCalculator<unsigned int>::getCount() const [member function]
+    cls.add_method('getCount', 
+                   'long int', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## basic-data-calculators.h (module 'stats'): double ns3::MinMaxAvgTotalCalculator<unsigned int>::getMax() const [member function]
+    cls.add_method('getMax', 
+                   'double', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## basic-data-calculators.h (module 'stats'): double ns3::MinMaxAvgTotalCalculator<unsigned int>::getMean() const [member function]
+    cls.add_method('getMean', 
+                   'double', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## basic-data-calculators.h (module 'stats'): double ns3::MinMaxAvgTotalCalculator<unsigned int>::getMin() const [member function]
+    cls.add_method('getMin', 
+                   'double', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## basic-data-calculators.h (module 'stats'): double ns3::MinMaxAvgTotalCalculator<unsigned int>::getSqrSum() const [member function]
+    cls.add_method('getSqrSum', 
+                   'double', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## basic-data-calculators.h (module 'stats'): double ns3::MinMaxAvgTotalCalculator<unsigned int>::getStddev() const [member function]
+    cls.add_method('getStddev', 
+                   'double', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## basic-data-calculators.h (module 'stats'): double ns3::MinMaxAvgTotalCalculator<unsigned int>::getSum() const [member function]
+    cls.add_method('getSum', 
+                   'double', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## basic-data-calculators.h (module 'stats'): double ns3::MinMaxAvgTotalCalculator<unsigned int>::getVariance() const [member function]
+    cls.add_method('getVariance', 
+                   'double', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## basic-data-calculators.h (module 'stats'): void ns3::MinMaxAvgTotalCalculator<unsigned int>::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    return
+
 def register_Ns3NetDevice_methods(root_module, cls):
     ## net-device.h (module 'network'): ns3::NetDevice::NetDevice() [constructor]
     cls.add_constructor([])
@@ -7601,7 +8241,7 @@
     cls.add_constructor([param('uint8_t const *', 'buffer'), param('uint32_t', 'size'), param('bool', 'magic')])
     ## packet.h (module 'network'): ns3::Packet::Packet(uint8_t const * buffer, uint32_t size) [constructor]
     cls.add_constructor([param('uint8_t const *', 'buffer'), param('uint32_t', 'size')])
-    ## packet.h (module 'network'): void ns3::Packet::AddAtEnd(ns3::Ptr<const ns3::Packet> packet) [member function]
+    ## packet.h (module 'network'): void ns3::Packet::AddAtEnd(ns3::Ptr<ns3::Packet const> packet) [member function]
     cls.add_method('AddAtEnd', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet const >', 'packet')])
@@ -7759,6 +8399,10 @@
     cls.add_method('RemoveTrailer', 
                    'uint32_t', 
                    [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('ReplacePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
     cls.add_method('Serialize', 
                    'uint32_t', 
@@ -7812,6 +8456,26 @@
                    visibility='private', is_virtual=True)
     return
 
+def register_Ns3PacketSizeMinMaxAvgTotalCalculator_methods(root_module, cls):
+    ## packet-data-calculators.h (module 'network'): ns3::PacketSizeMinMaxAvgTotalCalculator::PacketSizeMinMaxAvgTotalCalculator(ns3::PacketSizeMinMaxAvgTotalCalculator const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PacketSizeMinMaxAvgTotalCalculator const &', 'arg0')])
+    ## packet-data-calculators.h (module 'network'): ns3::PacketSizeMinMaxAvgTotalCalculator::PacketSizeMinMaxAvgTotalCalculator() [constructor]
+    cls.add_constructor([])
+    ## packet-data-calculators.h (module 'network'): void ns3::PacketSizeMinMaxAvgTotalCalculator::FrameUpdate(std::string path, ns3::Ptr<ns3::Packet const> packet, ns3::Mac48Address realto) [member function]
+    cls.add_method('FrameUpdate', 
+                   'void', 
+                   [param('std::string', 'path'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Mac48Address', 'realto')])
+    ## packet-data-calculators.h (module 'network'): void ns3::PacketSizeMinMaxAvgTotalCalculator::PacketUpdate(std::string path, ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('PacketUpdate', 
+                   'void', 
+                   [param('std::string', 'path'), param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## packet-data-calculators.h (module 'network'): void ns3::PacketSizeMinMaxAvgTotalCalculator::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    return
+
 def register_Ns3PacketSocket_methods(root_module, cls):
     ## packet-socket.h (module 'network'): ns3::PacketSocket::PacketSocket(ns3::PacketSocket const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::PacketSocket const &', 'arg0')])
@@ -9021,6 +9685,33 @@
                    visibility='private', is_virtual=True)
     return
 
+def register_Ns3Probe_methods(root_module, cls):
+    ## probe.h (module 'stats'): ns3::Probe::Probe(ns3::Probe const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Probe const &', 'arg0')])
+    ## probe.h (module 'stats'): ns3::Probe::Probe() [constructor]
+    cls.add_constructor([])
+    ## probe.h (module 'stats'): bool ns3::Probe::ConnectByObject(std::string traceSource, ns3::Ptr<ns3::Object> obj) [member function]
+    cls.add_method('ConnectByObject', 
+                   'bool', 
+                   [param('std::string', 'traceSource'), param('ns3::Ptr< ns3::Object >', 'obj')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## probe.h (module 'stats'): void ns3::Probe::ConnectByPath(std::string path) [member function]
+    cls.add_method('ConnectByPath', 
+                   'void', 
+                   [param('std::string', 'path')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## probe.h (module 'stats'): static ns3::TypeId ns3::Probe::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## probe.h (module 'stats'): bool ns3::Probe::IsEnabled() const [member function]
+    cls.add_method('IsEnabled', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    return
+
 def register_Ns3Radvd_methods(root_module, cls):
     ## radvd.h (module 'applications'): ns3::Radvd::Radvd(ns3::Radvd const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::Radvd const &', 'arg0')])
@@ -9595,13 +10286,6 @@
                    visibility='protected', is_virtual=True)
     return
 
-def register_Ns3TimeChecker_methods(root_module, cls):
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor]
-    cls.add_constructor([])
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')])
-    return
-
 def register_Ns3TimeValue_methods(root_module, cls):
     ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
     cls.add_constructor([])
@@ -9900,6 +10584,39 @@
                    visibility='private', is_virtual=True)
     return
 
+def register_Ns3UintegerValue_methods(root_module, cls):
+    ## uinteger.h (module 'core'): ns3::UintegerValue::UintegerValue() [constructor]
+    cls.add_constructor([])
+    ## uinteger.h (module 'core'): ns3::UintegerValue::UintegerValue(ns3::UintegerValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::UintegerValue const &', 'arg0')])
+    ## uinteger.h (module 'core'): ns3::UintegerValue::UintegerValue(uint64_t const & value) [constructor]
+    cls.add_constructor([param('uint64_t const &', 'value')])
+    ## uinteger.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::UintegerValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## uinteger.h (module 'core'): bool ns3::UintegerValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## uinteger.h (module 'core'): uint64_t ns3::UintegerValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## uinteger.h (module 'core'): std::string ns3::UintegerValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## uinteger.h (module 'core'): void ns3::UintegerValue::Set(uint64_t const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('uint64_t const &', 'value')])
+    return
+
 def register_Ns3V4Ping_methods(root_module, cls):
     ## v4ping.h (module 'applications'): ns3::V4Ping::V4Ping(ns3::V4Ping const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::V4Ping const &', 'arg0')])
@@ -9967,6 +10684,37 @@
                    [param('ns3::Address const &', 'value')])
     return
 
+def register_Ns3ApplicationPacketProbe_methods(root_module, cls):
+    ## application-packet-probe.h (module 'applications'): ns3::ApplicationPacketProbe::ApplicationPacketProbe(ns3::ApplicationPacketProbe const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ApplicationPacketProbe const &', 'arg0')])
+    ## application-packet-probe.h (module 'applications'): ns3::ApplicationPacketProbe::ApplicationPacketProbe() [constructor]
+    cls.add_constructor([])
+    ## application-packet-probe.h (module 'applications'): bool ns3::ApplicationPacketProbe::ConnectByObject(std::string traceSource, ns3::Ptr<ns3::Object> obj) [member function]
+    cls.add_method('ConnectByObject', 
+                   'bool', 
+                   [param('std::string', 'traceSource'), param('ns3::Ptr< ns3::Object >', 'obj')], 
+                   is_virtual=True)
+    ## application-packet-probe.h (module 'applications'): void ns3::ApplicationPacketProbe::ConnectByPath(std::string path) [member function]
+    cls.add_method('ConnectByPath', 
+                   'void', 
+                   [param('std::string', 'path')], 
+                   is_virtual=True)
+    ## application-packet-probe.h (module 'applications'): static ns3::TypeId ns3::ApplicationPacketProbe::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## application-packet-probe.h (module 'applications'): void ns3::ApplicationPacketProbe::SetValue(ns3::Ptr<ns3::Packet const> packet, ns3::Address const & address) [member function]
+    cls.add_method('SetValue', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Address const &', 'address')])
+    ## application-packet-probe.h (module 'applications'): static void ns3::ApplicationPacketProbe::SetValueByPath(std::string path, ns3::Ptr<ns3::Packet const> packet, ns3::Address const & address) [member function]
+    cls.add_method('SetValueByPath', 
+                   'void', 
+                   [param('std::string', 'path'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Address const &', 'address')], 
+                   is_static=True)
+    return
+
 def register_Ns3BurstErrorModel_methods(root_module, cls):
     ## error-model.h (module 'network'): ns3::BurstErrorModel::BurstErrorModel(ns3::BurstErrorModel const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::BurstErrorModel const &', 'arg0')])
@@ -10010,6 +10758,87 @@
                    visibility='private', is_virtual=True)
     return
 
+def register_Ns3CounterCalculator__Unsigned_int_methods(root_module, cls):
+    ## basic-data-calculators.h (module 'stats'): ns3::CounterCalculator<unsigned int>::CounterCalculator(ns3::CounterCalculator<unsigned int> const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::CounterCalculator< unsigned int > const &', 'arg0')])
+    ## basic-data-calculators.h (module 'stats'): ns3::CounterCalculator<unsigned int>::CounterCalculator() [constructor]
+    cls.add_constructor([])
+    ## basic-data-calculators.h (module 'stats'): unsigned int ns3::CounterCalculator<unsigned int>::GetCount() const [member function]
+    cls.add_method('GetCount', 
+                   'unsigned int', 
+                   [], 
+                   is_const=True)
+    ## basic-data-calculators.h (module 'stats'): void ns3::CounterCalculator<unsigned int>::Output(ns3::DataOutputCallback & callback) const [member function]
+    cls.add_method('Output', 
+                   'void', 
+                   [param('ns3::DataOutputCallback &', 'callback')], 
+                   is_const=True, is_virtual=True)
+    ## basic-data-calculators.h (module 'stats'): void ns3::CounterCalculator<unsigned int>::Update() [member function]
+    cls.add_method('Update', 
+                   'void', 
+                   [])
+    ## basic-data-calculators.h (module 'stats'): void ns3::CounterCalculator<unsigned int>::Update(unsigned int const i) [member function]
+    cls.add_method('Update', 
+                   'void', 
+                   [param('unsigned int const', 'i')])
+    ## basic-data-calculators.h (module 'stats'): void ns3::CounterCalculator<unsigned int>::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    return
+
+def register_Ns3PacketCounterCalculator_methods(root_module, cls):
+    ## packet-data-calculators.h (module 'network'): ns3::PacketCounterCalculator::PacketCounterCalculator(ns3::PacketCounterCalculator const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PacketCounterCalculator const &', 'arg0')])
+    ## packet-data-calculators.h (module 'network'): ns3::PacketCounterCalculator::PacketCounterCalculator() [constructor]
+    cls.add_constructor([])
+    ## packet-data-calculators.h (module 'network'): void ns3::PacketCounterCalculator::FrameUpdate(std::string path, ns3::Ptr<ns3::Packet const> packet, ns3::Mac48Address realto) [member function]
+    cls.add_method('FrameUpdate', 
+                   'void', 
+                   [param('std::string', 'path'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Mac48Address', 'realto')])
+    ## packet-data-calculators.h (module 'network'): void ns3::PacketCounterCalculator::PacketUpdate(std::string path, ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('PacketUpdate', 
+                   'void', 
+                   [param('std::string', 'path'), param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## packet-data-calculators.h (module 'network'): void ns3::PacketCounterCalculator::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    return
+
+def register_Ns3PacketProbe_methods(root_module, cls):
+    ## packet-probe.h (module 'network'): ns3::PacketProbe::PacketProbe(ns3::PacketProbe const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PacketProbe const &', 'arg0')])
+    ## packet-probe.h (module 'network'): ns3::PacketProbe::PacketProbe() [constructor]
+    cls.add_constructor([])
+    ## packet-probe.h (module 'network'): bool ns3::PacketProbe::ConnectByObject(std::string traceSource, ns3::Ptr<ns3::Object> obj) [member function]
+    cls.add_method('ConnectByObject', 
+                   'bool', 
+                   [param('std::string', 'traceSource'), param('ns3::Ptr< ns3::Object >', 'obj')], 
+                   is_virtual=True)
+    ## packet-probe.h (module 'network'): void ns3::PacketProbe::ConnectByPath(std::string path) [member function]
+    cls.add_method('ConnectByPath', 
+                   'void', 
+                   [param('std::string', 'path')], 
+                   is_virtual=True)
+    ## packet-probe.h (module 'network'): static ns3::TypeId ns3::PacketProbe::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## packet-probe.h (module 'network'): void ns3::PacketProbe::SetValue(ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('SetValue', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## packet-probe.h (module 'network'): static void ns3::PacketProbe::SetValueByPath(std::string path, ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('SetValueByPath', 
+                   'void', 
+                   [param('std::string', 'path'), param('ns3::Ptr< ns3::Packet const >', 'packet')], 
+                   is_static=True)
+    return
+
 def register_Ns3PbbAddressTlv_methods(root_module, cls):
     ## packetbb.h (module 'network'): ns3::PbbAddressTlv::PbbAddressTlv() [constructor]
     cls.add_constructor([])
@@ -10054,18 +10883,135 @@
                    [param('bool', 'isMultivalue')])
     return
 
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_functions(root_module):
     module = root_module
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
+    register_functions_ns3_internal(module.get_submodule('internal'), root_module)
     return
 
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def register_functions_ns3_addressUtils(module, root_module):
     return
 
+def register_functions_ns3_internal(module, root_module):
+    return
+
 def main():
     out = FileCodeSink(sys.stdout)
     root_module = module_init()
diff -Naur ns-3.17/src/applications/helper/radvd-helper.cc ns-3.18/src/applications/helper/radvd-helper.cc
--- ns-3.17/src/applications/helper/radvd-helper.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/applications/helper/radvd-helper.cc	2013-10-26 07:07:30.563364407 -0700
@@ -0,0 +1,128 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Universita' di Firenze
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Tommaso Pecorella <tommaso.pecorella@unifi.it>
+ */
+
+#include "ns3/log.h"
+#include "ns3/assert.h"
+#include "ns3/radvd.h"
+#include "ns3/radvd-interface.h"
+#include "ns3/radvd-prefix.h"
+
+#include "radvd-helper.h"
+
+NS_LOG_COMPONENT_DEFINE ("RadvdHelper");
+
+namespace ns3
+{
+
+RadvdHelper::RadvdHelper ()
+{
+  m_factory.SetTypeId (Radvd::GetTypeId ());
+}
+
+void RadvdHelper::AddAnnouncedPrefix (uint32_t interface, Ipv6Address prefix, uint32_t prefixLength)
+{
+  NS_LOG_FUNCTION(this << int(interface) << prefix << int(prefixLength));
+  if (prefixLength != 64)
+    {
+      NS_LOG_WARN("Adding a non-64 prefix is generally a bad idea. Autoconfiguration might not work.");
+    }
+
+  bool prefixFound = false;
+  if (m_radvdInterfaces.find(interface) == m_radvdInterfaces.end())
+    {
+      m_radvdInterfaces[interface] = Create<RadvdInterface> (interface);
+    }
+  else
+    {
+      RadvdInterface::RadvdPrefixList prefixList = m_radvdInterfaces[interface]->GetPrefixes();
+      RadvdInterface::RadvdPrefixListCI iter;
+      for (iter=prefixList.begin(); iter!=prefixList.end(); iter++)
+        {
+          if ((*iter)->GetNetwork() == prefix)
+            {
+              NS_LOG_LOGIC("Not adding the same prefix twice, skipping " << prefix << " " << int(prefixLength));
+              prefixFound = true;
+              break;
+            }
+        }
+    }
+  if (!prefixFound)
+    {
+      Ptr<RadvdPrefix> routerPrefix = Create<RadvdPrefix> (prefix, prefixLength);
+      m_radvdInterfaces[interface]->AddPrefix(routerPrefix);
+    }
+}
+
+void RadvdHelper::EnableDefaultRouterForInterface (uint32_t interface)
+{
+  if (m_radvdInterfaces.find(interface) == m_radvdInterfaces.end())
+    {
+      m_radvdInterfaces[interface] = Create<RadvdInterface> (interface);
+    }
+  uint32_t maxRtrAdvInterval = m_radvdInterfaces[interface]->GetMaxRtrAdvInterval();
+  m_radvdInterfaces[interface]->SetDefaultLifeTime(3*maxRtrAdvInterval/1000);
+}
+
+void RadvdHelper::DisableDefaultRouterForInterface (uint32_t interface)
+{
+  if (m_radvdInterfaces.find(interface) == m_radvdInterfaces.end())
+    {
+      m_radvdInterfaces[interface] = Create<RadvdInterface> (interface);
+    }
+  m_radvdInterfaces[interface]->SetDefaultLifeTime(0);
+}
+
+Ptr<RadvdInterface> RadvdHelper::GetRadvdInterface (uint32_t interface)
+{
+  if (m_radvdInterfaces.find(interface) == m_radvdInterfaces.end())
+    {
+      m_radvdInterfaces[interface] = Create<RadvdInterface> (interface);
+    }
+  return m_radvdInterfaces[interface];
+}
+
+void RadvdHelper::ClearPrefixes()
+{
+  m_radvdInterfaces.clear();
+}
+
+void RadvdHelper::SetAttribute (std::string name, const AttributeValue& value)
+{
+  m_factory.Set (name, value);
+}
+
+ApplicationContainer RadvdHelper::Install (Ptr<Node> node)
+{
+  ApplicationContainer apps;
+  Ptr<Radvd> radvd = m_factory.Create<Radvd> ();
+  for (RadvdInterfaceMapI iter = m_radvdInterfaces.begin(); iter != m_radvdInterfaces.end(); iter ++)
+    {
+      if (!iter->second->GetPrefixes().empty())
+        {
+          radvd->AddConfiguration(iter->second);
+        }
+    }
+  node->AddApplication (radvd);
+  apps.Add (radvd);
+  return apps;
+}
+
+} /* namespace ns3 */
+
diff -Naur ns-3.17/src/applications/helper/radvd-helper.h ns-3.18/src/applications/helper/radvd-helper.h
--- ns-3.17/src/applications/helper/radvd-helper.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/applications/helper/radvd-helper.h	2013-10-26 07:07:30.567364406 -0700
@@ -0,0 +1,112 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Universita' di Firenze
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Tommaso Pecorella <tommaso.pecorella@unifi.it>
+ */
+
+#ifndef RADVD_HELPER_H
+#define RADVD_HELPER_H
+
+#include <stdint.h>
+#include <list>
+#include <map>
+
+#include "ns3/object-factory.h"
+#include "ns3/ipv6-address.h"
+
+#include "ns3/application-container.h"
+#include "ns3/node-container.h"
+#include "ns3/radvd-interface.h"
+
+namespace ns3 {
+
+/**
+ * \class RadvdHelper
+ * \brief Radvd application helper.
+ */
+class RadvdHelper
+{
+public:
+  /**
+   * \brief Constructor.
+   */
+  RadvdHelper ();
+
+  /**
+   * \brief Add a new prefix to be announced through an interface.
+   * \param interface outgoing interface
+   * \param prefix announced IPv6 prefix
+   * \param prefixLength announced IPv6 prefix length
+   */
+  void AddAnnouncedPrefix (uint32_t interface, Ipv6Address prefix, uint32_t prefixLength);
+
+  /**
+   * \brief Enable the router as default router for the interface.
+   * The effect is to set the Router Lifetime to the default value (30 minutes)
+   * \param interface outgoing interface
+   */
+  void EnableDefaultRouterForInterface (uint32_t interface);
+
+  /**
+   * \brief Disable the router as default router for the interface.
+   * The effect is to set the Router Lifetime to zero
+   * \param interface outgoing interface
+   */
+  void DisableDefaultRouterForInterface (uint32_t interface);
+
+  /**
+   * \brief Get the low-level radvdInterface specification for an interface.
+   * This method is provided to enable fine-grain parameter setup.
+   * \param interface outgoing interface
+   */
+  Ptr<RadvdInterface> GetRadvdInterface (uint32_t interface);
+
+  /**
+   * \brief Clear the stored Prefixes
+   */
+  void ClearPrefixes ();
+
+  /**
+   * \brief Set some attributes.
+   * \param name attribute name
+   * \param value attribute value
+   */
+  void SetAttribute (std::string name, const AttributeValue& value);
+
+  /**
+   * \brief Install the application in a Node.
+   * \param node the Node
+   * \return application container
+   */
+  ApplicationContainer Install (Ptr<Node> node);
+
+private:
+  /**
+   * \brief An object factory.
+   */
+  ObjectFactory m_factory;
+
+  typedef std::map<uint32_t, Ptr<RadvdInterface> > RadvdInterfaceMap;
+  typedef std::map<uint32_t, Ptr<RadvdInterface> >::iterator RadvdInterfaceMapI;
+
+  RadvdInterfaceMap m_radvdInterfaces;
+};
+
+} /* namespace ns3 */
+
+#endif /* RADVD_HELPER_H */
+
diff -Naur ns-3.17/src/applications/model/application-packet-probe.cc ns-3.18/src/applications/model/application-packet-probe.cc
--- ns-3.17/src/applications/model/application-packet-probe.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/applications/model/application-packet-probe.cc	2013-10-26 07:07:30.567364406 -0700
@@ -0,0 +1,119 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2011 Bucknell University
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Authors: L. Felipe Perrone (perrone@bucknell.edu)
+ *          Tiago G. Rodrigues (tgr002@bucknell.edu)
+ *
+ * Modified by: Mitch Watrous (watrous@u.washington.edu)
+ */
+
+#include "ns3/application-packet-probe.h"
+#include "ns3/object.h"
+#include "ns3/log.h"
+#include "ns3/names.h"
+#include "ns3/config.h"
+#include "ns3/trace-source-accessor.h"
+
+NS_LOG_COMPONENT_DEFINE ("ApplicationPacketProbe");
+
+namespace ns3 {
+
+NS_OBJECT_ENSURE_REGISTERED (ApplicationPacketProbe);
+
+TypeId
+ApplicationPacketProbe::GetTypeId ()
+{
+  static TypeId tid = TypeId ("ns3::ApplicationPacketProbe")
+    .SetParent<Probe> ()
+    .AddConstructor<ApplicationPacketProbe> ()
+    .AddTraceSource ( "Output",
+                      "The packet plus its socket address that serve as the output for this probe",
+                      MakeTraceSourceAccessor (&ApplicationPacketProbe::m_output))
+    .AddTraceSource ( "OutputBytes",
+                      "The number of bytes in the packet",
+                      MakeTraceSourceAccessor (&ApplicationPacketProbe::m_outputBytes))
+  ;
+  return tid;
+}
+
+ApplicationPacketProbe::ApplicationPacketProbe ()
+{
+  NS_LOG_FUNCTION (this);
+  m_packet = 0;
+}
+
+ApplicationPacketProbe::~ApplicationPacketProbe ()
+{
+  NS_LOG_FUNCTION (this);
+}
+
+void
+ApplicationPacketProbe::SetValue (Ptr<const Packet> packet, const Address& address)
+{
+  NS_LOG_FUNCTION (this << packet << address);
+  m_packet  = packet;
+  m_address = address;
+  m_output (packet, address);
+
+  uint32_t packetSizeNew = packet->GetSize ();
+  m_outputBytes (m_packetSizeOld, packetSizeNew);
+  m_packetSizeOld = packetSizeNew;
+}
+
+void
+ApplicationPacketProbe::SetValueByPath (std::string path, Ptr<const Packet> packet, const Address& address)
+{
+  NS_LOG_FUNCTION (path << packet << address);
+  Ptr<ApplicationPacketProbe> probe = Names::Find<ApplicationPacketProbe> (path);
+  NS_ASSERT_MSG (probe, "Error:  Can't find probe for path " << path);
+  probe->SetValue (packet, address);
+}
+
+bool
+ApplicationPacketProbe::ConnectByObject (std::string traceSource, Ptr<Object> obj)
+{
+  NS_LOG_FUNCTION (this << traceSource << obj);
+  NS_LOG_DEBUG ("Name of probe (if any) in names database: " << Names::FindPath (obj));
+  bool connected = obj->TraceConnectWithoutContext (traceSource, MakeCallback (&ns3::ApplicationPacketProbe::TraceSink, this));
+  return connected;
+}
+
+void
+ApplicationPacketProbe::ConnectByPath (std::string path)
+{
+  NS_LOG_FUNCTION (this << path);
+  NS_LOG_DEBUG ("Name of probe to search for in config database: " << path);
+  Config::ConnectWithoutContext (path, MakeCallback (&ns3::ApplicationPacketProbe::TraceSink, this));
+}
+
+void
+ApplicationPacketProbe::TraceSink (Ptr<const Packet> packet, const Address& address)
+{
+  NS_LOG_FUNCTION (this << packet << address);
+  if (IsEnabled ())
+    {
+      m_packet  = packet;
+      m_address = address;
+      m_output (packet, address);
+
+      uint32_t packetSizeNew = packet->GetSize ();
+      m_outputBytes (m_packetSizeOld, packetSizeNew);
+      m_packetSizeOld = packetSizeNew;
+    }
+}
+
+} // namespace ns3
diff -Naur ns-3.17/src/applications/model/application-packet-probe.h ns-3.18/src/applications/model/application-packet-probe.h
--- ns-3.17/src/applications/model/application-packet-probe.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/applications/model/application-packet-probe.h	2013-10-26 07:07:30.567364406 -0700
@@ -0,0 +1,120 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2011 Bucknell University
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Authors: L. Felipe Perrone (perrone@bucknell.edu)
+ *          Tiago G. Rodrigues (tgr002@bucknell.edu)
+ *
+ * Modified by: Mitch Watrous (watrous@u.washington.edu)
+ */
+
+#ifndef APPLICATION_PACKET_PROBE_H
+#define APPLICATION_PACKET_PROBE_H
+
+#include "ns3/object.h"
+#include "ns3/callback.h"
+#include "ns3/boolean.h"
+#include "ns3/nstime.h"
+#include "ns3/packet.h"
+#include "ns3/application.h"
+#include "ns3/traced-value.h"
+#include "ns3/simulator.h"
+#include "ns3/probe.h"
+
+namespace ns3 {
+
+/**
+ * This class is designed to probe an underlying ns3 TraceSource
+ * exporting a packet and a socket address.  This probe exports a
+ * trace source "Output" with arguments of type Ptr<const Packet> and
+ * const Address&.  This probe exports another trace source
+ * "OutputBytes" with arguments of type uint32_t, which is the number
+ * of bytes in the packet.  The trace sources emit values when either
+ * the probed trace source emits a new value, or when SetValue () is
+ * called.
+ */
+class ApplicationPacketProbe : public Probe
+{
+public:
+  static TypeId GetTypeId ();
+  ApplicationPacketProbe ();
+  virtual ~ApplicationPacketProbe ();
+
+  /**
+   * \brief Set a probe value
+   *
+   * \param packet set the traced packet equal to this
+   * \param address set the socket address for the traced packet equal to this
+   */
+  void SetValue (Ptr<const Packet> packet, const Address& address);
+
+  /**
+   * \brief Set a probe value by its name in the Config system
+   *
+   * \param path config path to access the probe
+   * \param packet set the traced packet equal to this
+   * \param address set the socket address for the traced packet equal to this
+   */
+  static void SetValueByPath (std::string path, Ptr<const Packet> packet, const Address& address);
+
+  /**
+   * \brief connect to a trace source attribute provided by a given object
+   *
+   * \param traceSource the name of the attribute TraceSource to connect to
+   * \param obj ns3::Object to connect to
+   * \return true if the trace source was successfully connected
+   */
+  virtual bool ConnectByObject (std::string traceSource, Ptr<Object> obj);
+
+  /**
+   * \brief connect to a trace source provided by a config path
+   *
+   * \param path Config path to bind to
+   *
+   * Note, if an invalid path is provided, the probe will not be connected
+   * to anything.
+   */
+  virtual void ConnectByPath (std::string path);
+
+private:
+  /**
+   * \brief Method to connect to an underlying ns3::TraceSource with
+   * arguments of type Ptr<const Packet> and const Address&
+   *
+   * \param packet the traced packet
+   * \param address the socket address for the traced packet
+   *
+   * \internal
+   */
+  void TraceSink (Ptr<const Packet> packet, const Address& address);
+
+  TracedCallback<Ptr<const Packet>, const Address&> m_output;
+  TracedCallback<uint32_t, uint32_t> m_outputBytes;
+
+  /// The traced packet.
+  Ptr<const Packet> m_packet;
+
+  /// The socket address for the traced packet.
+  Address m_address;
+
+  /// The size of the traced packet.
+  uint32_t m_packetSizeOld;
+};
+
+
+} // namespace ns3
+
+#endif // APPLICATION_PACKET_PROBE_H
diff -Naur ns-3.17/src/applications/model/ping6.cc ns-3.18/src/applications/model/ping6.cc
--- ns-3.17/src/applications/model/ping6.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/applications/model/ping6.cc	2013-10-26 07:07:30.571364406 -0700
@@ -171,8 +171,17 @@
       /* hack to have ifIndex in Ipv6RawSocketImpl
        * maybe add a SetIfIndex in Ipv6RawSocketImpl directly 
        */
-      src = GetNode ()->GetObject<Ipv6> ()->GetAddress (m_ifIndex, 0).GetAddress ();
-    }
+      Ipv6InterfaceAddress dstIa (m_peerAddress);
+      for (uint32_t i = 0; i < GetNode ()->GetObject<Ipv6> ()->GetNAddresses (m_ifIndex); i++)
+        {
+          src = GetNode ()->GetObject<Ipv6> ()->GetAddress (m_ifIndex, i).GetAddress ();
+          Ipv6InterfaceAddress srcIa (src);
+          if ( srcIa.GetScope() == dstIa.GetScope() )
+            {
+              break;
+            }
+        }
+     }
   else
     {
       src = m_localAddress;
diff -Naur ns-3.17/src/applications/model/radvd-interface.cc ns-3.18/src/applications/model/radvd-interface.cc
--- ns-3.17/src/applications/model/radvd-interface.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/applications/model/radvd-interface.cc	2013-10-26 07:07:30.567364406 -0700
@@ -41,7 +41,7 @@
   m_reachableTime = 0; /* means unspecified for the router */
   m_retransTimer = 0; /* means unspecified for the router */
   m_curHopLimit = 64;
-  m_defaultLifeTime = 3 * m_maxRtrAdvInterval;
+  m_defaultLifeTime = (3 * m_maxRtrAdvInterval) / 1000;
   m_defaultPreference = 1;
   m_sourceLLAddress = true;
   m_homeAgentFlag = false;
diff -Naur ns-3.17/src/applications/model/radvd-interface.h ns-3.18/src/applications/model/radvd-interface.h
--- ns-3.17/src/applications/model/radvd-interface.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/applications/model/radvd-interface.h	2013-10-26 07:07:30.567364406 -0700
@@ -36,6 +36,10 @@
 class RadvdInterface : public SimpleRefCount<RadvdInterface>
 {
 public:
+  typedef std::list<Ptr<RadvdPrefix> > RadvdPrefixList;
+  typedef std::list<Ptr<RadvdPrefix> >::iterator RadvdPrefixListI;
+  typedef std::list<Ptr<RadvdPrefix> >::const_iterator RadvdPrefixListCI;
+
   /**
    * \brief Constructor.
    * \param interface interface index
@@ -65,7 +69,7 @@
    * \brief Get list of prefixes advertised for this interface.
    * \return list of IPv6 prefixes
    */
-  std::list <Ptr<RadvdPrefix> > GetPrefixes () const;
+  RadvdPrefixList GetPrefixes () const;
 
   /**
    * \brief Add a prefix to advertise on interface.
@@ -302,8 +306,6 @@
   void SetIntervalOpt (bool intervalOpt);
 
 private:
-  typedef std::list<Ptr<RadvdPrefix> > RadvdPrefixList;
-  typedef std::list<Ptr<RadvdPrefix> >::iterator RadvdPrefixListI;
 
   /**
    * \brief Interface to advertise RA.
diff -Naur ns-3.17/src/applications/model/radvd-prefix.h ns-3.18/src/applications/model/radvd-prefix.h
--- ns-3.17/src/applications/model/radvd-prefix.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/applications/model/radvd-prefix.h	2013-10-26 07:07:30.567364406 -0700
@@ -165,7 +165,7 @@
   bool m_onLinkFlag;
 
   /**
-   * \brief Autonomous flag, it is used for autonomous address configuration (RFC 2462).
+   * \brief Autonomous flag, it is used for autonomous address configuration (\RFC{2462}).
    */
   bool m_autonomousFlag;
 
diff -Naur ns-3.17/src/applications/test/udp-client-server-test.cc ns-3.18/src/applications/test/udp-client-server-test.cc
--- ns-3.17/src/applications/test/udp-client-server-test.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/applications/test/udp-client-server-test.cc	2013-10-26 07:07:30.587364407 -0700
@@ -257,7 +257,7 @@
 }
 
 /**
- * Test fix for bug 1378
+ * Test fix for \bugid{1378}
  */
 
 class UdpEchoClientSetFillTestCase : public TestCase
diff -Naur ns-3.17/src/applications/wscript ns-3.18/src/applications/wscript
--- ns-3.17/src/applications/wscript	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/applications/wscript	2013-10-26 07:07:30.563364407 -0700
@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    module = bld.create_ns3_module('applications', ['internet', 'config-store', 'tools'])
+    module = bld.create_ns3_module('applications', ['internet', 'config-store','stats'])
     module.source = [
         'model/bulk-send-application.cc',
         'model/onoff-application.cc',
@@ -18,6 +18,7 @@
         'model/udp-echo-client.cc',
         'model/udp-echo-server.cc',
         'model/v4ping.cc',
+        'model/application-packet-probe.cc',
         'helper/bulk-send-helper.cc',
         'helper/on-off-helper.cc',
         'helper/packet-sink-helper.cc',
@@ -25,6 +26,7 @@
         'helper/udp-client-server-helper.cc',
         'helper/udp-echo-helper.cc',
         'helper/v4ping-helper.cc',
+        'helper/radvd-helper.cc',
         ]
 
     applications_test = bld.create_ns3_module_test_library('applications')
@@ -50,6 +52,7 @@
         'model/udp-echo-client.h',
         'model/udp-echo-server.h',
         'model/v4ping.h',
+        'model/application-packet-probe.h',
         'helper/bulk-send-helper.h',
         'helper/on-off-helper.h',
         'helper/packet-sink-helper.h',
@@ -57,6 +60,7 @@
         'helper/udp-client-server-helper.h',
         'helper/udp-echo-helper.h',
         'helper/v4ping-helper.h',
+        'helper/radvd-helper.h',
         ]
 
     bld.ns3_python_bindings()
diff -Naur ns-3.17/src/bridge/bindings/modulegen__gcc_ILP32.py ns-3.18/src/bridge/bindings/modulegen__gcc_ILP32.py
--- ns-3.17/src/bridge/bindings/modulegen__gcc_ILP32.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/bridge/bindings/modulegen__gcc_ILP32.py	2013-10-26 07:07:30.075364394 -0700
@@ -32,6 +32,8 @@
     module.add_class('BridgeHelper')
     ## callback.h (module 'core'): ns3::CallbackBase [class]
     module.add_class('CallbackBase', import_from_module='ns.core')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
     ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
     module.add_class('Ipv4Address', import_from_module='ns.network')
     ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
@@ -84,6 +86,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::AttributeValue', 'ns3::empty', 'ns3::DefaultDeleter<ns3::AttributeValue>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::TraceSourceAccessor', 'ns3::empty', 'ns3::DefaultDeleter<ns3::TraceSourceAccessor>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## nstime.h (module 'core'): ns3::Time [class]
@@ -138,8 +142,6 @@
     module.add_class('ObjectFactoryChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## object-factory.h (module 'core'): ns3::ObjectFactoryValue [class]
     module.add_class('ObjectFactoryValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
-    ## nstime.h (module 'core'): ns3::TimeChecker [class]
-    module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
     module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
@@ -160,17 +162,54 @@
     nested_module = module.add_cpp_namespace('FatalImpl')
     register_types_ns3_FatalImpl(nested_module)
     
+    
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
 
 def register_types_ns3_FatalImpl(module):
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_methods(root_module):
     register_Ns3Address_methods(root_module, root_module['ns3::Address'])
     register_Ns3AttributeConstructionList_methods(root_module, root_module['ns3::AttributeConstructionList'])
     register_Ns3AttributeConstructionListItem_methods(root_module, root_module['ns3::AttributeConstructionList::Item'])
     register_Ns3BridgeHelper_methods(root_module, root_module['ns3::BridgeHelper'])
     register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3Ipv4Address_methods(root_module, root_module['ns3::Ipv4Address'])
     register_Ns3Ipv4Mask_methods(root_module, root_module['ns3::Ipv4Mask'])
     register_Ns3Ipv6Address_methods(root_module, root_module['ns3::Ipv6Address'])
@@ -193,6 +232,7 @@
     register_Ns3SimpleRefCount__Ns3AttributeChecker_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeChecker__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> >'])
     register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >'])
     register_Ns3Time_methods(root_module, root_module['ns3::Time'])
     register_Ns3TraceSourceAccessor_methods(root_module, root_module['ns3::TraceSourceAccessor'])
@@ -217,7 +257,6 @@
     register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice'])
     register_Ns3ObjectFactoryChecker_methods(root_module, root_module['ns3::ObjectFactoryChecker'])
     register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue'])
-    register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
     register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
@@ -225,6 +264,11 @@
     register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue'])
     register_Ns3BridgeChannel_methods(root_module, root_module['ns3::BridgeChannel'])
     register_Ns3BridgeNetDevice_methods(root_module, root_module['ns3::BridgeNetDevice'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     return
 
 def register_Ns3Address_methods(root_module, cls):
@@ -375,6 +419,35 @@
                    is_static=True, visibility='protected')
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3Ipv4Address_methods(root_module, cls):
     cls.add_binary_comparison_operator('<')
     cls.add_binary_comparison_operator('!=')
@@ -640,6 +713,11 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
     cls.add_method('IsEqual', 
                    'bool', 
@@ -679,16 +757,36 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
     cls.add_method('MakeAutoconfiguredAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
     cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'mac')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
     cls.add_method('MakeIpv4MappedAddress', 
                    'ns3::Ipv6Address', 
@@ -1126,6 +1224,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -1185,6 +1288,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -1480,6 +1593,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -1626,11 +1751,26 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
     cls.add_method('SetResolution', 
                    'void', 
                    [param('ns3::Time::Unit', 'resolution')], 
                    is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
     cls.add_method('To', 
                    'ns3::int64x64_t', 
@@ -2234,13 +2374,6 @@
                    [param('ns3::ObjectFactory const &', 'value')])
     return
 
-def register_Ns3TimeChecker_methods(root_module, cls):
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor]
-    cls.add_constructor([])
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')])
-    return
-
 def register_Ns3TimeValue_methods(root_module, cls):
     ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
     cls.add_constructor([])
@@ -2552,14 +2685,127 @@
                    visibility='protected')
     return
 
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_functions(root_module):
     module = root_module
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     return
 
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def main():
     out = FileCodeSink(sys.stdout)
     root_module = module_init()
diff -Naur ns-3.17/src/bridge/bindings/modulegen__gcc_LP64.py ns-3.18/src/bridge/bindings/modulegen__gcc_LP64.py
--- ns-3.17/src/bridge/bindings/modulegen__gcc_LP64.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/bridge/bindings/modulegen__gcc_LP64.py	2013-10-26 07:07:30.075364394 -0700
@@ -32,6 +32,8 @@
     module.add_class('BridgeHelper')
     ## callback.h (module 'core'): ns3::CallbackBase [class]
     module.add_class('CallbackBase', import_from_module='ns.core')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
     ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
     module.add_class('Ipv4Address', import_from_module='ns.network')
     ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
@@ -84,6 +86,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::AttributeValue', 'ns3::empty', 'ns3::DefaultDeleter<ns3::AttributeValue>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::TraceSourceAccessor', 'ns3::empty', 'ns3::DefaultDeleter<ns3::TraceSourceAccessor>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## nstime.h (module 'core'): ns3::Time [class]
@@ -138,8 +142,6 @@
     module.add_class('ObjectFactoryChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## object-factory.h (module 'core'): ns3::ObjectFactoryValue [class]
     module.add_class('ObjectFactoryValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
-    ## nstime.h (module 'core'): ns3::TimeChecker [class]
-    module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
     module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
@@ -160,17 +162,54 @@
     nested_module = module.add_cpp_namespace('FatalImpl')
     register_types_ns3_FatalImpl(nested_module)
     
+    
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
 
 def register_types_ns3_FatalImpl(module):
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_methods(root_module):
     register_Ns3Address_methods(root_module, root_module['ns3::Address'])
     register_Ns3AttributeConstructionList_methods(root_module, root_module['ns3::AttributeConstructionList'])
     register_Ns3AttributeConstructionListItem_methods(root_module, root_module['ns3::AttributeConstructionList::Item'])
     register_Ns3BridgeHelper_methods(root_module, root_module['ns3::BridgeHelper'])
     register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3Ipv4Address_methods(root_module, root_module['ns3::Ipv4Address'])
     register_Ns3Ipv4Mask_methods(root_module, root_module['ns3::Ipv4Mask'])
     register_Ns3Ipv6Address_methods(root_module, root_module['ns3::Ipv6Address'])
@@ -193,6 +232,7 @@
     register_Ns3SimpleRefCount__Ns3AttributeChecker_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeChecker__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> >'])
     register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >'])
     register_Ns3Time_methods(root_module, root_module['ns3::Time'])
     register_Ns3TraceSourceAccessor_methods(root_module, root_module['ns3::TraceSourceAccessor'])
@@ -217,7 +257,6 @@
     register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice'])
     register_Ns3ObjectFactoryChecker_methods(root_module, root_module['ns3::ObjectFactoryChecker'])
     register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue'])
-    register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
     register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
@@ -225,6 +264,11 @@
     register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue'])
     register_Ns3BridgeChannel_methods(root_module, root_module['ns3::BridgeChannel'])
     register_Ns3BridgeNetDevice_methods(root_module, root_module['ns3::BridgeNetDevice'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     return
 
 def register_Ns3Address_methods(root_module, cls):
@@ -375,6 +419,35 @@
                    is_static=True, visibility='protected')
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3Ipv4Address_methods(root_module, cls):
     cls.add_binary_comparison_operator('<')
     cls.add_binary_comparison_operator('!=')
@@ -640,6 +713,11 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
     cls.add_method('IsEqual', 
                    'bool', 
@@ -679,16 +757,36 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
     cls.add_method('MakeAutoconfiguredAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
     cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'mac')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
     cls.add_method('MakeIpv4MappedAddress', 
                    'ns3::Ipv6Address', 
@@ -1126,6 +1224,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -1185,6 +1288,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -1480,6 +1593,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -1626,11 +1751,26 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
     cls.add_method('SetResolution', 
                    'void', 
                    [param('ns3::Time::Unit', 'resolution')], 
                    is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
     cls.add_method('To', 
                    'ns3::int64x64_t', 
@@ -2234,13 +2374,6 @@
                    [param('ns3::ObjectFactory const &', 'value')])
     return
 
-def register_Ns3TimeChecker_methods(root_module, cls):
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor]
-    cls.add_constructor([])
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')])
-    return
-
 def register_Ns3TimeValue_methods(root_module, cls):
     ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
     cls.add_constructor([])
@@ -2552,14 +2685,127 @@
                    visibility='protected')
     return
 
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_functions(root_module):
     module = root_module
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     return
 
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def main():
     out = FileCodeSink(sys.stdout)
     root_module = module_init()
diff -Naur ns-3.17/src/buildings/bindings/modulegen__gcc_ILP32.py ns-3.18/src/buildings/bindings/modulegen__gcc_ILP32.py
--- ns-3.17/src/buildings/bindings/modulegen__gcc_ILP32.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/buildings/bindings/modulegen__gcc_ILP32.py	2013-10-26 07:07:29.551364380 -0700
@@ -46,6 +46,8 @@
     module.add_class('CallbackBase', import_from_module='ns.core')
     ## constant-velocity-helper.h (module 'mobility'): ns3::ConstantVelocityHelper [class]
     module.add_class('ConstantVelocityHelper', import_from_module='ns.mobility')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
     ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
     module.add_class('Ipv4Address', import_from_module='ns.network')
     ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
@@ -122,6 +124,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::AttributeValue', 'ns3::empty', 'ns3::DefaultDeleter<ns3::AttributeValue>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::TraceSourceAccessor', 'ns3::empty', 'ns3::DefaultDeleter<ns3::TraceSourceAccessor>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## propagation-loss-model.h (module 'propagation'): ns3::ThreeLogDistancePropagationLossModel [class]
@@ -224,8 +228,8 @@
     module.add_class('LogNormalRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
     ## propagation-loss-model.h (module 'propagation'): ns3::MatrixPropagationLossModel [class]
     module.add_class('MatrixPropagationLossModel', import_from_module='ns.propagation', parent=root_module['ns3::PropagationLossModel'])
-    ## mobility-model.h (module 'mobility'): ns3::MobilityModel [class]
-    module.add_class('MobilityModel', import_from_module='ns.mobility', parent=root_module['ns3::Object'])
+    ## mobility-building-info.h (module 'buildings'): ns3::MobilityBuildingInfo [class]
+    module.add_class('MobilityBuildingInfo', parent=root_module['ns3::Object'])
     ## propagation-loss-model.h (module 'propagation'): ns3::NakagamiPropagationLossModel [class]
     module.add_class('NakagamiPropagationLossModel', import_from_module='ns.propagation', parent=root_module['ns3::PropagationLossModel'])
     ## net-device.h (module 'network'): ns3::NetDevice [class]
@@ -244,8 +248,6 @@
     module.add_class('OhBuildingsPropagationLossModel', parent=root_module['ns3::BuildingsPropagationLossModel'])
     ## random-variable-stream.h (module 'core'): ns3::ParetoRandomVariable [class]
     module.add_class('ParetoRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
-    ## nstime.h (module 'core'): ns3::TimeChecker [class]
-    module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
     module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
@@ -264,8 +266,6 @@
     module.add_class('AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
     ## address.h (module 'network'): ns3::AddressValue [class]
     module.add_class('AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
-    ## buildings-mobility-model.h (module 'buildings'): ns3::BuildingsMobilityModel [class]
-    module.add_class('BuildingsMobilityModel', parent=root_module['ns3::MobilityModel'])
     typehandlers.add_type_alias('ns3::Vector3DValue', 'ns3::VectorValue')
     typehandlers.add_type_alias('ns3::Vector3DValue*', 'ns3::VectorValue*')
     typehandlers.add_type_alias('ns3::Vector3DValue&', 'ns3::VectorValue&')
@@ -284,11 +284,47 @@
     nested_module = module.add_cpp_namespace('FatalImpl')
     register_types_ns3_FatalImpl(nested_module)
     
+    
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
 
 def register_types_ns3_FatalImpl(module):
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_methods(root_module):
     register_Ns3Address_methods(root_module, root_module['ns3::Address'])
     register_Ns3AttributeConstructionList_methods(root_module, root_module['ns3::AttributeConstructionList'])
@@ -299,6 +335,7 @@
     register_Ns3BuildingsHelper_methods(root_module, root_module['ns3::BuildingsHelper'])
     register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase'])
     register_Ns3ConstantVelocityHelper_methods(root_module, root_module['ns3::ConstantVelocityHelper'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3Ipv4Address_methods(root_module, root_module['ns3::Ipv4Address'])
     register_Ns3Ipv4Mask_methods(root_module, root_module['ns3::Ipv4Mask'])
     register_Ns3Ipv6Address_methods(root_module, root_module['ns3::Ipv6Address'])
@@ -334,6 +371,7 @@
     register_Ns3SimpleRefCount__Ns3AttributeChecker_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeChecker__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> >'])
     register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >'])
     register_Ns3ThreeLogDistancePropagationLossModel_methods(root_module, root_module['ns3::ThreeLogDistancePropagationLossModel'])
     register_Ns3Time_methods(root_module, root_module['ns3::Time'])
@@ -380,7 +418,7 @@
     register_Ns3LogDistancePropagationLossModel_methods(root_module, root_module['ns3::LogDistancePropagationLossModel'])
     register_Ns3LogNormalRandomVariable_methods(root_module, root_module['ns3::LogNormalRandomVariable'])
     register_Ns3MatrixPropagationLossModel_methods(root_module, root_module['ns3::MatrixPropagationLossModel'])
-    register_Ns3MobilityModel_methods(root_module, root_module['ns3::MobilityModel'])
+    register_Ns3MobilityBuildingInfo_methods(root_module, root_module['ns3::MobilityBuildingInfo'])
     register_Ns3NakagamiPropagationLossModel_methods(root_module, root_module['ns3::NakagamiPropagationLossModel'])
     register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice'])
     register_Ns3Node_methods(root_module, root_module['ns3::Node'])
@@ -389,7 +427,6 @@
     register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue'])
     register_Ns3OhBuildingsPropagationLossModel_methods(root_module, root_module['ns3::OhBuildingsPropagationLossModel'])
     register_Ns3ParetoRandomVariable_methods(root_module, root_module['ns3::ParetoRandomVariable'])
-    register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
     register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
@@ -399,7 +436,11 @@
     register_Ns3Vector3DValue_methods(root_module, root_module['ns3::Vector3DValue'])
     register_Ns3AddressChecker_methods(root_module, root_module['ns3::AddressChecker'])
     register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue'])
-    register_Ns3BuildingsMobilityModel_methods(root_module, root_module['ns3::BuildingsMobilityModel'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     return
 
 def register_Ns3Address_methods(root_module, cls):
@@ -637,10 +678,20 @@
     cls.add_constructor([])
     ## buildings-helper.h (module 'buildings'): ns3::BuildingsHelper::BuildingsHelper(ns3::BuildingsHelper const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::BuildingsHelper const &', 'arg0')])
-    ## buildings-helper.h (module 'buildings'): static void ns3::BuildingsHelper::MakeConsistent(ns3::Ptr<ns3::BuildingsMobilityModel> bmm) [member function]
+    ## buildings-helper.h (module 'buildings'): static void ns3::BuildingsHelper::Install(ns3::Ptr<ns3::Node> node) [member function]
+    cls.add_method('Install', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Node >', 'node')], 
+                   is_static=True)
+    ## buildings-helper.h (module 'buildings'): static void ns3::BuildingsHelper::Install(ns3::NodeContainer c) [member function]
+    cls.add_method('Install', 
+                   'void', 
+                   [param('ns3::NodeContainer', 'c')], 
+                   is_static=True)
+    ## buildings-helper.h (module 'buildings'): static void ns3::BuildingsHelper::MakeConsistent(ns3::Ptr<ns3::MobilityModel> bmm) [member function]
     cls.add_method('MakeConsistent', 
                    'void', 
-                   [param('ns3::Ptr< ns3::BuildingsMobilityModel >', 'bmm')], 
+                   [param('ns3::Ptr< ns3::MobilityModel >', 'bmm')], 
                    is_static=True)
     ## buildings-helper.h (module 'buildings'): static void ns3::BuildingsHelper::MakeMobilityModelConsistent() [member function]
     cls.add_method('MakeMobilityModelConsistent', 
@@ -721,6 +772,35 @@
                    is_const=True)
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3Ipv4Address_methods(root_module, cls):
     cls.add_binary_comparison_operator('<')
     cls.add_binary_comparison_operator('!=')
@@ -986,6 +1066,11 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
     cls.add_method('IsEqual', 
                    'bool', 
@@ -1025,16 +1110,36 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
     cls.add_method('MakeAutoconfiguredAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
     cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'mac')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
     cls.add_method('MakeIpv4MappedAddress', 
                    'ns3::Ipv6Address', 
@@ -1419,6 +1524,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -1478,6 +1588,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -2155,6 +2275,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -2321,11 +2453,26 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
     cls.add_method('SetResolution', 
                    'void', 
                    [param('ns3::Time::Unit', 'resolution')], 
                    is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
     cls.add_method('To', 
                    'ns3::int64x64_t', 
@@ -2421,14 +2568,10 @@
                    is_static=True)
     ## propagation-loss-model.h (module 'propagation'): ns3::TwoRayGroundPropagationLossModel::TwoRayGroundPropagationLossModel() [constructor]
     cls.add_constructor([])
-    ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetLambda(double frequency, double speed) [member function]
-    cls.add_method('SetLambda', 
-                   'void', 
-                   [param('double', 'frequency'), param('double', 'speed')])
-    ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetLambda(double lambda) [member function]
-    cls.add_method('SetLambda', 
+    ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetFrequency(double frequency) [member function]
+    cls.add_method('SetFrequency', 
                    'void', 
-                   [param('double', 'lambda')])
+                   [param('double', 'frequency')])
     ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetSystemLoss(double systemLoss) [member function]
     cls.add_method('SetSystemLoss', 
                    'void', 
@@ -2442,8 +2585,8 @@
                    'double', 
                    [], 
                    is_const=True)
-    ## propagation-loss-model.h (module 'propagation'): double ns3::TwoRayGroundPropagationLossModel::GetLambda() const [member function]
-    cls.add_method('GetLambda', 
+    ## propagation-loss-model.h (module 'propagation'): double ns3::TwoRayGroundPropagationLossModel::GetFrequency() const [member function]
+    cls.add_method('GetFrequency', 
                    'double', 
                    [], 
                    is_const=True)
@@ -2906,30 +3049,30 @@
                    'int64_t', 
                    [param('int64_t', 'stream')], 
                    visibility='protected', is_virtual=True)
-    ## buildings-propagation-loss-model.h (module 'buildings'): double ns3::BuildingsPropagationLossModel::EvaluateSigma(ns3::Ptr<ns3::BuildingsMobilityModel> a, ns3::Ptr<ns3::BuildingsMobilityModel> b) const [member function]
+    ## buildings-propagation-loss-model.h (module 'buildings'): double ns3::BuildingsPropagationLossModel::EvaluateSigma(ns3::Ptr<ns3::MobilityBuildingInfo> a, ns3::Ptr<ns3::MobilityBuildingInfo> b) const [member function]
     cls.add_method('EvaluateSigma', 
                    'double', 
-                   [param('ns3::Ptr< ns3::BuildingsMobilityModel >', 'a'), param('ns3::Ptr< ns3::BuildingsMobilityModel >', 'b')], 
+                   [param('ns3::Ptr< ns3::MobilityBuildingInfo >', 'a'), param('ns3::Ptr< ns3::MobilityBuildingInfo >', 'b')], 
                    is_const=True, visibility='protected')
-    ## buildings-propagation-loss-model.h (module 'buildings'): double ns3::BuildingsPropagationLossModel::ExternalWallLoss(ns3::Ptr<ns3::BuildingsMobilityModel> a) const [member function]
+    ## buildings-propagation-loss-model.h (module 'buildings'): double ns3::BuildingsPropagationLossModel::ExternalWallLoss(ns3::Ptr<ns3::MobilityBuildingInfo> a) const [member function]
     cls.add_method('ExternalWallLoss', 
                    'double', 
-                   [param('ns3::Ptr< ns3::BuildingsMobilityModel >', 'a')], 
+                   [param('ns3::Ptr< ns3::MobilityBuildingInfo >', 'a')], 
                    is_const=True, visibility='protected')
     ## buildings-propagation-loss-model.h (module 'buildings'): double ns3::BuildingsPropagationLossModel::GetShadowing(ns3::Ptr<ns3::MobilityModel> a, ns3::Ptr<ns3::MobilityModel> b) const [member function]
     cls.add_method('GetShadowing', 
                    'double', 
                    [param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], 
                    is_const=True, visibility='protected')
-    ## buildings-propagation-loss-model.h (module 'buildings'): double ns3::BuildingsPropagationLossModel::HeightLoss(ns3::Ptr<ns3::BuildingsMobilityModel> n) const [member function]
+    ## buildings-propagation-loss-model.h (module 'buildings'): double ns3::BuildingsPropagationLossModel::HeightLoss(ns3::Ptr<ns3::MobilityBuildingInfo> n) const [member function]
     cls.add_method('HeightLoss', 
                    'double', 
-                   [param('ns3::Ptr< ns3::BuildingsMobilityModel >', 'n')], 
+                   [param('ns3::Ptr< ns3::MobilityBuildingInfo >', 'n')], 
                    is_const=True, visibility='protected')
-    ## buildings-propagation-loss-model.h (module 'buildings'): double ns3::BuildingsPropagationLossModel::InternalWallsLoss(ns3::Ptr<ns3::BuildingsMobilityModel> a, ns3::Ptr<ns3::BuildingsMobilityModel> b) const [member function]
+    ## buildings-propagation-loss-model.h (module 'buildings'): double ns3::BuildingsPropagationLossModel::InternalWallsLoss(ns3::Ptr<ns3::MobilityBuildingInfo> a, ns3::Ptr<ns3::MobilityBuildingInfo> b) const [member function]
     cls.add_method('InternalWallsLoss', 
                    'double', 
-                   [param('ns3::Ptr< ns3::BuildingsMobilityModel >', 'a'), param('ns3::Ptr< ns3::BuildingsMobilityModel >', 'b')], 
+                   [param('ns3::Ptr< ns3::MobilityBuildingInfo >', 'a'), param('ns3::Ptr< ns3::MobilityBuildingInfo >', 'b')], 
                    is_const=True, visibility='protected')
     return
 
@@ -3201,14 +3344,10 @@
                    is_static=True)
     ## propagation-loss-model.h (module 'propagation'): ns3::FriisPropagationLossModel::FriisPropagationLossModel() [constructor]
     cls.add_constructor([])
-    ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetLambda(double frequency, double speed) [member function]
-    cls.add_method('SetLambda', 
-                   'void', 
-                   [param('double', 'frequency'), param('double', 'speed')])
-    ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetLambda(double lambda) [member function]
-    cls.add_method('SetLambda', 
+    ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetFrequency(double frequency) [member function]
+    cls.add_method('SetFrequency', 
                    'void', 
-                   [param('double', 'lambda')])
+                   [param('double', 'frequency')])
     ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetSystemLoss(double systemLoss) [member function]
     cls.add_method('SetSystemLoss', 
                    'void', 
@@ -3222,8 +3361,8 @@
                    'double', 
                    [], 
                    is_const=True)
-    ## propagation-loss-model.h (module 'propagation'): double ns3::FriisPropagationLossModel::GetLambda() const [member function]
-    cls.add_method('GetLambda', 
+    ## propagation-loss-model.h (module 'propagation'): double ns3::FriisPropagationLossModel::GetFrequency() const [member function]
+    cls.add_method('GetFrequency', 
                    'double', 
                    [], 
                    is_const=True)
@@ -3720,69 +3859,54 @@
                    visibility='private', is_virtual=True)
     return
 
-def register_Ns3MobilityModel_methods(root_module, cls):
-    ## mobility-model.h (module 'mobility'): ns3::MobilityModel::MobilityModel(ns3::MobilityModel const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::MobilityModel const &', 'arg0')])
-    ## mobility-model.h (module 'mobility'): ns3::MobilityModel::MobilityModel() [constructor]
+def register_Ns3MobilityBuildingInfo_methods(root_module, cls):
+    ## mobility-building-info.h (module 'buildings'): ns3::MobilityBuildingInfo::MobilityBuildingInfo(ns3::MobilityBuildingInfo const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MobilityBuildingInfo const &', 'arg0')])
+    ## mobility-building-info.h (module 'buildings'): ns3::MobilityBuildingInfo::MobilityBuildingInfo() [constructor]
     cls.add_constructor([])
-    ## mobility-model.h (module 'mobility'): int64_t ns3::MobilityModel::AssignStreams(int64_t stream) [member function]
-    cls.add_method('AssignStreams', 
-                   'int64_t', 
-                   [param('int64_t', 'stream')])
-    ## mobility-model.h (module 'mobility'): double ns3::MobilityModel::GetDistanceFrom(ns3::Ptr<const ns3::MobilityModel> position) const [member function]
-    cls.add_method('GetDistanceFrom', 
-                   'double', 
-                   [param('ns3::Ptr< ns3::MobilityModel const >', 'position')], 
-                   is_const=True)
-    ## mobility-model.h (module 'mobility'): ns3::Vector ns3::MobilityModel::GetPosition() const [member function]
-    cls.add_method('GetPosition', 
-                   'ns3::Vector', 
-                   [], 
-                   is_const=True)
-    ## mobility-model.h (module 'mobility'): double ns3::MobilityModel::GetRelativeSpeed(ns3::Ptr<const ns3::MobilityModel> other) const [member function]
-    cls.add_method('GetRelativeSpeed', 
-                   'double', 
-                   [param('ns3::Ptr< ns3::MobilityModel const >', 'other')], 
-                   is_const=True)
-    ## mobility-model.h (module 'mobility'): static ns3::TypeId ns3::MobilityModel::GetTypeId() [member function]
+    ## mobility-building-info.h (module 'buildings'): ns3::MobilityBuildingInfo::MobilityBuildingInfo(ns3::Ptr<ns3::Building> building) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Building >', 'building')])
+    ## mobility-building-info.h (module 'buildings'): ns3::Ptr<ns3::Building> ns3::MobilityBuildingInfo::GetBuilding() [member function]
+    cls.add_method('GetBuilding', 
+                   'ns3::Ptr< ns3::Building >', 
+                   [])
+    ## mobility-building-info.h (module 'buildings'): uint8_t ns3::MobilityBuildingInfo::GetFloorNumber() [member function]
+    cls.add_method('GetFloorNumber', 
+                   'uint8_t', 
+                   [])
+    ## mobility-building-info.h (module 'buildings'): uint8_t ns3::MobilityBuildingInfo::GetRoomNumberX() [member function]
+    cls.add_method('GetRoomNumberX', 
+                   'uint8_t', 
+                   [])
+    ## mobility-building-info.h (module 'buildings'): uint8_t ns3::MobilityBuildingInfo::GetRoomNumberY() [member function]
+    cls.add_method('GetRoomNumberY', 
+                   'uint8_t', 
+                   [])
+    ## mobility-building-info.h (module 'buildings'): static ns3::TypeId ns3::MobilityBuildingInfo::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
                    'ns3::TypeId', 
                    [], 
                    is_static=True)
-    ## mobility-model.h (module 'mobility'): ns3::Vector ns3::MobilityModel::GetVelocity() const [member function]
-    cls.add_method('GetVelocity', 
-                   'ns3::Vector', 
-                   [], 
-                   is_const=True)
-    ## mobility-model.h (module 'mobility'): void ns3::MobilityModel::SetPosition(ns3::Vector const & position) [member function]
-    cls.add_method('SetPosition', 
+    ## mobility-building-info.h (module 'buildings'): bool ns3::MobilityBuildingInfo::IsIndoor() [member function]
+    cls.add_method('IsIndoor', 
+                   'bool', 
+                   [])
+    ## mobility-building-info.h (module 'buildings'): bool ns3::MobilityBuildingInfo::IsOutdoor() [member function]
+    cls.add_method('IsOutdoor', 
+                   'bool', 
+                   [])
+    ## mobility-building-info.h (module 'buildings'): void ns3::MobilityBuildingInfo::SetIndoor(ns3::Ptr<ns3::Building> building, uint8_t nfloor, uint8_t nroomx, uint8_t nroomy) [member function]
+    cls.add_method('SetIndoor', 
                    'void', 
-                   [param('ns3::Vector const &', 'position')])
-    ## mobility-model.h (module 'mobility'): void ns3::MobilityModel::NotifyCourseChange() const [member function]
-    cls.add_method('NotifyCourseChange', 
+                   [param('ns3::Ptr< ns3::Building >', 'building'), param('uint8_t', 'nfloor'), param('uint8_t', 'nroomx'), param('uint8_t', 'nroomy')])
+    ## mobility-building-info.h (module 'buildings'): void ns3::MobilityBuildingInfo::SetIndoor(uint8_t nfloor, uint8_t nroomx, uint8_t nroomy) [member function]
+    cls.add_method('SetIndoor', 
                    'void', 
-                   [], 
-                   is_const=True, visibility='protected')
-    ## mobility-model.h (module 'mobility'): int64_t ns3::MobilityModel::DoAssignStreams(int64_t start) [member function]
-    cls.add_method('DoAssignStreams', 
-                   'int64_t', 
-                   [param('int64_t', 'start')], 
-                   visibility='private', is_virtual=True)
-    ## mobility-model.h (module 'mobility'): ns3::Vector ns3::MobilityModel::DoGetPosition() const [member function]
-    cls.add_method('DoGetPosition', 
-                   'ns3::Vector', 
-                   [], 
-                   is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
-    ## mobility-model.h (module 'mobility'): ns3::Vector ns3::MobilityModel::DoGetVelocity() const [member function]
-    cls.add_method('DoGetVelocity', 
-                   'ns3::Vector', 
-                   [], 
-                   is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
-    ## mobility-model.h (module 'mobility'): void ns3::MobilityModel::DoSetPosition(ns3::Vector const & position) [member function]
-    cls.add_method('DoSetPosition', 
+                   [param('uint8_t', 'nfloor'), param('uint8_t', 'nroomx'), param('uint8_t', 'nroomy')])
+    ## mobility-building-info.h (module 'buildings'): void ns3::MobilityBuildingInfo::SetOutdoor() [member function]
+    cls.add_method('SetOutdoor', 
                    'void', 
-                   [param('ns3::Vector const &', 'position')], 
-                   is_pure_virtual=True, visibility='private', is_virtual=True)
+                   [])
     return
 
 def register_Ns3NakagamiPropagationLossModel_methods(root_module, cls):
@@ -4163,13 +4287,6 @@
                    is_virtual=True)
     return
 
-def register_Ns3TimeChecker_methods(root_module, cls):
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor]
-    cls.add_constructor([])
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')])
-    return
-
 def register_Ns3TimeValue_methods(root_module, cls):
     ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
     cls.add_constructor([])
@@ -4363,78 +4480,127 @@
                    [param('ns3::Address const &', 'value')])
     return
 
-def register_Ns3BuildingsMobilityModel_methods(root_module, cls):
-    ## buildings-mobility-model.h (module 'buildings'): ns3::BuildingsMobilityModel::BuildingsMobilityModel(ns3::BuildingsMobilityModel const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::BuildingsMobilityModel const &', 'arg0')])
-    ## buildings-mobility-model.h (module 'buildings'): ns3::BuildingsMobilityModel::BuildingsMobilityModel() [constructor]
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
     cls.add_constructor([])
-    ## buildings-mobility-model.h (module 'buildings'): ns3::Ptr<ns3::Building> ns3::BuildingsMobilityModel::GetBuilding() [member function]
-    cls.add_method('GetBuilding', 
-                   'ns3::Ptr< ns3::Building >', 
-                   [])
-    ## buildings-mobility-model.h (module 'buildings'): uint8_t ns3::BuildingsMobilityModel::GetFloorNumber() [member function]
-    cls.add_method('GetFloorNumber', 
-                   'uint8_t', 
-                   [])
-    ## buildings-mobility-model.h (module 'buildings'): uint8_t ns3::BuildingsMobilityModel::GetRoomNumberX() [member function]
-    cls.add_method('GetRoomNumberX', 
-                   'uint8_t', 
-                   [])
-    ## buildings-mobility-model.h (module 'buildings'): uint8_t ns3::BuildingsMobilityModel::GetRoomNumberY() [member function]
-    cls.add_method('GetRoomNumberY', 
-                   'uint8_t', 
-                   [])
-    ## buildings-mobility-model.h (module 'buildings'): static ns3::TypeId ns3::BuildingsMobilityModel::GetTypeId() [member function]
-    cls.add_method('GetTypeId', 
-                   'ns3::TypeId', 
-                   [], 
-                   is_static=True)
-    ## buildings-mobility-model.h (module 'buildings'): bool ns3::BuildingsMobilityModel::IsIndoor() [member function]
-    cls.add_method('IsIndoor', 
-                   'bool', 
-                   [])
-    ## buildings-mobility-model.h (module 'buildings'): bool ns3::BuildingsMobilityModel::IsOutdoor() [member function]
-    cls.add_method('IsOutdoor', 
-                   'bool', 
-                   [])
-    ## buildings-mobility-model.h (module 'buildings'): void ns3::BuildingsMobilityModel::SetIndoor(ns3::Ptr<ns3::Building> building, uint8_t nfloor, uint8_t nroomx, uint8_t nroomy) [member function]
-    cls.add_method('SetIndoor', 
-                   'void', 
-                   [param('ns3::Ptr< ns3::Building >', 'building'), param('uint8_t', 'nfloor'), param('uint8_t', 'nroomx'), param('uint8_t', 'nroomy')])
-    ## buildings-mobility-model.h (module 'buildings'): void ns3::BuildingsMobilityModel::SetOutdoor() [member function]
-    cls.add_method('SetOutdoor', 
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
                    'void', 
-                   [])
-    ## buildings-mobility-model.h (module 'buildings'): void ns3::BuildingsMobilityModel::DoDispose() [member function]
-    cls.add_method('DoDispose', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
                    'void', 
                    [], 
-                   visibility='private', is_virtual=True)
-    ## buildings-mobility-model.h (module 'buildings'): ns3::Vector ns3::BuildingsMobilityModel::DoGetPosition() const [member function]
-    cls.add_method('DoGetPosition', 
-                   'ns3::Vector', 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
                    [], 
-                   is_const=True, visibility='private', is_virtual=True)
-    ## buildings-mobility-model.h (module 'buildings'): ns3::Vector ns3::BuildingsMobilityModel::DoGetVelocity() const [member function]
-    cls.add_method('DoGetVelocity', 
-                   'ns3::Vector', 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
                    [], 
-                   is_const=True, visibility='private', is_virtual=True)
-    ## buildings-mobility-model.h (module 'buildings'): void ns3::BuildingsMobilityModel::DoSetPosition(ns3::Vector const & position) [member function]
-    cls.add_method('DoSetPosition', 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
                    'void', 
-                   [param('ns3::Vector const &', 'position')], 
-                   visibility='private', is_virtual=True)
+                   [], 
+                   is_virtual=True)
     return
 
 def register_functions(root_module):
     module = root_module
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     return
 
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def main():
     out = FileCodeSink(sys.stdout)
     root_module = module_init()
diff -Naur ns-3.17/src/buildings/bindings/modulegen__gcc_LP64.py ns-3.18/src/buildings/bindings/modulegen__gcc_LP64.py
--- ns-3.17/src/buildings/bindings/modulegen__gcc_LP64.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/buildings/bindings/modulegen__gcc_LP64.py	2013-10-26 07:07:29.547364381 -0700
@@ -46,6 +46,8 @@
     module.add_class('CallbackBase', import_from_module='ns.core')
     ## constant-velocity-helper.h (module 'mobility'): ns3::ConstantVelocityHelper [class]
     module.add_class('ConstantVelocityHelper', import_from_module='ns.mobility')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
     ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
     module.add_class('Ipv4Address', import_from_module='ns.network')
     ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
@@ -122,6 +124,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::AttributeValue', 'ns3::empty', 'ns3::DefaultDeleter<ns3::AttributeValue>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::TraceSourceAccessor', 'ns3::empty', 'ns3::DefaultDeleter<ns3::TraceSourceAccessor>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## propagation-loss-model.h (module 'propagation'): ns3::ThreeLogDistancePropagationLossModel [class]
@@ -224,8 +228,8 @@
     module.add_class('LogNormalRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
     ## propagation-loss-model.h (module 'propagation'): ns3::MatrixPropagationLossModel [class]
     module.add_class('MatrixPropagationLossModel', import_from_module='ns.propagation', parent=root_module['ns3::PropagationLossModel'])
-    ## mobility-model.h (module 'mobility'): ns3::MobilityModel [class]
-    module.add_class('MobilityModel', import_from_module='ns.mobility', parent=root_module['ns3::Object'])
+    ## mobility-building-info.h (module 'buildings'): ns3::MobilityBuildingInfo [class]
+    module.add_class('MobilityBuildingInfo', parent=root_module['ns3::Object'])
     ## propagation-loss-model.h (module 'propagation'): ns3::NakagamiPropagationLossModel [class]
     module.add_class('NakagamiPropagationLossModel', import_from_module='ns.propagation', parent=root_module['ns3::PropagationLossModel'])
     ## net-device.h (module 'network'): ns3::NetDevice [class]
@@ -244,8 +248,6 @@
     module.add_class('OhBuildingsPropagationLossModel', parent=root_module['ns3::BuildingsPropagationLossModel'])
     ## random-variable-stream.h (module 'core'): ns3::ParetoRandomVariable [class]
     module.add_class('ParetoRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
-    ## nstime.h (module 'core'): ns3::TimeChecker [class]
-    module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
     module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
@@ -264,8 +266,6 @@
     module.add_class('AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
     ## address.h (module 'network'): ns3::AddressValue [class]
     module.add_class('AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
-    ## buildings-mobility-model.h (module 'buildings'): ns3::BuildingsMobilityModel [class]
-    module.add_class('BuildingsMobilityModel', parent=root_module['ns3::MobilityModel'])
     typehandlers.add_type_alias('ns3::Vector3DValue', 'ns3::VectorValue')
     typehandlers.add_type_alias('ns3::Vector3DValue*', 'ns3::VectorValue*')
     typehandlers.add_type_alias('ns3::Vector3DValue&', 'ns3::VectorValue&')
@@ -284,11 +284,47 @@
     nested_module = module.add_cpp_namespace('FatalImpl')
     register_types_ns3_FatalImpl(nested_module)
     
+    
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
 
 def register_types_ns3_FatalImpl(module):
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_methods(root_module):
     register_Ns3Address_methods(root_module, root_module['ns3::Address'])
     register_Ns3AttributeConstructionList_methods(root_module, root_module['ns3::AttributeConstructionList'])
@@ -299,6 +335,7 @@
     register_Ns3BuildingsHelper_methods(root_module, root_module['ns3::BuildingsHelper'])
     register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase'])
     register_Ns3ConstantVelocityHelper_methods(root_module, root_module['ns3::ConstantVelocityHelper'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3Ipv4Address_methods(root_module, root_module['ns3::Ipv4Address'])
     register_Ns3Ipv4Mask_methods(root_module, root_module['ns3::Ipv4Mask'])
     register_Ns3Ipv6Address_methods(root_module, root_module['ns3::Ipv6Address'])
@@ -334,6 +371,7 @@
     register_Ns3SimpleRefCount__Ns3AttributeChecker_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeChecker__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> >'])
     register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >'])
     register_Ns3ThreeLogDistancePropagationLossModel_methods(root_module, root_module['ns3::ThreeLogDistancePropagationLossModel'])
     register_Ns3Time_methods(root_module, root_module['ns3::Time'])
@@ -380,7 +418,7 @@
     register_Ns3LogDistancePropagationLossModel_methods(root_module, root_module['ns3::LogDistancePropagationLossModel'])
     register_Ns3LogNormalRandomVariable_methods(root_module, root_module['ns3::LogNormalRandomVariable'])
     register_Ns3MatrixPropagationLossModel_methods(root_module, root_module['ns3::MatrixPropagationLossModel'])
-    register_Ns3MobilityModel_methods(root_module, root_module['ns3::MobilityModel'])
+    register_Ns3MobilityBuildingInfo_methods(root_module, root_module['ns3::MobilityBuildingInfo'])
     register_Ns3NakagamiPropagationLossModel_methods(root_module, root_module['ns3::NakagamiPropagationLossModel'])
     register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice'])
     register_Ns3Node_methods(root_module, root_module['ns3::Node'])
@@ -389,7 +427,6 @@
     register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue'])
     register_Ns3OhBuildingsPropagationLossModel_methods(root_module, root_module['ns3::OhBuildingsPropagationLossModel'])
     register_Ns3ParetoRandomVariable_methods(root_module, root_module['ns3::ParetoRandomVariable'])
-    register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
     register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
@@ -399,7 +436,11 @@
     register_Ns3Vector3DValue_methods(root_module, root_module['ns3::Vector3DValue'])
     register_Ns3AddressChecker_methods(root_module, root_module['ns3::AddressChecker'])
     register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue'])
-    register_Ns3BuildingsMobilityModel_methods(root_module, root_module['ns3::BuildingsMobilityModel'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     return
 
 def register_Ns3Address_methods(root_module, cls):
@@ -637,10 +678,20 @@
     cls.add_constructor([])
     ## buildings-helper.h (module 'buildings'): ns3::BuildingsHelper::BuildingsHelper(ns3::BuildingsHelper const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::BuildingsHelper const &', 'arg0')])
-    ## buildings-helper.h (module 'buildings'): static void ns3::BuildingsHelper::MakeConsistent(ns3::Ptr<ns3::BuildingsMobilityModel> bmm) [member function]
+    ## buildings-helper.h (module 'buildings'): static void ns3::BuildingsHelper::Install(ns3::Ptr<ns3::Node> node) [member function]
+    cls.add_method('Install', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Node >', 'node')], 
+                   is_static=True)
+    ## buildings-helper.h (module 'buildings'): static void ns3::BuildingsHelper::Install(ns3::NodeContainer c) [member function]
+    cls.add_method('Install', 
+                   'void', 
+                   [param('ns3::NodeContainer', 'c')], 
+                   is_static=True)
+    ## buildings-helper.h (module 'buildings'): static void ns3::BuildingsHelper::MakeConsistent(ns3::Ptr<ns3::MobilityModel> bmm) [member function]
     cls.add_method('MakeConsistent', 
                    'void', 
-                   [param('ns3::Ptr< ns3::BuildingsMobilityModel >', 'bmm')], 
+                   [param('ns3::Ptr< ns3::MobilityModel >', 'bmm')], 
                    is_static=True)
     ## buildings-helper.h (module 'buildings'): static void ns3::BuildingsHelper::MakeMobilityModelConsistent() [member function]
     cls.add_method('MakeMobilityModelConsistent', 
@@ -721,6 +772,35 @@
                    is_const=True)
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3Ipv4Address_methods(root_module, cls):
     cls.add_binary_comparison_operator('<')
     cls.add_binary_comparison_operator('!=')
@@ -986,6 +1066,11 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
     cls.add_method('IsEqual', 
                    'bool', 
@@ -1025,16 +1110,36 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
     cls.add_method('MakeAutoconfiguredAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
     cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'mac')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
     cls.add_method('MakeIpv4MappedAddress', 
                    'ns3::Ipv6Address', 
@@ -1419,6 +1524,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -1478,6 +1588,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -2155,6 +2275,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -2321,11 +2453,26 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
     cls.add_method('SetResolution', 
                    'void', 
                    [param('ns3::Time::Unit', 'resolution')], 
                    is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
     cls.add_method('To', 
                    'ns3::int64x64_t', 
@@ -2421,14 +2568,10 @@
                    is_static=True)
     ## propagation-loss-model.h (module 'propagation'): ns3::TwoRayGroundPropagationLossModel::TwoRayGroundPropagationLossModel() [constructor]
     cls.add_constructor([])
-    ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetLambda(double frequency, double speed) [member function]
-    cls.add_method('SetLambda', 
-                   'void', 
-                   [param('double', 'frequency'), param('double', 'speed')])
-    ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetLambda(double lambda) [member function]
-    cls.add_method('SetLambda', 
+    ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetFrequency(double frequency) [member function]
+    cls.add_method('SetFrequency', 
                    'void', 
-                   [param('double', 'lambda')])
+                   [param('double', 'frequency')])
     ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetSystemLoss(double systemLoss) [member function]
     cls.add_method('SetSystemLoss', 
                    'void', 
@@ -2442,8 +2585,8 @@
                    'double', 
                    [], 
                    is_const=True)
-    ## propagation-loss-model.h (module 'propagation'): double ns3::TwoRayGroundPropagationLossModel::GetLambda() const [member function]
-    cls.add_method('GetLambda', 
+    ## propagation-loss-model.h (module 'propagation'): double ns3::TwoRayGroundPropagationLossModel::GetFrequency() const [member function]
+    cls.add_method('GetFrequency', 
                    'double', 
                    [], 
                    is_const=True)
@@ -2906,30 +3049,30 @@
                    'int64_t', 
                    [param('int64_t', 'stream')], 
                    visibility='protected', is_virtual=True)
-    ## buildings-propagation-loss-model.h (module 'buildings'): double ns3::BuildingsPropagationLossModel::EvaluateSigma(ns3::Ptr<ns3::BuildingsMobilityModel> a, ns3::Ptr<ns3::BuildingsMobilityModel> b) const [member function]
+    ## buildings-propagation-loss-model.h (module 'buildings'): double ns3::BuildingsPropagationLossModel::EvaluateSigma(ns3::Ptr<ns3::MobilityBuildingInfo> a, ns3::Ptr<ns3::MobilityBuildingInfo> b) const [member function]
     cls.add_method('EvaluateSigma', 
                    'double', 
-                   [param('ns3::Ptr< ns3::BuildingsMobilityModel >', 'a'), param('ns3::Ptr< ns3::BuildingsMobilityModel >', 'b')], 
+                   [param('ns3::Ptr< ns3::MobilityBuildingInfo >', 'a'), param('ns3::Ptr< ns3::MobilityBuildingInfo >', 'b')], 
                    is_const=True, visibility='protected')
-    ## buildings-propagation-loss-model.h (module 'buildings'): double ns3::BuildingsPropagationLossModel::ExternalWallLoss(ns3::Ptr<ns3::BuildingsMobilityModel> a) const [member function]
+    ## buildings-propagation-loss-model.h (module 'buildings'): double ns3::BuildingsPropagationLossModel::ExternalWallLoss(ns3::Ptr<ns3::MobilityBuildingInfo> a) const [member function]
     cls.add_method('ExternalWallLoss', 
                    'double', 
-                   [param('ns3::Ptr< ns3::BuildingsMobilityModel >', 'a')], 
+                   [param('ns3::Ptr< ns3::MobilityBuildingInfo >', 'a')], 
                    is_const=True, visibility='protected')
     ## buildings-propagation-loss-model.h (module 'buildings'): double ns3::BuildingsPropagationLossModel::GetShadowing(ns3::Ptr<ns3::MobilityModel> a, ns3::Ptr<ns3::MobilityModel> b) const [member function]
     cls.add_method('GetShadowing', 
                    'double', 
                    [param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], 
                    is_const=True, visibility='protected')
-    ## buildings-propagation-loss-model.h (module 'buildings'): double ns3::BuildingsPropagationLossModel::HeightLoss(ns3::Ptr<ns3::BuildingsMobilityModel> n) const [member function]
+    ## buildings-propagation-loss-model.h (module 'buildings'): double ns3::BuildingsPropagationLossModel::HeightLoss(ns3::Ptr<ns3::MobilityBuildingInfo> n) const [member function]
     cls.add_method('HeightLoss', 
                    'double', 
-                   [param('ns3::Ptr< ns3::BuildingsMobilityModel >', 'n')], 
+                   [param('ns3::Ptr< ns3::MobilityBuildingInfo >', 'n')], 
                    is_const=True, visibility='protected')
-    ## buildings-propagation-loss-model.h (module 'buildings'): double ns3::BuildingsPropagationLossModel::InternalWallsLoss(ns3::Ptr<ns3::BuildingsMobilityModel> a, ns3::Ptr<ns3::BuildingsMobilityModel> b) const [member function]
+    ## buildings-propagation-loss-model.h (module 'buildings'): double ns3::BuildingsPropagationLossModel::InternalWallsLoss(ns3::Ptr<ns3::MobilityBuildingInfo> a, ns3::Ptr<ns3::MobilityBuildingInfo> b) const [member function]
     cls.add_method('InternalWallsLoss', 
                    'double', 
-                   [param('ns3::Ptr< ns3::BuildingsMobilityModel >', 'a'), param('ns3::Ptr< ns3::BuildingsMobilityModel >', 'b')], 
+                   [param('ns3::Ptr< ns3::MobilityBuildingInfo >', 'a'), param('ns3::Ptr< ns3::MobilityBuildingInfo >', 'b')], 
                    is_const=True, visibility='protected')
     return
 
@@ -3201,14 +3344,10 @@
                    is_static=True)
     ## propagation-loss-model.h (module 'propagation'): ns3::FriisPropagationLossModel::FriisPropagationLossModel() [constructor]
     cls.add_constructor([])
-    ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetLambda(double frequency, double speed) [member function]
-    cls.add_method('SetLambda', 
-                   'void', 
-                   [param('double', 'frequency'), param('double', 'speed')])
-    ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetLambda(double lambda) [member function]
-    cls.add_method('SetLambda', 
+    ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetFrequency(double frequency) [member function]
+    cls.add_method('SetFrequency', 
                    'void', 
-                   [param('double', 'lambda')])
+                   [param('double', 'frequency')])
     ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetSystemLoss(double systemLoss) [member function]
     cls.add_method('SetSystemLoss', 
                    'void', 
@@ -3222,8 +3361,8 @@
                    'double', 
                    [], 
                    is_const=True)
-    ## propagation-loss-model.h (module 'propagation'): double ns3::FriisPropagationLossModel::GetLambda() const [member function]
-    cls.add_method('GetLambda', 
+    ## propagation-loss-model.h (module 'propagation'): double ns3::FriisPropagationLossModel::GetFrequency() const [member function]
+    cls.add_method('GetFrequency', 
                    'double', 
                    [], 
                    is_const=True)
@@ -3720,69 +3859,54 @@
                    visibility='private', is_virtual=True)
     return
 
-def register_Ns3MobilityModel_methods(root_module, cls):
-    ## mobility-model.h (module 'mobility'): ns3::MobilityModel::MobilityModel(ns3::MobilityModel const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::MobilityModel const &', 'arg0')])
-    ## mobility-model.h (module 'mobility'): ns3::MobilityModel::MobilityModel() [constructor]
+def register_Ns3MobilityBuildingInfo_methods(root_module, cls):
+    ## mobility-building-info.h (module 'buildings'): ns3::MobilityBuildingInfo::MobilityBuildingInfo(ns3::MobilityBuildingInfo const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MobilityBuildingInfo const &', 'arg0')])
+    ## mobility-building-info.h (module 'buildings'): ns3::MobilityBuildingInfo::MobilityBuildingInfo() [constructor]
     cls.add_constructor([])
-    ## mobility-model.h (module 'mobility'): int64_t ns3::MobilityModel::AssignStreams(int64_t stream) [member function]
-    cls.add_method('AssignStreams', 
-                   'int64_t', 
-                   [param('int64_t', 'stream')])
-    ## mobility-model.h (module 'mobility'): double ns3::MobilityModel::GetDistanceFrom(ns3::Ptr<const ns3::MobilityModel> position) const [member function]
-    cls.add_method('GetDistanceFrom', 
-                   'double', 
-                   [param('ns3::Ptr< ns3::MobilityModel const >', 'position')], 
-                   is_const=True)
-    ## mobility-model.h (module 'mobility'): ns3::Vector ns3::MobilityModel::GetPosition() const [member function]
-    cls.add_method('GetPosition', 
-                   'ns3::Vector', 
-                   [], 
-                   is_const=True)
-    ## mobility-model.h (module 'mobility'): double ns3::MobilityModel::GetRelativeSpeed(ns3::Ptr<const ns3::MobilityModel> other) const [member function]
-    cls.add_method('GetRelativeSpeed', 
-                   'double', 
-                   [param('ns3::Ptr< ns3::MobilityModel const >', 'other')], 
-                   is_const=True)
-    ## mobility-model.h (module 'mobility'): static ns3::TypeId ns3::MobilityModel::GetTypeId() [member function]
+    ## mobility-building-info.h (module 'buildings'): ns3::MobilityBuildingInfo::MobilityBuildingInfo(ns3::Ptr<ns3::Building> building) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Building >', 'building')])
+    ## mobility-building-info.h (module 'buildings'): ns3::Ptr<ns3::Building> ns3::MobilityBuildingInfo::GetBuilding() [member function]
+    cls.add_method('GetBuilding', 
+                   'ns3::Ptr< ns3::Building >', 
+                   [])
+    ## mobility-building-info.h (module 'buildings'): uint8_t ns3::MobilityBuildingInfo::GetFloorNumber() [member function]
+    cls.add_method('GetFloorNumber', 
+                   'uint8_t', 
+                   [])
+    ## mobility-building-info.h (module 'buildings'): uint8_t ns3::MobilityBuildingInfo::GetRoomNumberX() [member function]
+    cls.add_method('GetRoomNumberX', 
+                   'uint8_t', 
+                   [])
+    ## mobility-building-info.h (module 'buildings'): uint8_t ns3::MobilityBuildingInfo::GetRoomNumberY() [member function]
+    cls.add_method('GetRoomNumberY', 
+                   'uint8_t', 
+                   [])
+    ## mobility-building-info.h (module 'buildings'): static ns3::TypeId ns3::MobilityBuildingInfo::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
                    'ns3::TypeId', 
                    [], 
                    is_static=True)
-    ## mobility-model.h (module 'mobility'): ns3::Vector ns3::MobilityModel::GetVelocity() const [member function]
-    cls.add_method('GetVelocity', 
-                   'ns3::Vector', 
-                   [], 
-                   is_const=True)
-    ## mobility-model.h (module 'mobility'): void ns3::MobilityModel::SetPosition(ns3::Vector const & position) [member function]
-    cls.add_method('SetPosition', 
+    ## mobility-building-info.h (module 'buildings'): bool ns3::MobilityBuildingInfo::IsIndoor() [member function]
+    cls.add_method('IsIndoor', 
+                   'bool', 
+                   [])
+    ## mobility-building-info.h (module 'buildings'): bool ns3::MobilityBuildingInfo::IsOutdoor() [member function]
+    cls.add_method('IsOutdoor', 
+                   'bool', 
+                   [])
+    ## mobility-building-info.h (module 'buildings'): void ns3::MobilityBuildingInfo::SetIndoor(ns3::Ptr<ns3::Building> building, uint8_t nfloor, uint8_t nroomx, uint8_t nroomy) [member function]
+    cls.add_method('SetIndoor', 
                    'void', 
-                   [param('ns3::Vector const &', 'position')])
-    ## mobility-model.h (module 'mobility'): void ns3::MobilityModel::NotifyCourseChange() const [member function]
-    cls.add_method('NotifyCourseChange', 
+                   [param('ns3::Ptr< ns3::Building >', 'building'), param('uint8_t', 'nfloor'), param('uint8_t', 'nroomx'), param('uint8_t', 'nroomy')])
+    ## mobility-building-info.h (module 'buildings'): void ns3::MobilityBuildingInfo::SetIndoor(uint8_t nfloor, uint8_t nroomx, uint8_t nroomy) [member function]
+    cls.add_method('SetIndoor', 
                    'void', 
-                   [], 
-                   is_const=True, visibility='protected')
-    ## mobility-model.h (module 'mobility'): int64_t ns3::MobilityModel::DoAssignStreams(int64_t start) [member function]
-    cls.add_method('DoAssignStreams', 
-                   'int64_t', 
-                   [param('int64_t', 'start')], 
-                   visibility='private', is_virtual=True)
-    ## mobility-model.h (module 'mobility'): ns3::Vector ns3::MobilityModel::DoGetPosition() const [member function]
-    cls.add_method('DoGetPosition', 
-                   'ns3::Vector', 
-                   [], 
-                   is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
-    ## mobility-model.h (module 'mobility'): ns3::Vector ns3::MobilityModel::DoGetVelocity() const [member function]
-    cls.add_method('DoGetVelocity', 
-                   'ns3::Vector', 
-                   [], 
-                   is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
-    ## mobility-model.h (module 'mobility'): void ns3::MobilityModel::DoSetPosition(ns3::Vector const & position) [member function]
-    cls.add_method('DoSetPosition', 
+                   [param('uint8_t', 'nfloor'), param('uint8_t', 'nroomx'), param('uint8_t', 'nroomy')])
+    ## mobility-building-info.h (module 'buildings'): void ns3::MobilityBuildingInfo::SetOutdoor() [member function]
+    cls.add_method('SetOutdoor', 
                    'void', 
-                   [param('ns3::Vector const &', 'position')], 
-                   is_pure_virtual=True, visibility='private', is_virtual=True)
+                   [])
     return
 
 def register_Ns3NakagamiPropagationLossModel_methods(root_module, cls):
@@ -4163,13 +4287,6 @@
                    is_virtual=True)
     return
 
-def register_Ns3TimeChecker_methods(root_module, cls):
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor]
-    cls.add_constructor([])
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')])
-    return
-
 def register_Ns3TimeValue_methods(root_module, cls):
     ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
     cls.add_constructor([])
@@ -4363,78 +4480,127 @@
                    [param('ns3::Address const &', 'value')])
     return
 
-def register_Ns3BuildingsMobilityModel_methods(root_module, cls):
-    ## buildings-mobility-model.h (module 'buildings'): ns3::BuildingsMobilityModel::BuildingsMobilityModel(ns3::BuildingsMobilityModel const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::BuildingsMobilityModel const &', 'arg0')])
-    ## buildings-mobility-model.h (module 'buildings'): ns3::BuildingsMobilityModel::BuildingsMobilityModel() [constructor]
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
     cls.add_constructor([])
-    ## buildings-mobility-model.h (module 'buildings'): ns3::Ptr<ns3::Building> ns3::BuildingsMobilityModel::GetBuilding() [member function]
-    cls.add_method('GetBuilding', 
-                   'ns3::Ptr< ns3::Building >', 
-                   [])
-    ## buildings-mobility-model.h (module 'buildings'): uint8_t ns3::BuildingsMobilityModel::GetFloorNumber() [member function]
-    cls.add_method('GetFloorNumber', 
-                   'uint8_t', 
-                   [])
-    ## buildings-mobility-model.h (module 'buildings'): uint8_t ns3::BuildingsMobilityModel::GetRoomNumberX() [member function]
-    cls.add_method('GetRoomNumberX', 
-                   'uint8_t', 
-                   [])
-    ## buildings-mobility-model.h (module 'buildings'): uint8_t ns3::BuildingsMobilityModel::GetRoomNumberY() [member function]
-    cls.add_method('GetRoomNumberY', 
-                   'uint8_t', 
-                   [])
-    ## buildings-mobility-model.h (module 'buildings'): static ns3::TypeId ns3::BuildingsMobilityModel::GetTypeId() [member function]
-    cls.add_method('GetTypeId', 
-                   'ns3::TypeId', 
-                   [], 
-                   is_static=True)
-    ## buildings-mobility-model.h (module 'buildings'): bool ns3::BuildingsMobilityModel::IsIndoor() [member function]
-    cls.add_method('IsIndoor', 
-                   'bool', 
-                   [])
-    ## buildings-mobility-model.h (module 'buildings'): bool ns3::BuildingsMobilityModel::IsOutdoor() [member function]
-    cls.add_method('IsOutdoor', 
-                   'bool', 
-                   [])
-    ## buildings-mobility-model.h (module 'buildings'): void ns3::BuildingsMobilityModel::SetIndoor(ns3::Ptr<ns3::Building> building, uint8_t nfloor, uint8_t nroomx, uint8_t nroomy) [member function]
-    cls.add_method('SetIndoor', 
-                   'void', 
-                   [param('ns3::Ptr< ns3::Building >', 'building'), param('uint8_t', 'nfloor'), param('uint8_t', 'nroomx'), param('uint8_t', 'nroomy')])
-    ## buildings-mobility-model.h (module 'buildings'): void ns3::BuildingsMobilityModel::SetOutdoor() [member function]
-    cls.add_method('SetOutdoor', 
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
                    'void', 
-                   [])
-    ## buildings-mobility-model.h (module 'buildings'): void ns3::BuildingsMobilityModel::DoDispose() [member function]
-    cls.add_method('DoDispose', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
                    'void', 
                    [], 
-                   visibility='private', is_virtual=True)
-    ## buildings-mobility-model.h (module 'buildings'): ns3::Vector ns3::BuildingsMobilityModel::DoGetPosition() const [member function]
-    cls.add_method('DoGetPosition', 
-                   'ns3::Vector', 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
                    [], 
-                   is_const=True, visibility='private', is_virtual=True)
-    ## buildings-mobility-model.h (module 'buildings'): ns3::Vector ns3::BuildingsMobilityModel::DoGetVelocity() const [member function]
-    cls.add_method('DoGetVelocity', 
-                   'ns3::Vector', 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
                    [], 
-                   is_const=True, visibility='private', is_virtual=True)
-    ## buildings-mobility-model.h (module 'buildings'): void ns3::BuildingsMobilityModel::DoSetPosition(ns3::Vector const & position) [member function]
-    cls.add_method('DoSetPosition', 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
                    'void', 
-                   [param('ns3::Vector const &', 'position')], 
-                   visibility='private', is_virtual=True)
+                   [], 
+                   is_virtual=True)
     return
 
 def register_functions(root_module):
     module = root_module
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     return
 
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def main():
     out = FileCodeSink(sys.stdout)
     root_module = module_init()
diff -Naur ns-3.17/src/buildings/doc/Makefile ns-3.18/src/buildings/doc/Makefile
--- ns-3.17/src/buildings/doc/Makefile	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/buildings/doc/Makefile	2013-10-26 07:07:29.543364381 -0700
@@ -20,12 +20,14 @@
 
 IMAGES = $(IMAGES_EPS) $(IMAGES_PNG) $(IMAGES_PDF)
 
+RESCALE = $(shell hg root)/utils/rescale-pdf.sh
+
 %.eps : %.dia; $(DIA) -t eps $< -e $@
 %.png : %.dia; $(DIA) -t png $< -e $@
 %.png : %.eps; $(CONVERT) $< $@
 %.pdf : %.eps
 	$(EPSTOPDF) $< -o=$@;
-	if test x$($@_width) != x; then ./rescale-pdf.sh $($@_width) $@ ; fi
+	@if test x$($@_width) != x; then $(RESCALE) $($@_width) $@ ; fi
 
 GRAPHS_PNG = ${GRAPHS_EPS:.eps=.png}
 GRAPHS_PDF = ${GRAPHS_EPS:.eps=.pdf}
@@ -35,7 +37,7 @@
 %.png : %.eps; $(CONVERT) $< $@
 %.pdf : %.eps
 	$(EPSTOPDF) $< -o=$@
-	if test x$($@_width) != x; then ./rescale-pdf.sh $($@_width) $@ ; fi
+	@if test x$($@_width) != x; then $(RESCALE) $($@_width) $@ ; fi
 
 # You can set these variables from the command line.
 SPHINXOPTS    =
diff -Naur ns-3.17/src/buildings/doc/rescale-pdf.sh ns-3.18/src/buildings/doc/rescale-pdf.sh
--- ns-3.17/src/buildings/doc/rescale-pdf.sh	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/buildings/doc/rescale-pdf.sh	1969-12-31 16:00:00.000000000 -0800
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-TMPDIR=/tmp
-
-TMPFILE=`mktemp`
-
-echo "\documentclass{book}
-\usepackage{pdfpages}
-\begin{document}
-\includepdf[width=${1},fitpaper]{${2}}
-\end{document}" >${TMPFILE}.tex
-pdflatex -output-directory /tmp ${TMPFILE}.tex >/dev/null 2>/dev/null
-cp ${TMPFILE}.pdf ${2}
-rm -f ${TMPFILE}{,.{tex,aux,log,pdf}}
diff -Naur ns-3.17/src/buildings/doc/source/buildings-design.rst ns-3.18/src/buildings/doc/source/buildings-design.rst
--- ns-3.17/src/buildings/doc/source/buildings-design.rst	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/buildings/doc/source/buildings-design.rst	2013-10-26 07:07:29.543364381 -0700
@@ -12,7 +12,7 @@
 The Buildings module provides:
 
  #. a new class (``Building``) that models the presence of a building in a simulation scenario;  
- #. a new mobility model (``BuildingsMobilityModel``) that allows to specify the location, size and characteristics of buildings present in the simulated area, and allows the placement of nodes inside those buildings;
+ #. a new class (``MobilityBuildingInfo``) that allows to specify the location, size and characteristics of buildings present in the simulated area, and allows the placement of nodes inside those buildings;
  #. a container class with the definition of the most useful pathloss models and the correspondent variables called ``BuildingsPropagationLossModel``.
  #. a new propagation model (``HybridBuildingsPropagationLossModel``) working with the mobility model just introduced, that allows to model the phenomenon of indoor/outdoor propagation in the presence of buildings.
  #. a simplified model working only with Okumura Hata (``OhBuildingsPropagationLossModel``) considering the phenomenon of indoor/outdoor propagation in the presence of buildings.
@@ -62,10 +62,10 @@
 
 
 
-The BuildingsMobilityModel class
-++++++++++++++++++++++++++++++++
+The MobilityBuildingInfo class
+++++++++++++++++++++++++++++++
 
-The ``BuildingsMobilityModel`` class, which inherits from the ns3 class ``MobilityModel``, is in charge of managing the standard mobility functionalities plus providing information about the position of a node with respect to building. The information managed by ``BuildingsMobilityModel`` is:
+The ``MobilityBuildingInfo`` class, which inherits from the ns3 class ``Object``, is in charge of maintaining information about the position of a node with respect to building. The information managed by ``MobilityBuildingInfo`` is:
 
   * whether the node is indoor or outdoor
   * if indoor:
@@ -73,7 +73,9 @@
     * in which building the node is
     * in which room the node is positioned (x, y and floor room indices)  
 
-The class ``BuildingsMobilityModel`` is used by ``BuildingsPropagationLossModel`` class, which inherits from the ns3 class ``PropagationLossModel`` and manages the pathloss computation of the single components and their composition according to the nodes' positions. Moreover, it implements also the shadowing, that is the loss due to obstacles in the main path (i.e., vegetation, buildings, etc.).
+The class ``MobilityBuildingInfo`` is used by ``BuildingsPropagationLossModel`` class, which inherits from the ns3 class ``PropagationLossModel`` and manages the pathloss computation of the single components and their composition according to the nodes' positions. Moreover, it implements also the shadowing, that is the loss due to obstacles in the main path (i.e., vegetation, buildings, etc.).
+
+It is to be noted that, ``MobilityBuildingInfo`` can be used by any other propagation model. However, based on the information at the time of this writing, only the ones defined in the building module are designed for considering the constraints introduced by the buildings.
 
 
 
diff -Naur ns-3.17/src/buildings/doc/source/buildings-user.rst ns-3.18/src/buildings/doc/source/buildings-user.rst
--- ns-3.17/src/buildings/doc/source/buildings-user.rst	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/buildings/doc/source/buildings-user.rst	2013-10-26 07:07:29.543364381 -0700
@@ -42,6 +42,12 @@
 The simple ``OhBuildingMobilityLossModel`` overcome this problem by using only the Okumura Hata model and the wall penetration losses.
 
 
+Helper Functionalities
+----------------------
+
+The ``BuildingsHelper`` class defines a set of static function for assisting in the definition of the scenario with building module. In detail, it provides the method ``Install`` for installing the building information included in  ``MobilityBuildingInfo`` to a specific node (or set of nodes, i.e.,  the ``NodeContainer``). In order to synchronize the nodes information with their position, this helper provides the function ``MakeMobilityModelConsistent`` that puts all the ``Node``\s presents in the simulation in the right position (i.e., outdoor or indoor, in the latter also updating in terms of building, floor and room number).
+
+
 
 
 
diff -Naur ns-3.17/src/buildings/examples/buildings-pathloss-profiler.cc ns-3.18/src/buildings/examples/buildings-pathloss-profiler.cc
--- ns-3.17/src/buildings/examples/buildings-pathloss-profiler.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/buildings/examples/buildings-pathloss-profiler.cc	2013-10-26 07:07:29.543364381 -0700
@@ -25,6 +25,7 @@
 #include "ns3/config-store.h"
 #include <ns3/buildings-helper.h>
 #include <ns3/hybrid-buildings-propagation-loss-model.h>
+#include <ns3/constant-position-mobility-model.h>
 
 #include <iomanip>
 #include <string>
@@ -64,15 +65,17 @@
     NS_FATAL_ERROR ("Can't open output file");
   }
   
-  Ptr<BuildingsMobilityModel> mmEnb = CreateObject<BuildingsMobilityModel> ();
+  Ptr<ConstantPositionMobilityModel> mmEnb = CreateObject<ConstantPositionMobilityModel> ();
   mmEnb->SetPosition (Vector (0.0, 0.0, hEnb));
   if (enbIndoor)
     {
-      Ptr<Building> building1 = Create<Building> (-2, 2, -2, 2, 0.0, 20.0);
+      Ptr<Building> building1 = CreateObject<Building> (-2, 2, -2, 2, 0.0, 20.0);
       building1->SetBuildingType (Building::Residential);
       building1->SetExtWallsType (Building::ConcreteWithWindows);
     }
-
+  
+  Ptr<MobilityBuildingInfo> buildingInfoEnb = CreateObject<MobilityBuildingInfo> ();
+  mmEnb->AggregateObject (buildingInfoEnb); // operation usually done by BuildingsHelper::Install
   BuildingsHelper::MakeConsistent (mmEnb);
   
   Ptr<HybridBuildingsPropagationLossModel> propagationLossModel = CreateObject<HybridBuildingsPropagationLossModel> ();
@@ -86,8 +89,10 @@
   //for (uint8_t i = 0; i < 23; i++)
   for (uint32_t i = 1; i < 2300; i++)
     {
-      Ptr<BuildingsMobilityModel> mmUe = CreateObject<BuildingsMobilityModel> ();
-      mmUe->SetPosition (Vector (i, 0.0, hUe));      
+      Ptr<ConstantPositionMobilityModel> mmUe = CreateObject<ConstantPositionMobilityModel> ();
+      mmUe->SetPosition (Vector (i, 0.0, hUe));
+      Ptr<MobilityBuildingInfo> buildingInfoUe = CreateObject<MobilityBuildingInfo> ();
+      mmUe->AggregateObject (buildingInfoUe); // operation usually done by BuildingsHelper::Install
       BuildingsHelper::MakeConsistent (mmUe);
       double loss = propagationLossModel->GetLoss (mmEnb, mmUe);
       outFile << i << "\t"
diff -Naur ns-3.17/src/buildings/helper/building-position-allocator.cc ns-3.18/src/buildings/helper/building-position-allocator.cc
--- ns-3.17/src/buildings/helper/building-position-allocator.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/buildings/helper/building-position-allocator.cc	2013-10-26 07:07:29.543364381 -0700
@@ -18,7 +18,8 @@
  * Author: Nicola Baldo <nbaldo@cttc.es>
  */
 #include "building-position-allocator.h"
-#include "ns3/buildings-mobility-model.h"
+#include <ns3/mobility-building-info.h>
+#include "ns3/mobility-model.h"
 #include "ns3/buildings-helper.h"
 #include "ns3/random-variable-stream.h"
 #include "ns3/double.h"
@@ -209,9 +210,9 @@
     {
       Ptr<MobilityModel> mm = (*it)->GetObject<MobilityModel> ();
       NS_ASSERT_MSG (mm, "no mobility model aggregated to this node");
-      Ptr<BuildingsMobilityModel> bmm = DynamicCast<BuildingsMobilityModel> (mm);
-      NS_ASSERT_MSG (bmm, "mobility model aggregated to this node is not a BuildingsMobilityModel");
-      BuildingsHelper::MakeConsistent (bmm);
+      Ptr<MobilityBuildingInfo> bmm = mm->GetObject <MobilityBuildingInfo> ();
+      NS_ASSERT_MSG (bmm, "MobilityBuildingInfo has not been aggregated to this node mobility model");
+      BuildingsHelper::MakeConsistent (mm);
     }
 }
 
@@ -239,8 +240,8 @@
   NS_LOG_LOGIC ("considering node " << (*m_nodeIt)->GetId ());
   Ptr<MobilityModel> mm = (*m_nodeIt)->GetObject<MobilityModel> ();
   NS_ASSERT_MSG (mm, "no mobility model aggregated to this node");
-  Ptr<BuildingsMobilityModel> bmm = DynamicCast<BuildingsMobilityModel> (mm);
-  NS_ASSERT_MSG (bmm, "mobility model aggregated to this node is not a BuildingsMobilityModel");
+  Ptr<MobilityBuildingInfo> bmm = mm->GetObject<MobilityBuildingInfo> ();
+  NS_ASSERT_MSG (bmm, "MobilityBuildingInfo has not been aggregated to this node mobility model");
 
   ++m_nodeIt;
   uint32_t roomx = bmm->GetRoomNumberX ();
diff -Naur ns-3.17/src/buildings/helper/buildings-helper.cc ns-3.18/src/buildings/helper/buildings-helper.cc
--- ns-3.17/src/buildings/helper/buildings-helper.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/buildings/helper/buildings-helper.cc	2013-10-26 07:07:29.543364381 -0700
@@ -24,7 +24,7 @@
 #include <ns3/building.h>
 #include <ns3/building-list.h>
 #include <ns3/mobility-model.h>
-#include <ns3/buildings-mobility-model.h>
+#include <ns3/mobility-building-info.h>
 #include <ns3/abort.h>
 #include <ns3/log.h>
 
@@ -33,6 +33,32 @@
 
 namespace ns3 {
 
+
+void
+BuildingsHelper::Install (NodeContainer c)
+{
+  for (NodeContainer::Iterator i = c.Begin (); i != c.End (); ++i)
+    {
+      Install (*i);
+    }
+}
+
+
+void
+BuildingsHelper::Install (Ptr<Node> node)
+{
+  Ptr<Object> object = node;
+  Ptr<MobilityModel> model = object->GetObject<MobilityModel> ();
+  if (model == 0)
+    {
+      NS_ABORT_MSG_UNLESS (0 != model, "node " << node->GetId () << " does not have a MobilityModel");
+
+    }
+  Ptr<MobilityBuildingInfo> buildingInfo = CreateObject<MobilityBuildingInfo> ();
+  model->AggregateObject (buildingInfo);
+}
+
+
 void
 BuildingsHelper::MakeMobilityModelConsistent ()
 {
@@ -42,26 +68,27 @@
       Ptr<MobilityModel> mm = (*nit)->GetObject<MobilityModel> ();
       if (mm != 0)
         {
-          Ptr<BuildingsMobilityModel> bmm = DynamicCast<BuildingsMobilityModel> (mm);
-          NS_ABORT_MSG_UNLESS (0 != bmm, "node " << (*nit)->GetId () << " has a MobilityModel but it is not a BuildingsMobilityModel");
-          MakeConsistent (bmm);
+          MakeConsistent (mm);
+          Ptr<MobilityBuildingInfo> bmm = mm->GetObject<MobilityBuildingInfo> ();
+          NS_ABORT_MSG_UNLESS (0 != bmm, "node " << (*nit)->GetId () << " has a MobilityModel that does not have a MobilityBuildingInfo");
         }
     }
 }
 
 
 void
-BuildingsHelper::MakeConsistent (Ptr<BuildingsMobilityModel> bmm)
+BuildingsHelper::MakeConsistent (Ptr<MobilityModel> mm)
 {
+  Ptr<MobilityBuildingInfo> bmm = mm->GetObject<MobilityBuildingInfo> ();
   bool found = false;
   for (BuildingList::Iterator bit = BuildingList::Begin (); bit != BuildingList::End (); ++bit)
     {
       NS_LOG_LOGIC ("checking building " << (*bit)->GetId () << " with boundaries " << (*bit)->GetBoundaries ());
-      Vector pos = bmm->GetPosition ();
+      Vector pos = mm->GetPosition ();
       if ((*bit)->IsInside (pos))
         {
-          NS_LOG_LOGIC ("BuildingsMobilityModel " << bmm << " pos " << bmm->GetPosition () << " falls inside building " << (*bit)->GetId ());
-          NS_ABORT_MSG_UNLESS (found == false, " BuildingsMobilityModel already inside another building!");		
+          NS_LOG_LOGIC ("MobilityBuildingInfo " << bmm << " pos " << mm->GetPosition () << " falls inside building " << (*bit)->GetId ());
+          NS_ABORT_MSG_UNLESS (found == false, " MobilityBuildingInfo already inside another building!");		
           found = true;
           uint16_t floor = (*bit)->GetFloor (pos);
           uint16_t roomX = (*bit)->GetRoomX (pos);
@@ -71,7 +98,7 @@
     }
   if (!found)
     {
-      NS_LOG_LOGIC ("BuildingsMobilityModel " << bmm << " pos " << bmm->GetPosition ()  << " is outdoor");
+      NS_LOG_LOGIC ("MobilityBuildingInfo " << bmm << " pos " << mm->GetPosition ()  << " is outdoor");
       bmm->SetOutdoor ();
     }
 
diff -Naur ns-3.17/src/buildings/helper/buildings-helper.h ns-3.18/src/buildings/helper/buildings-helper.h
--- ns-3.17/src/buildings/helper/buildings-helper.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/buildings/helper/buildings-helper.h	2013-10-26 07:07:29.543364381 -0700
@@ -30,13 +30,39 @@
 
 namespace ns3 {
 
-class BuildingsMobilityModel;
+class MobilityModel;
+class Building;
 
 class BuildingsHelper
 {
-public:  
+public:
+  /**
+  * Install the MobilityBuildingInfo to a node
+  *
+  * \param node the mobility model of the node to be updated
+  */
+  static void Install (Ptr<Node> node);     // for any nodes
+  /**
+  * Install the MobilityBuildingInfo to the set of nodes in a NodeContainer
+  *
+  * \param c the NodeContainer including the nodes to be updated
+  */
+  static void Install (NodeContainer c);     // for any nodes
+  /**
+  * This method goes through the whole NodeList and, for each node in
+  * the list, calls BuildingsHelper::MakeConsistent() passing to it
+  * the MobilityModel of that node. 
+  *
+  */
   static void MakeMobilityModelConsistent ();
-  static void MakeConsistent (Ptr<BuildingsMobilityModel> bmm);
+  /**
+  * Make the given mobility model consistent, by determining whether
+  * its position falls inside any of the building in BuildingList, and
+  * updating accordingly the BuildingInfo aggregated with the MobilityModel.
+  *
+  * \param bmm the mobility model to be made consistent
+  */
+  static void MakeConsistent (Ptr<MobilityModel> bmm);
   
 };
 
diff -Naur ns-3.17/src/buildings/model/buildings-mobility-model.cc ns-3.18/src/buildings/model/buildings-mobility-model.cc
--- ns-3.17/src/buildings/model/buildings-mobility-model.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/buildings/model/buildings-mobility-model.cc	1969-12-31 16:00:00.000000000 -0800
@@ -1,155 +0,0 @@
-/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
-/*
- * Copyright (c) 2011 Centre Tecnologic de Telecomunicacions de Catalunya (CTTC)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation;
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * Author: Marco Miozzo  <marco.miozzo@cttc.es>
- * 
- */
-
-#include <ns3/simulator.h>
-#include <ns3/position-allocator.h>
-#include <ns3/buildings-mobility-model.h>
-#include <ns3/pointer.h>
-#include <ns3/log.h>
-#include <ns3/assert.h>
-
-NS_LOG_COMPONENT_DEFINE ("BuildingsMobilityModel");
-
-namespace ns3 {
-
-NS_OBJECT_ENSURE_REGISTERED (BuildingsMobilityModel);
-
-TypeId
-BuildingsMobilityModel::GetTypeId (void)
-{
-  static TypeId tid = TypeId ("ns3::BuildingsMobilityModel")
-    .SetParent<MobilityModel> ()
-    .SetGroupName ("Mobility")
-    .AddConstructor<BuildingsMobilityModel> ();
-
-  return tid;
-}
-
-
-BuildingsMobilityModel::BuildingsMobilityModel ()
-{
-  NS_LOG_FUNCTION (this);
-  m_indoor = false;
-  m_nFloor = 1;
-  m_roomX = 1;
-  m_roomY = 1;
-}
-
-void
-BuildingsMobilityModel::DoDispose (void)
-{
-  NS_LOG_FUNCTION (this);
-  MobilityModel::DoDispose ();
-}
-
-Vector
-BuildingsMobilityModel::DoGetPosition (void) const
-{
-  NS_LOG_FUNCTION (this);
-  m_helper.Update ();
-  return m_helper.GetCurrentPosition ();
-}
-void 
-BuildingsMobilityModel::DoSetPosition (const Vector &position)
-{
-  NS_LOG_FUNCTION (this);
-  m_helper.SetPosition (position);
-}
-Vector
-BuildingsMobilityModel::DoGetVelocity (void) const
-{
-  NS_LOG_FUNCTION (this);
-  return m_helper.GetVelocity ();
-}
-
-bool
-BuildingsMobilityModel::IsIndoor (void)
-{
-  NS_LOG_FUNCTION (this);
-  return (m_indoor);
-}
-
-bool
-BuildingsMobilityModel::IsOutdoor (void)
-{
-  NS_LOG_FUNCTION (this);
-  return (!m_indoor);
-}
-
-void
-BuildingsMobilityModel::SetIndoor (Ptr<Building> building, uint8_t nfloor, uint8_t nroomx, uint8_t nroomy)
-{
-  NS_LOG_FUNCTION (this);
-  m_indoor = true;
-  m_myBuilding = building;
-  m_nFloor = nfloor;
-  m_roomX = nroomx;
-  m_roomY = nroomy;
-  
-  NS_ASSERT_MSG (building->IsInside (m_helper.GetCurrentPosition ()), "Position of the node is outside of building bounds");
-  NS_ASSERT (m_roomX > 0);
-  NS_ASSERT (m_roomX <= building->GetNRoomsX ());
-  NS_ASSERT (m_roomY > 0);
-  NS_ASSERT (m_roomY <= building->GetNRoomsY ());
-  NS_ASSERT (m_nFloor > 0);
-  NS_ASSERT (m_nFloor <= building->GetNFloors ());
-
-}
-
-
-void
-BuildingsMobilityModel::SetOutdoor (void)
-{
-  NS_LOG_FUNCTION (this);
-  m_indoor = false;
-}
-
-uint8_t
-BuildingsMobilityModel::GetFloorNumber (void)
-{
-  NS_LOG_FUNCTION (this);
-  return (m_nFloor);
-}
-
-uint8_t
-BuildingsMobilityModel::GetRoomNumberX (void)
-{
-  NS_LOG_FUNCTION (this);
-  return (m_roomX);
-}
-
-uint8_t
-BuildingsMobilityModel::GetRoomNumberY (void)
-{
-  NS_LOG_FUNCTION (this);
-  return (m_roomY);
-}
-
-
-Ptr<Building>
-BuildingsMobilityModel::GetBuilding ()
-{
-  NS_LOG_FUNCTION (this);
-  return (m_myBuilding);
-}
-
-  
-} // namespace
diff -Naur ns-3.17/src/buildings/model/buildings-mobility-model.h ns-3.18/src/buildings/model/buildings-mobility-model.h
--- ns-3.17/src/buildings/model/buildings-mobility-model.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/buildings/model/buildings-mobility-model.h	1969-12-31 16:00:00.000000000 -0800
@@ -1,127 +0,0 @@
-/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
-/*
- * Copyright (c) 2011 Centre Tecnologic de Telecomunicacions de Catalunya (CTTC)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation;
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * Author: Marco Miozzo  <marco.miozzo@cttc.es>
- * 
- */
-#ifndef BUILDINGS_MOBILITY_MODEL_H
-#define BUILDINGS_MOBILITY_MODEL_H
-
-
-
-#include <ns3/mobility-model.h>
-#include <ns3/ptr.h>
-#include <ns3/object.h>
-#include <ns3/box.h>
-#include <map>
-#include <ns3/building.h>
-#include <ns3/constant-velocity-helper.h>
-
-
-
-namespace ns3 {
-
-
-/**
- * \ingroup mobility
- * \brief Buildings mobility model
- *
- * This model implements the managment of scenarios where users might be
- * either indoor (e.g., houses, offices, etc.) and outdoor.
- * 
- */
-class BuildingsMobilityModel : public MobilityModel
-{
-public:
-  static TypeId GetTypeId (void);
-  BuildingsMobilityModel ();
-
-  /** 
-   * 
-   * \return true if the MobilityModel instance is indoor, false otherwise
-   */
-  bool IsIndoor (void);
-
-  /** 
-   * 
-   * \return true if the MobilityModel instance is outdoor, false otherwise
-   */
-  bool IsOutdoor (void);
-
-  /** 
-   * Mark this MobilityModel instance as indoor 
-   * 
-   * \param building the building into which the MobilityModel instance is located
-   * \param nfloor the floor number 1...nFloors at which the  MobilityModel instance is located
-   * \param nroomx the X room number 1...nRoomsX at which the  MobilityModel instance is located
-   * \param nroomy the Y room number 1...nRoomsY at which the  MobilityModel instance is located
-   */
-  void SetIndoor (Ptr<Building> building, uint8_t nfloor, uint8_t nroomx, uint8_t nroomy);
-
-  /** 
-   * Mark this MobilityModel instance as outdoor
-   * 
-   */
-  void SetOutdoor ();
-
-  /** 
-   * 
-   * \return 
-   */
-  uint8_t GetFloorNumber (void);
-
-  /** 
-   * 
-   * \return 
-   */
-  uint8_t GetRoomNumberX (void);
-
-  /** 
-   * 
-   * \return 
-   */
-  uint8_t GetRoomNumberY (void);
-
-  /** 
-   * 
-   * \return 
-   */
-  Ptr<Building> GetBuilding ();
-
-
-
-private:
-  virtual void DoDispose (void);
-  virtual Vector DoGetPosition (void) const;
-  virtual void DoSetPosition (const Vector &position);
-  virtual Vector DoGetVelocity (void) const;
-  ConstantVelocityHelper m_helper;
-
-  Ptr<Building> m_myBuilding;
-  bool m_indoor;
-  uint8_t m_nFloor;
-  uint8_t m_roomX;
-  uint8_t m_roomY;
-
-};
-
-
-
-} // namespace ns3
-
-
-#endif // BUILDINGS_MOBILITY_MODEL_H
diff -Naur ns-3.17/src/buildings/model/buildings-propagation-loss-model.cc ns-3.18/src/buildings/model/buildings-propagation-loss-model.cc
--- ns-3.17/src/buildings/model/buildings-propagation-loss-model.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/buildings/model/buildings-propagation-loss-model.cc	2013-10-26 07:07:29.543364381 -0700
@@ -27,7 +27,7 @@
 #include "ns3/pointer.h"
 #include <cmath>
 #include "buildings-propagation-loss-model.h"
-#include "ns3/buildings-mobility-model.h"
+#include <ns3/mobility-building-info.h>
 #include "ns3/enum.h"
 
 
@@ -100,7 +100,7 @@
 }
 
 double
-BuildingsPropagationLossModel::ExternalWallLoss (Ptr<BuildingsMobilityModel> a) const
+BuildingsPropagationLossModel::ExternalWallLoss (Ptr<MobilityBuildingInfo> a) const
 {
   double loss = 0.0;
   Ptr<Building> aBuilding = a->GetBuilding ();
@@ -124,7 +124,7 @@
 }
 
 double
-BuildingsPropagationLossModel::HeightLoss (Ptr<BuildingsMobilityModel> node) const
+BuildingsPropagationLossModel::HeightLoss (Ptr<MobilityBuildingInfo> node) const
 {
   double loss = 0.0;
 
@@ -134,7 +134,7 @@
 }
 
 double
-BuildingsPropagationLossModel::InternalWallsLoss (Ptr<BuildingsMobilityModel> a, Ptr<BuildingsMobilityModel>b) const
+BuildingsPropagationLossModel::InternalWallsLoss (Ptr<MobilityBuildingInfo> a, Ptr<MobilityBuildingInfo>b) const
 {
   // approximate the number of internal walls with the Manhattan distance in "rooms" units
   double dx = std::abs (a->GetRoomNumberX () - b->GetRoomNumberX ());
@@ -148,9 +148,9 @@
 BuildingsPropagationLossModel::GetShadowing (Ptr<MobilityModel> a, Ptr<MobilityModel> b)
 const
 {
-    Ptr<BuildingsMobilityModel> a1 = DynamicCast<BuildingsMobilityModel> (a);
-    Ptr<BuildingsMobilityModel> b1 = DynamicCast<BuildingsMobilityModel> (b);
-    NS_ASSERT_MSG ((a1 != 0) && (b1 != 0), "BuildingsPropagationLossModel only works with BuildingsMobilityModel");
+    Ptr<MobilityBuildingInfo> a1 = a->GetObject <MobilityBuildingInfo> ();
+    Ptr<MobilityBuildingInfo> b1 = b->GetObject <MobilityBuildingInfo> ();
+    NS_ASSERT_MSG ((a1 != 0) && (b1 != 0), "BuildingsPropagationLossModel only works with MobilityBuildingInfo");
   
   std::map<Ptr<MobilityModel>,  std::map<Ptr<MobilityModel>, ShadowingLoss> >::iterator ait = m_shadowingLossMap.find (a);
   if (ait != m_shadowingLossMap.end ())
@@ -184,7 +184,7 @@
 
 
 double
-BuildingsPropagationLossModel::EvaluateSigma (Ptr<BuildingsMobilityModel> a, Ptr<BuildingsMobilityModel> b)
+BuildingsPropagationLossModel::EvaluateSigma (Ptr<MobilityBuildingInfo> a, Ptr<MobilityBuildingInfo> b)
 const
 {
   if (a->IsOutdoor ())
diff -Naur ns-3.17/src/buildings/model/buildings-propagation-loss-model.h ns-3.18/src/buildings/model/buildings-propagation-loss-model.h
--- ns-3.17/src/buildings/model/buildings-propagation-loss-model.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/buildings/model/buildings-propagation-loss-model.h	2013-10-26 07:07:29.543364381 -0700
@@ -27,7 +27,8 @@
 #include "ns3/propagation-loss-model.h"
 #include "ns3/random-variable-stream.h"
 #include <ns3/building.h>
-#include <ns3/buildings-mobility-model.h>
+#include <ns3/mobility-building-info.h>
+
 
 
 namespace ns3 {
@@ -48,7 +49,8 @@
  *  The distance-dependent component of propagation loss is deferred
  *  to derived classes which are expected to implement the GetLoss method.
  *  
- *  \warning This model works only with BuildingsMobilityModel
+ *  \warning This model works only when MobilityBuildingInfo is aggreegated
+ *  to the mobility model
  *
  */
 
@@ -70,9 +72,9 @@
   virtual double DoCalcRxPower (double txPowerDbm, Ptr<MobilityModel> a, Ptr<MobilityModel> b) const;
 
 protected:
-  double ExternalWallLoss (Ptr<BuildingsMobilityModel> a) const;
-  double HeightLoss (Ptr<BuildingsMobilityModel> n) const;
-  double InternalWallsLoss (Ptr<BuildingsMobilityModel> a, Ptr<BuildingsMobilityModel> b) const;
+  double ExternalWallLoss (Ptr<MobilityBuildingInfo> a) const;
+  double HeightLoss (Ptr<MobilityBuildingInfo> n) const;
+  double InternalWallsLoss (Ptr<MobilityBuildingInfo> a, Ptr<MobilityBuildingInfo> b) const;
   
   double GetShadowing (Ptr<MobilityModel> a, Ptr<MobilityModel> b) const;
 
@@ -92,7 +94,7 @@
   };
 
   mutable std::map<Ptr<MobilityModel>,  std::map<Ptr<MobilityModel>, ShadowingLoss> > m_shadowingLossMap;
-  double EvaluateSigma (Ptr<BuildingsMobilityModel> a, Ptr<BuildingsMobilityModel> b) const;
+  double EvaluateSigma (Ptr<MobilityBuildingInfo> a, Ptr<MobilityBuildingInfo> b) const;
 
 
   double m_shadowingSigmaExtWalls;
diff -Naur ns-3.17/src/buildings/model/hybrid-buildings-propagation-loss-model.cc ns-3.18/src/buildings/model/hybrid-buildings-propagation-loss-model.cc
--- ns-3.17/src/buildings/model/hybrid-buildings-propagation-loss-model.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/buildings/model/hybrid-buildings-propagation-loss-model.cc	2013-10-26 07:07:29.543364381 -0700
@@ -31,7 +31,7 @@
 #include "ns3/itu-r-1411-nlos-over-rooftop-propagation-loss-model.h"
 #include "ns3/itu-r-1238-propagation-loss-model.h"
 #include "ns3/kun-2600-mhz-propagation-loss-model.h"
-#include "ns3/buildings-mobility-model.h"
+#include <ns3/mobility-building-info.h>
 #include "ns3/enum.h"
 
 #include "hybrid-buildings-propagation-loss-model.h"
@@ -146,10 +146,10 @@
   
   double distance = a->GetDistanceFrom (b);
 
-  // get the BuildingsMobilityModel pointers
-  Ptr<BuildingsMobilityModel> a1 = DynamicCast<BuildingsMobilityModel> (a);
-  Ptr<BuildingsMobilityModel> b1 = DynamicCast<BuildingsMobilityModel> (b);
-  NS_ASSERT_MSG ((a1 != 0) && (b1 != 0), "HybridBuildingsPropagationLossModel only works with BuildingsMobilityModel");
+  // get the MobilityBuildingInfo pointers
+  Ptr<MobilityBuildingInfo> a1 = a->GetObject<MobilityBuildingInfo> ();
+  Ptr<MobilityBuildingInfo> b1 = b->GetObject<MobilityBuildingInfo> ();
+  NS_ASSERT_MSG ((a1 != 0) && (b1 != 0), "HybridBuildingsPropagationLossModel only works with MobilityBuildingInfo");
 
   double loss = 0.0;
 
@@ -159,24 +159,24 @@
         {
           if (distance > 1000)
             {
-              NS_LOG_INFO (this << a1->GetPosition ().z << b1->GetPosition ().z << m_rooftopHeight);
-              if ((a1->GetPosition ().z < m_rooftopHeight)
-                  && (b1->GetPosition ().z < m_rooftopHeight))
+              NS_LOG_INFO (this << a->GetPosition ().z << b->GetPosition ().z << m_rooftopHeight);
+              if ((a->GetPosition ().z < m_rooftopHeight)
+                  && (b->GetPosition ().z < m_rooftopHeight))
                 {
-                  loss = ItuR1411 (a1, b1);
+                  loss = ItuR1411 (a, b);
                   NS_LOG_INFO (this << " 0-0 (>1000): below rooftop -> ITUR1411 : " << loss);
                 }
               else
                 {
                   // Over the rooftop tranmission -> Okumura Hata
-                  loss = OkumuraHata (a1, b1);
+                  loss = OkumuraHata (a, b);
                   NS_LOG_INFO (this << " O-O (>1000): above rooftop -> OH : " << loss);
                 }
             }
           else
             {
               // short range outdoor communication
-              loss = ItuR1411 (a1, b1);
+              loss = ItuR1411 (a, b);
               NS_LOG_INFO (this << " 0-0 (<1000) Street canyon -> ITUR1411 : " << loss);
             }
         }
@@ -185,21 +185,21 @@
           // b indoor
           if (distance > 1000)
             {
-              if ((a1->GetPosition ().z < m_rooftopHeight)
-                  && (b1->GetPosition ().z < m_rooftopHeight))
+              if ((a->GetPosition ().z < m_rooftopHeight)
+                  && (b->GetPosition ().z < m_rooftopHeight))
                 {                  
-                  loss = ItuR1411 (a1, b1) + ExternalWallLoss (b1) + HeightLoss (a1);
+                  loss = ItuR1411 (a, b) + ExternalWallLoss (b1) + HeightLoss (b1);
                   NS_LOG_INFO (this << " 0-I (>1000): below rooftop -> ITUR1411 : " << loss);
                 }
               else
                 {
-                  loss = OkumuraHata (a1, b1) + ExternalWallLoss (b1);
+                  loss = OkumuraHata (a, b) + ExternalWallLoss (b1);
                   NS_LOG_INFO (this << " O-I (>1000): above the rooftop -> OH : " << loss);
                 }
             }
           else
             {
-              loss = ItuR1411 (a1, b1) + ExternalWallLoss (b1) + HeightLoss (b1);
+              loss = ItuR1411 (a, b) + ExternalWallLoss (b1) + HeightLoss (b1);
               NS_LOG_INFO (this << " 0-I (<1000) ITUR1411 + BEL : " << loss);
             }
         } // end b1->isIndoor ()
@@ -212,14 +212,14 @@
           if (a1->GetBuilding () == b1->GetBuilding ())
             {
               // nodes are in same building -> indoor communication ITU-R P.1238
-              loss = ItuR1238 (a1, b1) + InternalWallsLoss (a1, b1);;
+              loss = ItuR1238 (a, b) + InternalWallsLoss (a1, b1);;
               NS_LOG_INFO (this << " I-I (same building) ITUR1238 : " << loss);
 
             }
           else
             {
               // nodes are in different buildings
-              loss = ItuR1411 (a1, b1) + ExternalWallLoss (a1) + ExternalWallLoss (b1);
+              loss = ItuR1411 (a, b) + ExternalWallLoss (a1) + ExternalWallLoss (b1);
               NS_LOG_INFO (this << " I-I (different) ITUR1238 + 2*BEL : " << loss);
             }
         }
@@ -228,22 +228,22 @@
           // b is outdoor
           if (distance > 1000)
             {
-              if ((a1->GetPosition ().z < m_rooftopHeight)
-                  && (b1->GetPosition ().z < m_rooftopHeight))
+              if ((a->GetPosition ().z < m_rooftopHeight)
+                  && (b->GetPosition ().z < m_rooftopHeight))
                 {
-                  loss = ItuR1411 (a1, b1) + ExternalWallLoss (a1) + HeightLoss (a1);
+                  loss = ItuR1411 (a, b) + ExternalWallLoss (a1) + HeightLoss (a1);
                   NS_LOG_INFO (this << " I-O (>1000): down rooftop -> ITUR1411 : " << loss);
                 }
               else
                 {
                   // above rooftop -> OH
-                  loss = OkumuraHata (a1, b1) + ExternalWallLoss (a1) + HeightLoss (a1);
+                  loss = OkumuraHata (a, b) + ExternalWallLoss (a1) + HeightLoss (a1);
                   NS_LOG_INFO (this << " =I-O (>1000) over rooftop OH + BEL + HG: " << loss);
                 }
             }
           else
             {
-              loss = ItuR1411 (a1, b1) + ExternalWallLoss (a1)  + HeightLoss (a1);
+              loss = ItuR1411 (a, b) + ExternalWallLoss (a1)  + HeightLoss (a1);
               NS_LOG_INFO (this << " I-O (<1000)  ITUR1411 + BEL + HG: " << loss);
             }
         } // end b1->IsIndoor ()
@@ -256,7 +256,7 @@
 
 
 double
-HybridBuildingsPropagationLossModel::OkumuraHata (Ptr<BuildingsMobilityModel> a, Ptr<BuildingsMobilityModel> b) const
+HybridBuildingsPropagationLossModel::OkumuraHata (Ptr<MobilityModel> a, Ptr<MobilityModel> b) const
 {
   if (m_frequency <= 2.3e9)
     {
@@ -269,7 +269,7 @@
 }
 
 double
-HybridBuildingsPropagationLossModel::ItuR1411 (Ptr<BuildingsMobilityModel> a, Ptr<BuildingsMobilityModel> b) const
+HybridBuildingsPropagationLossModel::ItuR1411 (Ptr<MobilityModel> a, Ptr<MobilityModel> b) const
 {
   if (a->GetDistanceFrom (b) < m_itu1411NlosThreshold)
     {
@@ -282,7 +282,7 @@
 }
 
 double
-HybridBuildingsPropagationLossModel::ItuR1238 (Ptr<BuildingsMobilityModel> a, Ptr<BuildingsMobilityModel> b) const
+HybridBuildingsPropagationLossModel::ItuR1238 (Ptr<MobilityModel> a, Ptr<MobilityModel> b) const
 {
   return m_ituR1238->GetLoss (a,b);
 }
diff -Naur ns-3.17/src/buildings/model/hybrid-buildings-propagation-loss-model.h ns-3.18/src/buildings/model/hybrid-buildings-propagation-loss-model.h
--- ns-3.17/src/buildings/model/hybrid-buildings-propagation-loss-model.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/buildings/model/hybrid-buildings-propagation-loss-model.h	2013-10-26 07:07:29.543364381 -0700
@@ -49,7 +49,7 @@
  *  - Building penetretation loss
  *  - floors, etc...
  *
- *  \warning This model works only with BuildingsMobilityModel
+ *  \warning This model works only with MobilityBuildingInfo
  *
  */
 
@@ -100,9 +100,9 @@
   
 private:
 
-  double OkumuraHata (Ptr<BuildingsMobilityModel> a, Ptr<BuildingsMobilityModel> b) const;
-  double ItuR1411 (Ptr<BuildingsMobilityModel> a, Ptr<BuildingsMobilityModel> b) const;
-  double ItuR1238 (Ptr<BuildingsMobilityModel> a, Ptr<BuildingsMobilityModel> b) const;
+  double OkumuraHata (Ptr<MobilityModel> a, Ptr<MobilityModel> b) const;
+  double ItuR1411 (Ptr<MobilityModel> a, Ptr<MobilityModel> b) const;
+  double ItuR1238 (Ptr<MobilityModel> a, Ptr<MobilityModel> b) const;
 
   Ptr<OkumuraHataPropagationLossModel> m_okumuraHata;
   Ptr<ItuR1411LosPropagationLossModel> m_ituR1411Los;
diff -Naur ns-3.17/src/buildings/model/itu-r-1238-propagation-loss-model.cc ns-3.18/src/buildings/model/itu-r-1238-propagation-loss-model.cc
--- ns-3.17/src/buildings/model/itu-r-1238-propagation-loss-model.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/buildings/model/itu-r-1238-propagation-loss-model.cc	2013-10-26 07:07:29.543364381 -0700
@@ -26,7 +26,7 @@
 #include <cmath>
 
 #include "itu-r-1238-propagation-loss-model.h"
-#include "buildings-mobility-model.h"
+#include <ns3/mobility-building-info.h>
 
 NS_LOG_COMPONENT_DEFINE ("ItuR1238PropagationLossModel");
 
@@ -55,9 +55,9 @@
 ItuR1238PropagationLossModel::GetLoss (Ptr<MobilityModel> a1, Ptr<MobilityModel> b1) const
 {
   NS_LOG_FUNCTION (this << a1 << b1);
-  Ptr<BuildingsMobilityModel> a = DynamicCast<BuildingsMobilityModel> (a1);
-  Ptr<BuildingsMobilityModel> b = DynamicCast<BuildingsMobilityModel> (b1);
-  NS_ASSERT_MSG ((a != 0) && (b != 0), "ItuR1238PropagationLossModel only works with BuildingsMobilityModel");
+  Ptr<MobilityBuildingInfo> a = a1->GetObject<MobilityBuildingInfo> ();
+  Ptr<MobilityBuildingInfo> b = b1->GetObject<MobilityBuildingInfo> ();
+  NS_ASSERT_MSG ((a != 0) && (b != 0), "ItuR1238PropagationLossModel only works with MobilityBuildingInfo");
   NS_ASSERT_MSG (a->GetBuilding ()->GetId () == b->GetBuilding ()->GetId (), "ITU-R 1238 applies only to nodes that are in the same building");
   double N = 0.0;
   int n = std::abs (a->GetFloorNumber () - b->GetFloorNumber ());
@@ -95,8 +95,8 @@
     {
       NS_LOG_ERROR (this << " Unkwnon Wall Type");
     }
-  double loss = 20 * std::log10 (m_frequency / 1e6 /*MHz*/) + N * std::log10 (a->GetDistanceFrom (b)) + Lf - 28.0;
-  NS_LOG_INFO (this << " Node " << a->GetPosition () << " <-> " << b->GetPosition () << " loss = " << loss << " dB");
+  double loss = 20 * std::log10 (m_frequency / 1e6 /*MHz*/) + N * std::log10 (a1->GetDistanceFrom (b1)) + Lf - 28.0;
+  NS_LOG_INFO (this << " Node " << a1->GetPosition () << " <-> " << b1->GetPosition () << " loss = " << loss << " dB");
 
   return loss;
 }
diff -Naur ns-3.17/src/buildings/model/mobility-building-info.cc ns-3.18/src/buildings/model/mobility-building-info.cc
--- ns-3.17/src/buildings/model/mobility-building-info.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/buildings/model/mobility-building-info.cc	2013-10-26 07:07:29.543364381 -0700
@@ -0,0 +1,159 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2011 Centre Tecnologic de Telecomunicacions de Catalunya (CTTC)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Marco Miozzo  <marco.miozzo@cttc.es>
+ * 
+ */
+
+#include <ns3/simulator.h>
+#include <ns3/position-allocator.h>
+#include <ns3/mobility-building-info.h>
+#include <ns3/pointer.h>
+#include <ns3/log.h>
+#include <ns3/assert.h>
+
+NS_LOG_COMPONENT_DEFINE ("MobilityBuildingInfo");
+
+namespace ns3 {
+
+NS_OBJECT_ENSURE_REGISTERED (MobilityBuildingInfo);
+
+TypeId
+MobilityBuildingInfo::GetTypeId (void)
+{
+  static TypeId tid = TypeId ("ns3::MobilityBuildingInfo")
+    .SetParent<Object> ()
+    .SetGroupName ("Building")
+    .AddConstructor<MobilityBuildingInfo> ();
+
+  return tid;
+}
+
+
+MobilityBuildingInfo::MobilityBuildingInfo ()
+{
+  NS_LOG_FUNCTION (this);
+  m_indoor = false;
+  m_nFloor = 1;
+  m_roomX = 1;
+  m_roomY = 1;
+}
+
+
+MobilityBuildingInfo::MobilityBuildingInfo (Ptr<Building> building)
+  : m_myBuilding (building)
+{
+  NS_LOG_FUNCTION (this);
+  m_indoor = false;
+  m_nFloor = 1;
+  m_roomX = 1;
+  m_roomY = 1;
+}
+
+bool
+MobilityBuildingInfo::IsIndoor (void)
+{
+  NS_LOG_FUNCTION (this);
+  return (m_indoor);
+}
+
+bool
+MobilityBuildingInfo::IsOutdoor (void)
+{
+  NS_LOG_FUNCTION (this);
+  return (!m_indoor);
+}
+
+void
+MobilityBuildingInfo::SetIndoor (Ptr<Building> building, uint8_t nfloor, uint8_t nroomx, uint8_t nroomy)
+{
+  NS_LOG_FUNCTION (this);
+  m_indoor = true;
+  m_myBuilding = building;
+  m_nFloor = nfloor;
+  m_roomX = nroomx;
+  m_roomY = nroomy;
+  
+
+  NS_ASSERT (m_roomX > 0);
+  NS_ASSERT (m_roomX <= building->GetNRoomsX ());
+  NS_ASSERT (m_roomY > 0);
+  NS_ASSERT (m_roomY <= building->GetNRoomsY ());
+  NS_ASSERT (m_nFloor > 0);
+  NS_ASSERT (m_nFloor <= building->GetNFloors ());
+
+}
+
+
+void
+MobilityBuildingInfo::SetIndoor (uint8_t nfloor, uint8_t nroomx, uint8_t nroomy)
+{
+  NS_LOG_FUNCTION (this);
+  m_indoor = true;
+  m_nFloor = nfloor;
+  m_roomX = nroomx;
+  m_roomY = nroomy;
+
+  NS_ASSERT_MSG (m_myBuilding, "Node does not have any building defined");
+  NS_ASSERT (m_roomX > 0);
+  NS_ASSERT (m_roomX <= m_myBuilding->GetNRoomsX ());
+  NS_ASSERT (m_roomY > 0);
+  NS_ASSERT (m_roomY <= m_myBuilding->GetNRoomsY ());
+  NS_ASSERT (m_nFloor > 0);
+  NS_ASSERT (m_nFloor <= m_myBuilding->GetNFloors ());
+
+}
+
+
+void
+MobilityBuildingInfo::SetOutdoor (void)
+{
+  NS_LOG_FUNCTION (this);
+  m_indoor = false;
+}
+
+uint8_t
+MobilityBuildingInfo::GetFloorNumber (void)
+{
+  NS_LOG_FUNCTION (this);
+  return (m_nFloor);
+}
+
+uint8_t
+MobilityBuildingInfo::GetRoomNumberX (void)
+{
+  NS_LOG_FUNCTION (this);
+  return (m_roomX);
+}
+
+uint8_t
+MobilityBuildingInfo::GetRoomNumberY (void)
+{
+  NS_LOG_FUNCTION (this);
+  return (m_roomY);
+}
+
+
+Ptr<Building>
+MobilityBuildingInfo::GetBuilding ()
+{
+  NS_LOG_FUNCTION (this);
+  return (m_myBuilding);
+}
+
+  
+} // namespace
diff -Naur ns-3.17/src/buildings/model/mobility-building-info.h ns-3.18/src/buildings/model/mobility-building-info.h
--- ns-3.17/src/buildings/model/mobility-building-info.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/buildings/model/mobility-building-info.h	2013-10-26 07:07:29.543364381 -0700
@@ -0,0 +1,127 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2011 Centre Tecnologic de Telecomunicacions de Catalunya (CTTC)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Marco Miozzo  <marco.miozzo@cttc.es>
+ * 
+ */
+#ifndef MOBILITY_BUILDING_INFO_H
+#define MOBILITY_BUILDING_INFO_H
+
+
+
+#include <ns3/simple-ref-count.h>
+#include <ns3/ptr.h>
+#include <ns3/object.h>
+#include <ns3/box.h>
+#include <map>
+#include <ns3/building.h>
+#include <ns3/constant-velocity-helper.h>
+
+
+
+namespace ns3 {
+
+
+/**
+ * \ingroup buildings
+ * \brief mobility buildings information (to be used by mobility models)
+ *
+ * This model implements the managment of scenarios where users might be
+ * either indoor (e.g., houses, offices, etc.) and outdoor.
+ * 
+ */
+class MobilityBuildingInfo : public Object
+{
+public:
+  static TypeId GetTypeId (void);
+  MobilityBuildingInfo ();
+
+  MobilityBuildingInfo (Ptr<Building> building);
+
+  /** 
+   * 
+   * \return true if the MobilityBuildingInfo instance is indoor, false otherwise
+   */
+  bool IsIndoor (void);
+
+  /** 
+   * 
+   * \return true if the MobilityBuildingInfo instance is outdoor, false otherwise
+   */
+  bool IsOutdoor (void);
+
+  /** 
+   * Mark this MobilityBuildingInfo instance as indoor
+   * 
+   * \param building the building into which the MobilityBuildingInfo instance is located
+   * \param nfloor the floor number 1...nFloors at which the  MobilityBuildingInfo instance is located
+   * \param nroomx the X room number 1...nRoomsX at which the  MobilityBuildingInfo instance is located
+   * \param nroomy the Y room number 1...nRoomsY at which the  MobilityBuildingInfo instance is located
+   */
+  void SetIndoor (Ptr<Building> building, uint8_t nfloor, uint8_t nroomx, uint8_t nroomy);
+
+
+  void SetIndoor (uint8_t nfloor, uint8_t nroomx, uint8_t nroomy);
+
+  /** 
+   * Mark this MobilityBuildingInfo instance as outdoor
+   * 
+   */
+  void SetOutdoor ();
+
+  /** 
+   * 
+   * \return 
+   */
+  uint8_t GetFloorNumber (void);
+
+  /** 
+   * 
+   * \return 
+   */
+  uint8_t GetRoomNumberX (void);
+
+  /** 
+   * 
+   * \return 
+   */
+  uint8_t GetRoomNumberY (void);
+
+  /** 
+   * 
+   * \return 
+   */
+  Ptr<Building> GetBuilding ();
+
+
+
+private:
+
+  Ptr<Building> m_myBuilding;
+  bool m_indoor;
+  uint8_t m_nFloor;
+  uint8_t m_roomX;
+  uint8_t m_roomY;
+
+};
+
+
+
+} // namespace ns3
+
+
+#endif // MOBILITY_BUILDING_INFO_H
diff -Naur ns-3.17/src/buildings/model/oh-buildings-propagation-loss-model.cc ns-3.18/src/buildings/model/oh-buildings-propagation-loss-model.cc
--- ns-3.17/src/buildings/model/oh-buildings-propagation-loss-model.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/buildings/model/oh-buildings-propagation-loss-model.cc	2013-10-26 07:07:29.543364381 -0700
@@ -26,7 +26,7 @@
 #include "ns3/pointer.h"
 #include <cmath>
 #include "oh-buildings-propagation-loss-model.h"
-#include "ns3/buildings-mobility-model.h"
+#include <ns3/mobility-building-info.h>
 #include "ns3/okumura-hata-propagation-loss-model.h"
 #include "ns3/enum.h"
 
@@ -66,10 +66,10 @@
 {
   NS_LOG_FUNCTION (this << a << b);
 
-  // get the BuildingsMobilityModel pointers
-  Ptr<BuildingsMobilityModel> a1 = DynamicCast<BuildingsMobilityModel> (a);
-  Ptr<BuildingsMobilityModel> b1 = DynamicCast<BuildingsMobilityModel> (b);
-  NS_ASSERT_MSG ((a1 != 0) && (b1 != 0), "OhBuildingsPropagationLossModel only works with BuildingsMobilityModel");
+  // get the MobilityBuildingInfo pointers
+  Ptr<MobilityBuildingInfo> a1 = a->GetObject<MobilityBuildingInfo> ();
+  Ptr<MobilityBuildingInfo> b1 = b->GetObject<MobilityBuildingInfo> ();
+  NS_ASSERT_MSG ((a1 != 0) && (b1 != 0), "OhBuildingsPropagationLossModel only works with MobilityBuildingInfo");
 
   double loss = 0.0;
 
@@ -77,13 +77,13 @@
     {
       if (b1->IsOutdoor ())
         {
-          loss = m_okumuraHata->GetLoss (a1, b1);
+          loss = m_okumuraHata->GetLoss (a, b);
           NS_LOG_INFO (this << " O-O : " << loss);
         }
       else
         {
           // b indoor
-          loss = m_okumuraHata->GetLoss (a1, b1) + ExternalWallLoss (b1);
+          loss = m_okumuraHata->GetLoss (a, b) + ExternalWallLoss (b1);
           NS_LOG_INFO (this << " O-I : " << loss);
         } // end b1->isIndoor ()
     }
@@ -95,20 +95,20 @@
           if (a1->GetBuilding () == b1->GetBuilding ())
             {
               // nodes are in same building -> indoor communication ITU-R P.1238
-              loss = m_okumuraHata->GetLoss (a1, b1) + InternalWallsLoss (a1, b1);;
+              loss = m_okumuraHata->GetLoss (a, b) + InternalWallsLoss (a1, b1);;
               NS_LOG_INFO (this << " I-I (same building)" << loss);
 
             }
           else
             {
               // nodes are in different buildings
-              loss = m_okumuraHata->GetLoss (a1, b1) + ExternalWallLoss (a1) + ExternalWallLoss (b1);
+              loss = m_okumuraHata->GetLoss (a, b) + ExternalWallLoss (a1) + ExternalWallLoss (b1);
               NS_LOG_INFO (this << " I-O-I (different buildings): " << loss);
             }
         }
       else
         {
-          loss = m_okumuraHata->GetLoss (a1, b1) + ExternalWallLoss (a1);
+          loss = m_okumuraHata->GetLoss (a, b) + ExternalWallLoss (a1);
           NS_LOG_INFO (this << " I-O : " << loss);
         } // end b1->IsIndoor ()
     } // end a1->IsOutdoor ()
diff -Naur ns-3.17/src/buildings/model/oh-buildings-propagation-loss-model.h ns-3.18/src/buildings/model/oh-buildings-propagation-loss-model.h
--- ns-3.17/src/buildings/model/oh-buildings-propagation-loss-model.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/buildings/model/oh-buildings-propagation-loss-model.h	2013-10-26 07:07:29.543364381 -0700
@@ -33,7 +33,7 @@
  *
  *  this model combines the OkumuraHata model with the BuildingsPropagationLossModel
  * 
- *  \warning This model works with BuildingsMobilityModel only
+ *  \warning This model works with MobilityBuildingInfo only
  *
  */
 class OhBuildingsPropagationLossModel : public BuildingsPropagationLossModel
diff -Naur ns-3.17/src/buildings/test/building-position-allocator-test.cc ns-3.18/src/buildings/test/building-position-allocator-test.cc
--- ns-3.17/src/buildings/test/building-position-allocator-test.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/buildings/test/building-position-allocator-test.cc	2013-10-26 07:07:29.555364380 -0700
@@ -23,7 +23,9 @@
 #include "ns3/log.h"
 #include "ns3/test.h"
 #include <ns3/building-position-allocator.h>
-#include <ns3/buildings-mobility-model.h>
+#include <ns3/mobility-building-info.h>
+#include <ns3/constant-position-mobility-model.h>
+#include <ns3/mobility-model.h>
 #include <ns3/building.h>
 #include <ns3/buildings-helper.h>
 #include <ns3/mobility-helper.h>
@@ -95,10 +97,11 @@
   nodes.Create (24);
 
   MobilityHelper mobility;
-  mobility.SetMobilityModel ("ns3::BuildingsMobilityModel");
+  mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
   Ptr<PositionAllocator> positionAlloc = CreateObject<RandomRoomPositionAllocator> ();
   mobility.SetPositionAllocator (positionAlloc);
   mobility.Install (nodes);
+  BuildingsHelper::Install (nodes);
 
   BuildingsHelper::MakeMobilityModelConsistent ();
 
@@ -108,14 +111,14 @@
     {
       Ptr<MobilityModel> mm = (*it)->GetObject<MobilityModel> ();
       NS_ASSERT_MSG (mm, "no mobility model aggregated to this node");
-      Ptr<BuildingsMobilityModel> bmm = DynamicCast<BuildingsMobilityModel> (mm);
-      NS_ASSERT_MSG (bmm, "mobility model aggregated to this node is not a BuildingsMobilityModel");
+      Ptr<MobilityBuildingInfo> bmm = mm->GetObject<MobilityBuildingInfo> ();
+      NS_ASSERT_MSG (bmm, "MobilityBuildingInfo has not been aggregated to this node mobility model");
 
       NS_TEST_ASSERT_MSG_EQ (bmm->IsIndoor (), true, "node should be indoor");
       Room r (bmm->GetRoomNumberX (), bmm->GetRoomNumberY (), bmm->GetFloorNumber ());
       ++(roomCounter[r]);
 
-      Vector p = bmm->GetPosition ();
+      Vector p = mm->GetPosition ();
       NS_TEST_ASSERT_MSG_GT (p.x, bmm->GetRoomNumberX (), "wrong x value");
       NS_TEST_ASSERT_MSG_LT (p.x, bmm->GetRoomNumberX () + 1, "wrong x value");
       NS_TEST_ASSERT_MSG_GT (p.y, bmm->GetRoomNumberY (), "wrong y value");
@@ -176,16 +179,18 @@
   nodes.Create (24);
 
   MobilityHelper mobility;
-  mobility.SetMobilityModel ("ns3::BuildingsMobilityModel");
+  mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
   Ptr<PositionAllocator> positionAlloc = CreateObject<RandomRoomPositionAllocator> ();
   mobility.SetPositionAllocator (positionAlloc);
   mobility.Install (nodes);
+  BuildingsHelper::Install (nodes);
 
   NodeContainer copyNodes;
   copyNodes.Create (48);
   positionAlloc = CreateObject<SameRoomPositionAllocator> (nodes);
   mobility.SetPositionAllocator (positionAlloc);
   mobility.Install (copyNodes);
+  BuildingsHelper::Install (copyNodes);
 
   BuildingsHelper::MakeMobilityModelConsistent ();
 
@@ -195,8 +200,8 @@
     {
       Ptr<MobilityModel> mm = (*it)->GetObject<MobilityModel> ();
       NS_ASSERT_MSG (mm, "no mobility model aggregated to this node");
-      Ptr<BuildingsMobilityModel> bmm = DynamicCast<BuildingsMobilityModel> (mm);
-      NS_ASSERT_MSG (bmm, "mobility model aggregated to this node is not a BuildingsMobilityModel");
+      Ptr<MobilityBuildingInfo> bmm = mm->GetObject<MobilityBuildingInfo> ();
+      NS_ASSERT_MSG (bmm, "MobilityBuildingInfo has not been aggregated to this node mobility model");
 
       NS_TEST_ASSERT_MSG_EQ (bmm->IsIndoor (), true, "node should be indoor");
       Room r (bmm->GetRoomNumberX (), bmm->GetRoomNumberY (), bmm->GetFloorNumber ());
diff -Naur ns-3.17/src/buildings/test/buildings-helper-test.cc ns-3.18/src/buildings/test/buildings-helper-test.cc
--- ns-3.17/src/buildings/test/buildings-helper-test.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/buildings/test/buildings-helper-test.cc	2013-10-26 07:07:29.551364380 -0700
@@ -22,7 +22,8 @@
 
 #include "ns3/log.h"
 #include "ns3/test.h"
-#include <ns3/buildings-mobility-model.h>
+#include <ns3/mobility-building-info.h>
+#include <ns3/constant-position-mobility-model.h>
 #include <ns3/building.h>
 #include <ns3/buildings-helper.h>
 #include <ns3/mobility-helper.h>
@@ -133,13 +134,13 @@
 {
   NS_LOG_FUNCTION (this << BuildNameString (m_pib, m_bd));
   MobilityHelper mobility;
-  mobility.SetMobilityModel ("ns3::BuildingsMobilityModel");
+  mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
 
   NodeContainer nodes;
   nodes.Create (1);
   mobility.Install (nodes);
   
-  Ptr<BuildingsMobilityModel> bmm = nodes.Get (0)->GetObject<BuildingsMobilityModel> ();
+  Ptr<ConstantPositionMobilityModel> bmm = nodes.Get (0)->GetObject<ConstantPositionMobilityModel> ();
   bmm->SetPosition (m_pib.pos);
 
   NS_LOG_LOGIC ("create building");
@@ -148,19 +149,20 @@
   b->SetNFloors (m_bd.nf);
   b->SetNRoomsX (m_bd.nrx);
   b->SetNRoomsY (m_bd.nry);
-  
+  Ptr<MobilityBuildingInfo> buildingInfo = CreateObject<MobilityBuildingInfo> (b);
+  bmm->AggregateObject (buildingInfo); // operation usually done by BuildingsHelper::Install
   BuildingsHelper::MakeMobilityModelConsistent ();
 
   
-  NS_TEST_ASSERT_MSG_EQ (bmm->IsIndoor (), m_pib.indoor, "indoor/outdoor mismatch");
+  NS_TEST_ASSERT_MSG_EQ (buildingInfo->IsIndoor (), m_pib.indoor, "indoor/outdoor mismatch");
   if (m_pib.indoor)
     {
-      NS_LOG_LOGIC (" got bid=" << bmm->GetBuilding ()->GetId () << ", f=" << (uint32_t) bmm->GetFloorNumber () << ", rx=" << (uint32_t) bmm->GetRoomNumberX () << ", roomY=" << (uint32_t) bmm->GetRoomNumberY ());
+      NS_LOG_LOGIC (" got bid=" << buildingInfo->GetBuilding ()->GetId () << ", f=" << (uint32_t) buildingInfo->GetFloorNumber () << ", rx=" << (uint32_t) buildingInfo->GetRoomNumberX () << ", roomY=" << (uint32_t) buildingInfo->GetRoomNumberY ());
       // only one building in this test, so Id will be 0
-      NS_TEST_ASSERT_MSG_EQ (bmm->GetBuilding ()->GetId (), 0, "Building ID mismatch");
-      NS_TEST_ASSERT_MSG_EQ ((uint32_t) bmm->GetFloorNumber (), m_pib.fn, "floor number mismatch");
-      NS_TEST_ASSERT_MSG_EQ ((uint32_t) bmm->GetRoomNumberX (), m_pib.rx, "x room number mismatch");
-      NS_TEST_ASSERT_MSG_EQ ((uint32_t) bmm->GetRoomNumberY (), m_pib.ry, "y room number mismatch");
+      NS_TEST_ASSERT_MSG_EQ (buildingInfo->GetBuilding ()->GetId (), 0, "Building ID mismatch");
+      NS_TEST_ASSERT_MSG_EQ ((uint32_t) buildingInfo->GetFloorNumber (), m_pib.fn, "floor number mismatch");
+      NS_TEST_ASSERT_MSG_EQ ((uint32_t) buildingInfo->GetRoomNumberX (), m_pib.rx, "x room number mismatch");
+      NS_TEST_ASSERT_MSG_EQ ((uint32_t) buildingInfo->GetRoomNumberY (), m_pib.ry, "y room number mismatch");
     }
 
   Simulator::Destroy ();  
diff -Naur ns-3.17/src/buildings/test/buildings-pathloss-test.cc ns-3.18/src/buildings/test/buildings-pathloss-test.cc
--- ns-3.17/src/buildings/test/buildings-pathloss-test.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/buildings/test/buildings-pathloss-test.cc	2013-10-26 07:07:29.551364380 -0700
@@ -28,10 +28,12 @@
 #include <ns3/double.h>
 #include <ns3/building.h>
 #include <ns3/enum.h>
-
+#include <ns3/constant-position-mobility-model.h>
+#include <ns3/mobility-building-info.h>
 #include "buildings-pathloss-test.h"
 
 
+
 NS_LOG_COMPONENT_DEFINE ("BuildingsPathlossTest");
 
 namespace ns3 {
@@ -201,62 +203,62 @@
   double hb = 30;
   double henbHeight = 10.0;
 
-  Ptr<BuildingsMobilityModel> mm;
+  Ptr<MobilityModel> mm;
   
   switch (index)
     {
     case 1:
-      mm = CreateObject<BuildingsMobilityModel> ();
+      mm = CreateObject<ConstantPositionMobilityModel> ();
       mm->SetPosition (Vector (0.0, 0.0, hb));
       break;
 
     case 2:
-      mm = CreateObject<BuildingsMobilityModel> ();
+      mm = CreateObject<ConstantPositionMobilityModel> ();
       mm->SetPosition (Vector (2000, 0.0, hm));
       break;
 
     case 3:
-      mm = CreateObject<BuildingsMobilityModel> ();
+      mm = CreateObject<ConstantPositionMobilityModel> ();
       mm->SetPosition (Vector (100, 0.0, hm));
       break;
 
     case 4:
-      mm = CreateObject<BuildingsMobilityModel> ();
+      mm = CreateObject<ConstantPositionMobilityModel> ();
       mm->SetPosition (Vector (900, 0.0, hm));
       break;
 
     case 5:
-      mm = CreateObject<BuildingsMobilityModel> ();
+      mm = CreateObject<ConstantPositionMobilityModel> ();
       mm->SetPosition (Vector (-5, 0.0, hm));
       break;
 
     case 6:
-      mm = CreateObject<BuildingsMobilityModel> ();
+      mm = CreateObject<ConstantPositionMobilityModel> ();
       mm->SetPosition (Vector (-5, 30, henbHeight));
       break;
 
     case 7:
-      mm = CreateObject<BuildingsMobilityModel> ();
+      mm = CreateObject<ConstantPositionMobilityModel> ();
       mm->SetPosition (Vector (-2000, 0.0, hm));
       break;
 
     case 8:
-      mm = CreateObject<BuildingsMobilityModel> ();
+      mm = CreateObject<ConstantPositionMobilityModel> ();
       mm->SetPosition (Vector (-100, 0.0, hm));
       break;
 
     case 9:
-      mm = CreateObject<BuildingsMobilityModel> ();
+      mm = CreateObject<ConstantPositionMobilityModel> ();
       mm->SetPosition (Vector (0, 0.0, hm));
       break;
 
     case 10:
-      mm = CreateObject<BuildingsMobilityModel> ();
+      mm = CreateObject<ConstantPositionMobilityModel> ();
       mm->SetPosition (Vector (-100, 0.0, henbHeight));
       break;
 
     case 11:
-      mm = CreateObject<BuildingsMobilityModel> ();
+      mm = CreateObject<ConstantPositionMobilityModel> ();
       mm->SetPosition (Vector (-500, 0.0, henbHeight));
       break;
 
@@ -264,6 +266,8 @@
       mm = 0;
       break;
     }
+  Ptr<MobilityBuildingInfo> buildingInfo = CreateObject<MobilityBuildingInfo> ();
+  mm->AggregateObject (buildingInfo); // operation usually done by BuildingsHelper::Install
   BuildingsHelper::MakeConsistent (mm); 
   return mm;
 }
diff -Naur ns-3.17/src/buildings/test/buildings-pathloss-test.h ns-3.18/src/buildings/test/buildings-pathloss-test.h
--- ns-3.17/src/buildings/test/buildings-pathloss-test.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/buildings/test/buildings-pathloss-test.h	2013-10-26 07:07:29.551364380 -0700
@@ -22,7 +22,6 @@
 #define BUILDINGS_PATHLOSS_TEST_H
 
 #include <ns3/test.h>
-#include <ns3/buildings-mobility-model.h>
 #include <ns3/hybrid-buildings-propagation-loss-model.h>
 
 
diff -Naur ns-3.17/src/buildings/test/buildings-shadowing-test.cc ns-3.18/src/buildings/test/buildings-shadowing-test.cc
--- ns-3.17/src/buildings/test/buildings-shadowing-test.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/buildings/test/buildings-shadowing-test.cc	2013-10-26 07:07:29.551364380 -0700
@@ -27,6 +27,9 @@
 #include <ns3/building.h>
 #include <ns3/enum.h>
 #include <ns3/buildings-helper.h>
+#include <ns3/mobility-model.h>
+#include <ns3/mobility-building-info.h>
+#include <ns3/constant-position-mobility-model.h>
 
 #include "buildings-shadowing-test.h"
 
@@ -142,62 +145,62 @@
   double hb = 30;
   double henbHeight = 10.0;
 
-  Ptr<BuildingsMobilityModel> mm;
+  Ptr<MobilityModel> mm;
   
   switch (index)
     {
     case 1:
-      mm = CreateObject<BuildingsMobilityModel> ();
+      mm = CreateObject<ConstantPositionMobilityModel> ();
       mm->SetPosition (Vector (0.0, 0.0, hb));
       break;
 
     case 2:
-      mm = CreateObject<BuildingsMobilityModel> ();
+      mm = CreateObject<ConstantPositionMobilityModel> ();
       mm->SetPosition (Vector (2000, 0.0, hm));
       break;
 
     case 3:
-      mm = CreateObject<BuildingsMobilityModel> ();
+      mm = CreateObject<ConstantPositionMobilityModel> ();
       mm->SetPosition (Vector (100, 0.0, hm));
       break;
 
     case 4:
-      mm = CreateObject<BuildingsMobilityModel> ();
+      mm = CreateObject<ConstantPositionMobilityModel> ();
       mm->SetPosition (Vector (900, 0.0, hm));
       break;
 
     case 5:
-      mm = CreateObject<BuildingsMobilityModel> ();
+      mm = CreateObject<ConstantPositionMobilityModel> ();
       mm->SetPosition (Vector (-5, 0.0, hm));
       break;
 
     case 6:
-      mm = CreateObject<BuildingsMobilityModel> ();
+      mm = CreateObject<ConstantPositionMobilityModel> ();
       mm->SetPosition (Vector (-5, 30, henbHeight));
       break;
 
     case 7:
-      mm = CreateObject<BuildingsMobilityModel> ();
+      mm = CreateObject<ConstantPositionMobilityModel> ();
       mm->SetPosition (Vector (-2000, 0.0, hm));
       break;
 
     case 8:
-      mm = CreateObject<BuildingsMobilityModel> ();
+      mm = CreateObject<ConstantPositionMobilityModel> ();
       mm->SetPosition (Vector (-100, 0.0, hm));
       break;
 
     case 9:
-      mm = CreateObject<BuildingsMobilityModel> ();
+      mm = CreateObject<ConstantPositionMobilityModel> ();
       mm->SetPosition (Vector (0, 0.0, hm));
       break;
 
     case 10:
-      mm = CreateObject<BuildingsMobilityModel> ();
+      mm = CreateObject<ConstantPositionMobilityModel> ();
       mm->SetPosition (Vector (-100, 0.0, henbHeight));
       break;
 
     case 11:
-      mm = CreateObject<BuildingsMobilityModel> ();
+      mm = CreateObject<ConstantPositionMobilityModel> ();
       mm->SetPosition (Vector (-500, 0.0, henbHeight));
       break;
 
@@ -205,6 +208,8 @@
       mm = 0;
       break;
     }
+  Ptr<MobilityBuildingInfo> buildingInfo = CreateObject<MobilityBuildingInfo> ();
+  mm->AggregateObject (buildingInfo); // operation usually done by BuildingsHelper::Install
   BuildingsHelper::MakeConsistent (mm); 
   return mm;
 }
diff -Naur ns-3.17/src/buildings/test/buildings-shadowing-test.h ns-3.18/src/buildings/test/buildings-shadowing-test.h
--- ns-3.17/src/buildings/test/buildings-shadowing-test.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/buildings/test/buildings-shadowing-test.h	2013-10-26 07:07:29.551364380 -0700
@@ -23,8 +23,6 @@
 
 #include "ns3/test.h"
 
-#include <ns3/buildings-mobility-model.h>
-#include <ns3/buildings-propagation-loss-model.h>
 
 
 namespace ns3 {
diff -Naur ns-3.17/src/buildings/wscript ns-3.18/src/buildings/wscript
--- ns-3.17/src/buildings/wscript	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/buildings/wscript	2013-10-26 07:07:29.543364381 -0700
@@ -6,7 +6,7 @@
     module.source = [
         'model/building.cc',
         'model/building-list.cc',
-        'model/buildings-mobility-model.cc',
+        'model/mobility-building-info.cc',
         'model/itu-r-1238-propagation-loss-model.cc',
         'model/buildings-propagation-loss-model.cc',
         'model/hybrid-buildings-propagation-loss-model.cc',
@@ -30,7 +30,7 @@
     headers.source = [
         'model/building.h',
         'model/building-list.h',
-        'model/buildings-mobility-model.h',
+        'model/mobility-building-info.h',
         'model/itu-r-1238-propagation-loss-model.h',
         'model/buildings-propagation-loss-model.h',
         'model/hybrid-buildings-propagation-loss-model.h',
diff -Naur ns-3.17/src/click/bindings/modulegen__gcc_ILP32.py ns-3.18/src/click/bindings/modulegen__gcc_ILP32.py
--- ns-3.17/src/click/bindings/modulegen__gcc_ILP32.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/click/bindings/modulegen__gcc_ILP32.py	2013-10-26 07:07:30.547364406 -0700
@@ -21,7 +21,7 @@
     root_module = module.get_root()
     
     ## log.h (module 'core'): ns3::LogLevel [enumeration]
-    module.add_enum('LogLevel', ['LOG_NONE', 'LOG_ERROR', 'LOG_LEVEL_ERROR', 'LOG_WARN', 'LOG_LEVEL_WARN', 'LOG_DEBUG', 'LOG_LEVEL_DEBUG', 'LOG_INFO', 'LOG_LEVEL_INFO', 'LOG_FUNCTION', 'LOG_LEVEL_FUNCTION', 'LOG_LOGIC', 'LOG_LEVEL_LOGIC', 'LOG_ALL', 'LOG_LEVEL_ALL', 'LOG_PREFIX_FUNC', 'LOG_PREFIX_TIME', 'LOG_PREFIX_NODE'], import_from_module='ns.core')
+    module.add_enum('LogLevel', ['LOG_NONE', 'LOG_ERROR', 'LOG_LEVEL_ERROR', 'LOG_WARN', 'LOG_LEVEL_WARN', 'LOG_DEBUG', 'LOG_LEVEL_DEBUG', 'LOG_INFO', 'LOG_LEVEL_INFO', 'LOG_FUNCTION', 'LOG_LEVEL_FUNCTION', 'LOG_LOGIC', 'LOG_LEVEL_LOGIC', 'LOG_ALL', 'LOG_LEVEL_ALL', 'LOG_PREFIX_FUNC', 'LOG_PREFIX_TIME', 'LOG_PREFIX_NODE', 'LOG_PREFIX_LEVEL', 'LOG_PREFIX_ALL'], import_from_module='ns.core')
     ## address.h (module 'network'): ns3::Address [class]
     module.add_class('Address', import_from_module='ns.network')
     ## address.h (module 'network'): ns3::Address::MaxSize_e [enumeration]
@@ -48,6 +48,16 @@
     module.add_class('CallbackBase', import_from_module='ns.core')
     ## event-id.h (module 'core'): ns3::EventId [class]
     module.add_class('EventId', import_from_module='ns.core')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
+    ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress [class]
+    module.add_class('Inet6SocketAddress', import_from_module='ns.network')
+    ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress [class]
+    root_module['ns3::Inet6SocketAddress'].implicitly_converts_to(root_module['ns3::Address'])
+    ## inet-socket-address.h (module 'network'): ns3::InetSocketAddress [class]
+    module.add_class('InetSocketAddress', import_from_module='ns.network')
+    ## inet-socket-address.h (module 'network'): ns3::InetSocketAddress [class]
+    root_module['ns3::InetSocketAddress'].implicitly_converts_to(root_module['ns3::Address'])
     ## int-to-type.h (module 'core'): ns3::IntToType<0> [struct]
     module.add_class('IntToType', import_from_module='ns.core', template_parameters=['0'])
     ## int-to-type.h (module 'core'): ns3::IntToType<0>::v_e [enumeration]
@@ -122,6 +132,8 @@
     module.add_class('PacketTagList', import_from_module='ns.network')
     ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct]
     module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration]
+    module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network')
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter> [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simulator.h (module 'core'): ns3::Simulator [class]
@@ -159,9 +171,9 @@
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header [class]
     module.add_class('Ipv4Header', import_from_module='ns.internet', parent=root_module['ns3::Header'])
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType [enumeration]
-    module.add_enum('DscpType', ['DscpDefault', 'CS1', 'AF11', 'AF12', 'AF13', 'CS2', 'AF21', 'AF22', 'AF23', 'CS3', 'AF31', 'AF32', 'AF33', 'CS4', 'AF41', 'AF42', 'AF43', 'CS5', 'EF', 'CS6', 'CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
+    module.add_enum('DscpType', ['DscpDefault', 'DSCP_CS1', 'DSCP_AF11', 'DSCP_AF12', 'DSCP_AF13', 'DSCP_CS2', 'DSCP_AF21', 'DSCP_AF22', 'DSCP_AF23', 'DSCP_CS3', 'DSCP_AF31', 'DSCP_AF32', 'DSCP_AF33', 'DSCP_CS4', 'DSCP_AF41', 'DSCP_AF42', 'DSCP_AF43', 'DSCP_CS5', 'DSCP_EF', 'DSCP_CS6', 'DSCP_CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType [enumeration]
-    module.add_enum('EcnType', ['NotECT', 'ECT1', 'ECT0', 'CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
+    module.add_enum('EcnType', ['ECN_NotECT', 'ECN_ECT1', 'ECN_ECT0', 'ECN_CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
     ## ipv6-header.h (module 'internet'): ns3::Ipv6Header [class]
     module.add_class('Ipv6Header', import_from_module='ns.internet', parent=root_module['ns3::Header'])
     ## ipv6-header.h (module 'internet'): ns3::Ipv6Header::NextHeader_e [enumeration]
@@ -180,6 +192,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Ipv4MulticastRoute', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Ipv4MulticastRoute>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> > [class]
@@ -200,8 +214,14 @@
     module.add_enum('SocketType', ['NS3_SOCK_STREAM', 'NS3_SOCK_SEQPACKET', 'NS3_SOCK_DGRAM', 'NS3_SOCK_RAW'], outer_class=root_module['ns3::Socket'], import_from_module='ns.network')
     ## socket.h (module 'network'): ns3::SocketAddressTag [class]
     module.add_class('SocketAddressTag', import_from_module='ns.network', parent=root_module['ns3::Tag'])
+    ## socket.h (module 'network'): ns3::SocketIpTosTag [class]
+    module.add_class('SocketIpTosTag', import_from_module='ns.network', parent=root_module['ns3::Tag'])
     ## socket.h (module 'network'): ns3::SocketIpTtlTag [class]
     module.add_class('SocketIpTtlTag', import_from_module='ns.network', parent=root_module['ns3::Tag'])
+    ## socket.h (module 'network'): ns3::SocketIpv6HopLimitTag [class]
+    module.add_class('SocketIpv6HopLimitTag', import_from_module='ns.network', parent=root_module['ns3::Tag'])
+    ## socket.h (module 'network'): ns3::SocketIpv6TclassTag [class]
+    module.add_class('SocketIpv6TclassTag', import_from_module='ns.network', parent=root_module['ns3::Tag'])
     ## socket.h (module 'network'): ns3::SocketSetDontFragmentTag [class]
     module.add_class('SocketSetDontFragmentTag', import_from_module='ns.network', parent=root_module['ns3::Tag'])
     ## nstime.h (module 'core'): ns3::Time [class]
@@ -278,8 +298,6 @@
     module.add_class('OutputStreamWrapper', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> >'])
     ## packet.h (module 'network'): ns3::Packet [class]
     module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
-    ## nstime.h (module 'core'): ns3::TimeChecker [class]
-    module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
     module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
@@ -305,11 +323,47 @@
     nested_module = module.add_cpp_namespace('FatalImpl')
     register_types_ns3_FatalImpl(nested_module)
     
+    
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
 
 def register_types_ns3_FatalImpl(module):
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_methods(root_module):
     register_Ns3Address_methods(root_module, root_module['ns3::Address'])
     register_Ns3AttributeConstructionList_methods(root_module, root_module['ns3::AttributeConstructionList'])
@@ -323,6 +377,9 @@
     register_Ns3ByteTagListIteratorItem_methods(root_module, root_module['ns3::ByteTagList::Iterator::Item'])
     register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase'])
     register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
+    register_Ns3Inet6SocketAddress_methods(root_module, root_module['ns3::Inet6SocketAddress'])
+    register_Ns3InetSocketAddress_methods(root_module, root_module['ns3::InetSocketAddress'])
     register_Ns3IntToType__0_methods(root_module, root_module['ns3::IntToType< 0 >'])
     register_Ns3IntToType__1_methods(root_module, root_module['ns3::IntToType< 1 >'])
     register_Ns3IntToType__2_methods(root_module, root_module['ns3::IntToType< 2 >'])
@@ -370,6 +427,7 @@
     register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
     register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3Ipv4MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4MulticastRoute__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> >'])
     register_Ns3SimpleRefCount__Ns3Ipv4Route_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4Route__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> >'])
     register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
@@ -378,7 +436,10 @@
     register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >'])
     register_Ns3Socket_methods(root_module, root_module['ns3::Socket'])
     register_Ns3SocketAddressTag_methods(root_module, root_module['ns3::SocketAddressTag'])
+    register_Ns3SocketIpTosTag_methods(root_module, root_module['ns3::SocketIpTosTag'])
     register_Ns3SocketIpTtlTag_methods(root_module, root_module['ns3::SocketIpTtlTag'])
+    register_Ns3SocketIpv6HopLimitTag_methods(root_module, root_module['ns3::SocketIpv6HopLimitTag'])
+    register_Ns3SocketIpv6TclassTag_methods(root_module, root_module['ns3::SocketIpv6TclassTag'])
     register_Ns3SocketSetDontFragmentTag_methods(root_module, root_module['ns3::SocketSetDontFragmentTag'])
     register_Ns3Time_methods(root_module, root_module['ns3::Time'])
     register_Ns3TraceSourceAccessor_methods(root_module, root_module['ns3::TraceSourceAccessor'])
@@ -413,13 +474,17 @@
     register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue'])
     register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper'])
     register_Ns3Packet_methods(root_module, root_module['ns3::Packet'])
-    register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
     register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
     register_Ns3AddressChecker_methods(root_module, root_module['ns3::AddressChecker'])
     register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue'])
     register_Ns3Ipv4ClickRouting_methods(root_module, root_module['ns3::Ipv4ClickRouting'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     return
 
 def register_Ns3Address_methods(root_module, cls):
@@ -945,6 +1010,121 @@
                    is_const=True)
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
+def register_Ns3Inet6SocketAddress_methods(root_module, cls):
+    ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress::Inet6SocketAddress(ns3::Inet6SocketAddress const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Inet6SocketAddress const &', 'arg0')])
+    ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress::Inet6SocketAddress(ns3::Ipv6Address ipv6, uint16_t port) [constructor]
+    cls.add_constructor([param('ns3::Ipv6Address', 'ipv6'), param('uint16_t', 'port')])
+    ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress::Inet6SocketAddress(ns3::Ipv6Address ipv6) [constructor]
+    cls.add_constructor([param('ns3::Ipv6Address', 'ipv6')])
+    ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress::Inet6SocketAddress(uint16_t port) [constructor]
+    cls.add_constructor([param('uint16_t', 'port')])
+    ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress::Inet6SocketAddress(char const * ipv6, uint16_t port) [constructor]
+    cls.add_constructor([param('char const *', 'ipv6'), param('uint16_t', 'port')])
+    ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress::Inet6SocketAddress(char const * ipv6) [constructor]
+    cls.add_constructor([param('char const *', 'ipv6')])
+    ## inet6-socket-address.h (module 'network'): static ns3::Inet6SocketAddress ns3::Inet6SocketAddress::ConvertFrom(ns3::Address const & addr) [member function]
+    cls.add_method('ConvertFrom', 
+                   'ns3::Inet6SocketAddress', 
+                   [param('ns3::Address const &', 'addr')], 
+                   is_static=True)
+    ## inet6-socket-address.h (module 'network'): ns3::Ipv6Address ns3::Inet6SocketAddress::GetIpv6() const [member function]
+    cls.add_method('GetIpv6', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_const=True)
+    ## inet6-socket-address.h (module 'network'): uint16_t ns3::Inet6SocketAddress::GetPort() const [member function]
+    cls.add_method('GetPort', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## inet6-socket-address.h (module 'network'): static bool ns3::Inet6SocketAddress::IsMatchingType(ns3::Address const & addr) [member function]
+    cls.add_method('IsMatchingType', 
+                   'bool', 
+                   [param('ns3::Address const &', 'addr')], 
+                   is_static=True)
+    ## inet6-socket-address.h (module 'network'): void ns3::Inet6SocketAddress::SetIpv6(ns3::Ipv6Address ipv6) [member function]
+    cls.add_method('SetIpv6', 
+                   'void', 
+                   [param('ns3::Ipv6Address', 'ipv6')])
+    ## inet6-socket-address.h (module 'network'): void ns3::Inet6SocketAddress::SetPort(uint16_t port) [member function]
+    cls.add_method('SetPort', 
+                   'void', 
+                   [param('uint16_t', 'port')])
+    return
+
+def register_Ns3InetSocketAddress_methods(root_module, cls):
+    ## inet-socket-address.h (module 'network'): ns3::InetSocketAddress::InetSocketAddress(ns3::InetSocketAddress const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::InetSocketAddress const &', 'arg0')])
+    ## inet-socket-address.h (module 'network'): ns3::InetSocketAddress::InetSocketAddress(ns3::Ipv4Address ipv4, uint16_t port) [constructor]
+    cls.add_constructor([param('ns3::Ipv4Address', 'ipv4'), param('uint16_t', 'port')])
+    ## inet-socket-address.h (module 'network'): ns3::InetSocketAddress::InetSocketAddress(ns3::Ipv4Address ipv4) [constructor]
+    cls.add_constructor([param('ns3::Ipv4Address', 'ipv4')])
+    ## inet-socket-address.h (module 'network'): ns3::InetSocketAddress::InetSocketAddress(uint16_t port) [constructor]
+    cls.add_constructor([param('uint16_t', 'port')])
+    ## inet-socket-address.h (module 'network'): ns3::InetSocketAddress::InetSocketAddress(char const * ipv4, uint16_t port) [constructor]
+    cls.add_constructor([param('char const *', 'ipv4'), param('uint16_t', 'port')])
+    ## inet-socket-address.h (module 'network'): ns3::InetSocketAddress::InetSocketAddress(char const * ipv4) [constructor]
+    cls.add_constructor([param('char const *', 'ipv4')])
+    ## inet-socket-address.h (module 'network'): static ns3::InetSocketAddress ns3::InetSocketAddress::ConvertFrom(ns3::Address const & address) [member function]
+    cls.add_method('ConvertFrom', 
+                   'ns3::InetSocketAddress', 
+                   [param('ns3::Address const &', 'address')], 
+                   is_static=True)
+    ## inet-socket-address.h (module 'network'): ns3::Ipv4Address ns3::InetSocketAddress::GetIpv4() const [member function]
+    cls.add_method('GetIpv4', 
+                   'ns3::Ipv4Address', 
+                   [], 
+                   is_const=True)
+    ## inet-socket-address.h (module 'network'): uint16_t ns3::InetSocketAddress::GetPort() const [member function]
+    cls.add_method('GetPort', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## inet-socket-address.h (module 'network'): static bool ns3::InetSocketAddress::IsMatchingType(ns3::Address const & address) [member function]
+    cls.add_method('IsMatchingType', 
+                   'bool', 
+                   [param('ns3::Address const &', 'address')], 
+                   is_static=True)
+    ## inet-socket-address.h (module 'network'): void ns3::InetSocketAddress::SetIpv4(ns3::Ipv4Address address) [member function]
+    cls.add_method('SetIpv4', 
+                   'void', 
+                   [param('ns3::Ipv4Address', 'address')])
+    ## inet-socket-address.h (module 'network'): void ns3::InetSocketAddress::SetPort(uint16_t port) [member function]
+    cls.add_method('SetPort', 
+                   'void', 
+                   [param('uint16_t', 'port')])
+    return
+
 def register_Ns3IntToType__0_methods(root_module, cls):
     ## int-to-type.h (module 'core'): ns3::IntToType<0>::IntToType() [constructor]
     cls.add_constructor([])
@@ -1320,6 +1500,11 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
     cls.add_method('IsEqual', 
                    'bool', 
@@ -1359,16 +1544,36 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
     cls.add_method('MakeAutoconfiguredAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
     cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'mac')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
     cls.add_method('MakeIpv4MappedAddress', 
                    'ns3::Ipv6Address', 
@@ -1529,6 +1734,11 @@
     cls.add_method('EnvVarCheck', 
                    'void', 
                    [param('char const *', 'name')])
+    ## log.h (module 'core'): std::string ns3::LogComponent::GetLevelLabel(ns3::LogLevel const level) const [member function]
+    cls.add_method('GetLevelLabel', 
+                   'std::string', 
+                   [param('ns3::LogLevel const', 'level')], 
+                   is_const=True)
     ## log.h (module 'core'): bool ns3::LogComponent::IsEnabled(ns3::LogLevel level) const [member function]
     cls.add_method('IsEnabled', 
                    'bool', 
@@ -1825,6 +2035,10 @@
     cls.add_method('RemoveAll', 
                    'void', 
                    [])
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function]
+    cls.add_method('Replace', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     return
 
 def register_Ns3PacketTagListTagData_methods(root_module, cls):
@@ -2191,6 +2405,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -2250,6 +2469,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -2784,8 +3013,8 @@
                    'ns3::TypeId', 
                    [], 
                    is_static=True)
-    ## object.h (module 'core'): void ns3::Object::Start() [member function]
-    cls.add_method('Start', 
+    ## object.h (module 'core'): void ns3::Object::Initialize() [member function]
+    cls.add_method('Initialize', 
                    'void', 
                    [])
     ## object.h (module 'core'): ns3::Object::Object(ns3::Object const & o) [copy constructor]
@@ -2796,8 +3025,8 @@
                    'void', 
                    [], 
                    visibility='protected', is_virtual=True)
-    ## object.h (module 'core'): void ns3::Object::DoStart() [member function]
-    cls.add_method('DoStart', 
+    ## object.h (module 'core'): void ns3::Object::DoInitialize() [member function]
+    cls.add_method('DoInitialize', 
                    'void', 
                    [], 
                    visibility='protected', is_virtual=True)
@@ -2884,6 +3113,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3Ipv4MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4MulticastRoute__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -3010,6 +3251,26 @@
                    'ns3::Socket::SocketErrno', 
                    [], 
                    is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## socket.h (module 'network'): uint8_t ns3::Socket::GetIpTos() const [member function]
+    cls.add_method('GetIpTos', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## socket.h (module 'network'): uint8_t ns3::Socket::GetIpTtl() const [member function]
+    cls.add_method('GetIpTtl', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## socket.h (module 'network'): uint8_t ns3::Socket::GetIpv6HopLimit() const [member function]
+    cls.add_method('GetIpv6HopLimit', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## socket.h (module 'network'): uint8_t ns3::Socket::GetIpv6Tclass() const [member function]
+    cls.add_method('GetIpv6Tclass', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
     ## socket.h (module 'network'): ns3::Ptr<ns3::Node> ns3::Socket::GetNode() const [member function]
     cls.add_method('GetNode', 
                    'ns3::Ptr< ns3::Node >', 
@@ -3040,6 +3301,26 @@
                    'ns3::TypeId', 
                    [], 
                    is_static=True)
+    ## socket.h (module 'network'): bool ns3::Socket::IsIpRecvTos() const [member function]
+    cls.add_method('IsIpRecvTos', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## socket.h (module 'network'): bool ns3::Socket::IsIpRecvTtl() const [member function]
+    cls.add_method('IsIpRecvTtl', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## socket.h (module 'network'): bool ns3::Socket::IsIpv6RecvHopLimit() const [member function]
+    cls.add_method('IsIpv6RecvHopLimit', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## socket.h (module 'network'): bool ns3::Socket::IsIpv6RecvTclass() const [member function]
+    cls.add_method('IsIpv6RecvTclass', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## socket.h (module 'network'): bool ns3::Socket::IsRecvPktInfo() const [member function]
     cls.add_method('IsRecvPktInfo', 
                    'bool', 
@@ -3119,6 +3400,40 @@
     cls.add_method('SetDataSentCallback', 
                    'void', 
                    [param('ns3::Callback< void, ns3::Ptr< ns3::Socket >, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'dataSent')])
+    ## socket.h (module 'network'): void ns3::Socket::SetIpRecvTos(bool ipv4RecvTos) [member function]
+    cls.add_method('SetIpRecvTos', 
+                   'void', 
+                   [param('bool', 'ipv4RecvTos')])
+    ## socket.h (module 'network'): void ns3::Socket::SetIpRecvTtl(bool ipv4RecvTtl) [member function]
+    cls.add_method('SetIpRecvTtl', 
+                   'void', 
+                   [param('bool', 'ipv4RecvTtl')])
+    ## socket.h (module 'network'): void ns3::Socket::SetIpTos(uint8_t ipTos) [member function]
+    cls.add_method('SetIpTos', 
+                   'void', 
+                   [param('uint8_t', 'ipTos')])
+    ## socket.h (module 'network'): void ns3::Socket::SetIpTtl(uint8_t ipTtl) [member function]
+    cls.add_method('SetIpTtl', 
+                   'void', 
+                   [param('uint8_t', 'ipTtl')], 
+                   is_virtual=True)
+    ## socket.h (module 'network'): void ns3::Socket::SetIpv6HopLimit(uint8_t ipHopLimit) [member function]
+    cls.add_method('SetIpv6HopLimit', 
+                   'void', 
+                   [param('uint8_t', 'ipHopLimit')], 
+                   is_virtual=True)
+    ## socket.h (module 'network'): void ns3::Socket::SetIpv6RecvHopLimit(bool ipv6RecvHopLimit) [member function]
+    cls.add_method('SetIpv6RecvHopLimit', 
+                   'void', 
+                   [param('bool', 'ipv6RecvHopLimit')])
+    ## socket.h (module 'network'): void ns3::Socket::SetIpv6RecvTclass(bool ipv6RecvTclass) [member function]
+    cls.add_method('SetIpv6RecvTclass', 
+                   'void', 
+                   [param('bool', 'ipv6RecvTclass')])
+    ## socket.h (module 'network'): void ns3::Socket::SetIpv6Tclass(int ipTclass) [member function]
+    cls.add_method('SetIpv6Tclass', 
+                   'void', 
+                   [param('int', 'ipTclass')])
     ## socket.h (module 'network'): void ns3::Socket::SetRecvCallback(ns3::Callback<void, ns3::Ptr<ns3::Socket>, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> arg0) [member function]
     cls.add_method('SetRecvCallback', 
                    'void', 
@@ -3146,6 +3461,26 @@
                    'void', 
                    [], 
                    visibility='protected', is_virtual=True)
+    ## socket.h (module 'network'): bool ns3::Socket::IsManualIpTos() const [member function]
+    cls.add_method('IsManualIpTos', 
+                   'bool', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## socket.h (module 'network'): bool ns3::Socket::IsManualIpTtl() const [member function]
+    cls.add_method('IsManualIpTtl', 
+                   'bool', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## socket.h (module 'network'): bool ns3::Socket::IsManualIpv6HopLimit() const [member function]
+    cls.add_method('IsManualIpv6HopLimit', 
+                   'bool', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## socket.h (module 'network'): bool ns3::Socket::IsManualIpv6Tclass() const [member function]
+    cls.add_method('IsManualIpv6Tclass', 
+                   'bool', 
+                   [], 
+                   is_const=True, visibility='protected')
     ## socket.h (module 'network'): void ns3::Socket::NotifyConnectionFailed() [member function]
     cls.add_method('NotifyConnectionFailed', 
                    'void', 
@@ -3239,6 +3574,52 @@
                    [param('ns3::Address', 'addr')])
     return
 
+def register_Ns3SocketIpTosTag_methods(root_module, cls):
+    ## socket.h (module 'network'): ns3::SocketIpTosTag::SocketIpTosTag(ns3::SocketIpTosTag const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::SocketIpTosTag const &', 'arg0')])
+    ## socket.h (module 'network'): ns3::SocketIpTosTag::SocketIpTosTag() [constructor]
+    cls.add_constructor([])
+    ## socket.h (module 'network'): void ns3::SocketIpTosTag::Deserialize(ns3::TagBuffer i) [member function]
+    cls.add_method('Deserialize', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'i')], 
+                   is_virtual=True)
+    ## socket.h (module 'network'): ns3::TypeId ns3::SocketIpTosTag::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## socket.h (module 'network'): uint32_t ns3::SocketIpTosTag::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## socket.h (module 'network'): uint8_t ns3::SocketIpTosTag::GetTos() const [member function]
+    cls.add_method('GetTos', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## socket.h (module 'network'): static ns3::TypeId ns3::SocketIpTosTag::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## socket.h (module 'network'): void ns3::SocketIpTosTag::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## socket.h (module 'network'): void ns3::SocketIpTosTag::Serialize(ns3::TagBuffer i) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'i')], 
+                   is_const=True, is_virtual=True)
+    ## socket.h (module 'network'): void ns3::SocketIpTosTag::SetTos(uint8_t tos) [member function]
+    cls.add_method('SetTos', 
+                   'void', 
+                   [param('uint8_t', 'tos')])
+    return
+
 def register_Ns3SocketIpTtlTag_methods(root_module, cls):
     ## socket.h (module 'network'): ns3::SocketIpTtlTag::SocketIpTtlTag(ns3::SocketIpTtlTag const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::SocketIpTtlTag const &', 'arg0')])
@@ -3285,6 +3666,98 @@
                    [param('uint8_t', 'ttl')])
     return
 
+def register_Ns3SocketIpv6HopLimitTag_methods(root_module, cls):
+    ## socket.h (module 'network'): ns3::SocketIpv6HopLimitTag::SocketIpv6HopLimitTag(ns3::SocketIpv6HopLimitTag const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::SocketIpv6HopLimitTag const &', 'arg0')])
+    ## socket.h (module 'network'): ns3::SocketIpv6HopLimitTag::SocketIpv6HopLimitTag() [constructor]
+    cls.add_constructor([])
+    ## socket.h (module 'network'): void ns3::SocketIpv6HopLimitTag::Deserialize(ns3::TagBuffer i) [member function]
+    cls.add_method('Deserialize', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'i')], 
+                   is_virtual=True)
+    ## socket.h (module 'network'): uint8_t ns3::SocketIpv6HopLimitTag::GetHopLimit() const [member function]
+    cls.add_method('GetHopLimit', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## socket.h (module 'network'): ns3::TypeId ns3::SocketIpv6HopLimitTag::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## socket.h (module 'network'): uint32_t ns3::SocketIpv6HopLimitTag::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## socket.h (module 'network'): static ns3::TypeId ns3::SocketIpv6HopLimitTag::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## socket.h (module 'network'): void ns3::SocketIpv6HopLimitTag::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## socket.h (module 'network'): void ns3::SocketIpv6HopLimitTag::Serialize(ns3::TagBuffer i) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'i')], 
+                   is_const=True, is_virtual=True)
+    ## socket.h (module 'network'): void ns3::SocketIpv6HopLimitTag::SetHopLimit(uint8_t hopLimit) [member function]
+    cls.add_method('SetHopLimit', 
+                   'void', 
+                   [param('uint8_t', 'hopLimit')])
+    return
+
+def register_Ns3SocketIpv6TclassTag_methods(root_module, cls):
+    ## socket.h (module 'network'): ns3::SocketIpv6TclassTag::SocketIpv6TclassTag(ns3::SocketIpv6TclassTag const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::SocketIpv6TclassTag const &', 'arg0')])
+    ## socket.h (module 'network'): ns3::SocketIpv6TclassTag::SocketIpv6TclassTag() [constructor]
+    cls.add_constructor([])
+    ## socket.h (module 'network'): void ns3::SocketIpv6TclassTag::Deserialize(ns3::TagBuffer i) [member function]
+    cls.add_method('Deserialize', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'i')], 
+                   is_virtual=True)
+    ## socket.h (module 'network'): ns3::TypeId ns3::SocketIpv6TclassTag::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## socket.h (module 'network'): uint32_t ns3::SocketIpv6TclassTag::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## socket.h (module 'network'): uint8_t ns3::SocketIpv6TclassTag::GetTclass() const [member function]
+    cls.add_method('GetTclass', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## socket.h (module 'network'): static ns3::TypeId ns3::SocketIpv6TclassTag::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## socket.h (module 'network'): void ns3::SocketIpv6TclassTag::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## socket.h (module 'network'): void ns3::SocketIpv6TclassTag::Serialize(ns3::TagBuffer i) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'i')], 
+                   is_const=True, is_virtual=True)
+    ## socket.h (module 'network'): void ns3::SocketIpv6TclassTag::SetTclass(uint8_t tclass) [member function]
+    cls.add_method('SetTclass', 
+                   'void', 
+                   [param('uint8_t', 'tclass')])
+    return
+
 def register_Ns3SocketSetDontFragmentTag_methods(root_module, cls):
     ## socket.h (module 'network'): ns3::SocketSetDontFragmentTag::SocketSetDontFragmentTag(ns3::SocketSetDontFragmentTag const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::SocketSetDontFragmentTag const &', 'arg0')])
@@ -3469,11 +3942,26 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
     cls.add_method('SetResolution', 
                    'void', 
                    [param('ns3::Time::Unit', 'resolution')], 
                    is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
     cls.add_method('To', 
                    'ns3::int64x64_t', 
@@ -3765,10 +4253,10 @@
                    'ns3::IpL4Protocol::RxStatus', 
                    [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv4Header const &', 'header'), param('ns3::Ptr< ns3::Ipv4Interface >', 'incomingInterface')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## ip-l4-protocol.h (module 'internet'): ns3::IpL4Protocol::RxStatus ns3::IpL4Protocol::Receive(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Address & src, ns3::Ipv6Address & dst, ns3::Ptr<ns3::Ipv6Interface> incomingInterface) [member function]
+    ## ip-l4-protocol.h (module 'internet'): ns3::IpL4Protocol::RxStatus ns3::IpL4Protocol::Receive(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Header const & header, ns3::Ptr<ns3::Ipv6Interface> incomingInterface) [member function]
     cls.add_method('Receive', 
                    'ns3::IpL4Protocol::RxStatus', 
-                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv6Address &', 'src'), param('ns3::Ipv6Address &', 'dst'), param('ns3::Ptr< ns3::Ipv6Interface >', 'incomingInterface')], 
+                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::Ipv6Interface >', 'incomingInterface')], 
                    is_pure_virtual=True, is_virtual=True)
     ## ip-l4-protocol.h (module 'internet'): void ns3::IpL4Protocol::ReceiveIcmp(ns3::Ipv4Address icmpSource, uint8_t icmpTtl, uint8_t icmpType, uint8_t icmpCode, uint32_t icmpInfo, ns3::Ipv4Address payloadSource, ns3::Ipv4Address payloadDestination, uint8_t const * payload) [member function]
     cls.add_method('ReceiveIcmp', 
@@ -3902,6 +4390,11 @@
                    'bool', 
                    [param('uint32_t', 'interface'), param('uint32_t', 'addressIndex')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## ipv4.h (module 'internet'): bool ns3::Ipv4::RemoveAddress(uint32_t interface, ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4Address', 'address')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## ipv4.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4::SelectSourceAddress(ns3::Ptr<const ns3::NetDevice> device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function]
     cls.add_method('SelectSourceAddress', 
                    'ns3::Ipv4Address', 
@@ -4064,6 +4557,10 @@
     cls.add_method('RemoveAddress', 
                    'ns3::Ipv4InterfaceAddress', 
                    [param('uint32_t', 'index')])
+    ## ipv4-interface.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4Interface::RemoveAddress(ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'ns3::Ipv4InterfaceAddress', 
+                   [param('ns3::Ipv4Address', 'address')])
     ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::Send(ns3::Ptr<ns3::Packet> p, ns3::Ipv4Address dest) [member function]
     cls.add_method('Send', 
                    'void', 
@@ -4420,6 +4917,10 @@
     cls.add_method('RemoveAddress', 
                    'ns3::Ipv6InterfaceAddress', 
                    [param('uint32_t', 'index')])
+    ## ipv6-interface.h (module 'internet'): ns3::Ipv6InterfaceAddress ns3::Ipv6Interface::RemoveAddress(ns3::Ipv6Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'ns3::Ipv6InterfaceAddress', 
+                   [param('ns3::Ipv6Address', 'address')])
     ## ipv6-interface.h (module 'internet'): void ns3::Ipv6Interface::Send(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Address dest) [member function]
     cls.add_method('Send', 
                    'void', 
@@ -4918,6 +5419,10 @@
     cls.add_method('RemoveTrailer', 
                    'uint32_t', 
                    [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('ReplacePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
     cls.add_method('Serialize', 
                    'uint32_t', 
@@ -4929,13 +5434,6 @@
                    [param('ns3::Ptr< ns3::NixVector >', 'arg0')])
     return
 
-def register_Ns3TimeChecker_methods(root_module, cls):
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor]
-    cls.add_constructor([])
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')])
-    return
-
 def register_Ns3TimeValue_methods(root_module, cls):
     ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
     cls.add_constructor([])
@@ -5056,14 +5554,127 @@
     cls.add_constructor([param('ns3::Ipv4ClickRouting const &', 'arg0')])
     return
 
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_functions(root_module):
     module = root_module
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     return
 
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def main():
     out = FileCodeSink(sys.stdout)
     root_module = module_init()
diff -Naur ns-3.17/src/click/bindings/modulegen__gcc_LP64.py ns-3.18/src/click/bindings/modulegen__gcc_LP64.py
--- ns-3.17/src/click/bindings/modulegen__gcc_LP64.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/click/bindings/modulegen__gcc_LP64.py	2013-10-26 07:07:30.543364406 -0700
@@ -21,7 +21,7 @@
     root_module = module.get_root()
     
     ## log.h (module 'core'): ns3::LogLevel [enumeration]
-    module.add_enum('LogLevel', ['LOG_NONE', 'LOG_ERROR', 'LOG_LEVEL_ERROR', 'LOG_WARN', 'LOG_LEVEL_WARN', 'LOG_DEBUG', 'LOG_LEVEL_DEBUG', 'LOG_INFO', 'LOG_LEVEL_INFO', 'LOG_FUNCTION', 'LOG_LEVEL_FUNCTION', 'LOG_LOGIC', 'LOG_LEVEL_LOGIC', 'LOG_ALL', 'LOG_LEVEL_ALL', 'LOG_PREFIX_FUNC', 'LOG_PREFIX_TIME', 'LOG_PREFIX_NODE'], import_from_module='ns.core')
+    module.add_enum('LogLevel', ['LOG_NONE', 'LOG_ERROR', 'LOG_LEVEL_ERROR', 'LOG_WARN', 'LOG_LEVEL_WARN', 'LOG_DEBUG', 'LOG_LEVEL_DEBUG', 'LOG_INFO', 'LOG_LEVEL_INFO', 'LOG_FUNCTION', 'LOG_LEVEL_FUNCTION', 'LOG_LOGIC', 'LOG_LEVEL_LOGIC', 'LOG_ALL', 'LOG_LEVEL_ALL', 'LOG_PREFIX_FUNC', 'LOG_PREFIX_TIME', 'LOG_PREFIX_NODE', 'LOG_PREFIX_LEVEL', 'LOG_PREFIX_ALL'], import_from_module='ns.core')
     ## address.h (module 'network'): ns3::Address [class]
     module.add_class('Address', import_from_module='ns.network')
     ## address.h (module 'network'): ns3::Address::MaxSize_e [enumeration]
@@ -48,6 +48,16 @@
     module.add_class('CallbackBase', import_from_module='ns.core')
     ## event-id.h (module 'core'): ns3::EventId [class]
     module.add_class('EventId', import_from_module='ns.core')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
+    ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress [class]
+    module.add_class('Inet6SocketAddress', import_from_module='ns.network')
+    ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress [class]
+    root_module['ns3::Inet6SocketAddress'].implicitly_converts_to(root_module['ns3::Address'])
+    ## inet-socket-address.h (module 'network'): ns3::InetSocketAddress [class]
+    module.add_class('InetSocketAddress', import_from_module='ns.network')
+    ## inet-socket-address.h (module 'network'): ns3::InetSocketAddress [class]
+    root_module['ns3::InetSocketAddress'].implicitly_converts_to(root_module['ns3::Address'])
     ## int-to-type.h (module 'core'): ns3::IntToType<0> [struct]
     module.add_class('IntToType', import_from_module='ns.core', template_parameters=['0'])
     ## int-to-type.h (module 'core'): ns3::IntToType<0>::v_e [enumeration]
@@ -122,6 +132,8 @@
     module.add_class('PacketTagList', import_from_module='ns.network')
     ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct]
     module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration]
+    module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network')
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter> [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simulator.h (module 'core'): ns3::Simulator [class]
@@ -159,9 +171,9 @@
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header [class]
     module.add_class('Ipv4Header', import_from_module='ns.internet', parent=root_module['ns3::Header'])
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType [enumeration]
-    module.add_enum('DscpType', ['DscpDefault', 'CS1', 'AF11', 'AF12', 'AF13', 'CS2', 'AF21', 'AF22', 'AF23', 'CS3', 'AF31', 'AF32', 'AF33', 'CS4', 'AF41', 'AF42', 'AF43', 'CS5', 'EF', 'CS6', 'CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
+    module.add_enum('DscpType', ['DscpDefault', 'DSCP_CS1', 'DSCP_AF11', 'DSCP_AF12', 'DSCP_AF13', 'DSCP_CS2', 'DSCP_AF21', 'DSCP_AF22', 'DSCP_AF23', 'DSCP_CS3', 'DSCP_AF31', 'DSCP_AF32', 'DSCP_AF33', 'DSCP_CS4', 'DSCP_AF41', 'DSCP_AF42', 'DSCP_AF43', 'DSCP_CS5', 'DSCP_EF', 'DSCP_CS6', 'DSCP_CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType [enumeration]
-    module.add_enum('EcnType', ['NotECT', 'ECT1', 'ECT0', 'CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
+    module.add_enum('EcnType', ['ECN_NotECT', 'ECN_ECT1', 'ECN_ECT0', 'ECN_CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
     ## ipv6-header.h (module 'internet'): ns3::Ipv6Header [class]
     module.add_class('Ipv6Header', import_from_module='ns.internet', parent=root_module['ns3::Header'])
     ## ipv6-header.h (module 'internet'): ns3::Ipv6Header::NextHeader_e [enumeration]
@@ -180,6 +192,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Ipv4MulticastRoute', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Ipv4MulticastRoute>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> > [class]
@@ -200,8 +214,14 @@
     module.add_enum('SocketType', ['NS3_SOCK_STREAM', 'NS3_SOCK_SEQPACKET', 'NS3_SOCK_DGRAM', 'NS3_SOCK_RAW'], outer_class=root_module['ns3::Socket'], import_from_module='ns.network')
     ## socket.h (module 'network'): ns3::SocketAddressTag [class]
     module.add_class('SocketAddressTag', import_from_module='ns.network', parent=root_module['ns3::Tag'])
+    ## socket.h (module 'network'): ns3::SocketIpTosTag [class]
+    module.add_class('SocketIpTosTag', import_from_module='ns.network', parent=root_module['ns3::Tag'])
     ## socket.h (module 'network'): ns3::SocketIpTtlTag [class]
     module.add_class('SocketIpTtlTag', import_from_module='ns.network', parent=root_module['ns3::Tag'])
+    ## socket.h (module 'network'): ns3::SocketIpv6HopLimitTag [class]
+    module.add_class('SocketIpv6HopLimitTag', import_from_module='ns.network', parent=root_module['ns3::Tag'])
+    ## socket.h (module 'network'): ns3::SocketIpv6TclassTag [class]
+    module.add_class('SocketIpv6TclassTag', import_from_module='ns.network', parent=root_module['ns3::Tag'])
     ## socket.h (module 'network'): ns3::SocketSetDontFragmentTag [class]
     module.add_class('SocketSetDontFragmentTag', import_from_module='ns.network', parent=root_module['ns3::Tag'])
     ## nstime.h (module 'core'): ns3::Time [class]
@@ -278,8 +298,6 @@
     module.add_class('OutputStreamWrapper', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> >'])
     ## packet.h (module 'network'): ns3::Packet [class]
     module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
-    ## nstime.h (module 'core'): ns3::TimeChecker [class]
-    module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
     module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
@@ -305,11 +323,47 @@
     nested_module = module.add_cpp_namespace('FatalImpl')
     register_types_ns3_FatalImpl(nested_module)
     
+    
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
 
 def register_types_ns3_FatalImpl(module):
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_methods(root_module):
     register_Ns3Address_methods(root_module, root_module['ns3::Address'])
     register_Ns3AttributeConstructionList_methods(root_module, root_module['ns3::AttributeConstructionList'])
@@ -323,6 +377,9 @@
     register_Ns3ByteTagListIteratorItem_methods(root_module, root_module['ns3::ByteTagList::Iterator::Item'])
     register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase'])
     register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
+    register_Ns3Inet6SocketAddress_methods(root_module, root_module['ns3::Inet6SocketAddress'])
+    register_Ns3InetSocketAddress_methods(root_module, root_module['ns3::InetSocketAddress'])
     register_Ns3IntToType__0_methods(root_module, root_module['ns3::IntToType< 0 >'])
     register_Ns3IntToType__1_methods(root_module, root_module['ns3::IntToType< 1 >'])
     register_Ns3IntToType__2_methods(root_module, root_module['ns3::IntToType< 2 >'])
@@ -370,6 +427,7 @@
     register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
     register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3Ipv4MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4MulticastRoute__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> >'])
     register_Ns3SimpleRefCount__Ns3Ipv4Route_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4Route__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> >'])
     register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
@@ -378,7 +436,10 @@
     register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >'])
     register_Ns3Socket_methods(root_module, root_module['ns3::Socket'])
     register_Ns3SocketAddressTag_methods(root_module, root_module['ns3::SocketAddressTag'])
+    register_Ns3SocketIpTosTag_methods(root_module, root_module['ns3::SocketIpTosTag'])
     register_Ns3SocketIpTtlTag_methods(root_module, root_module['ns3::SocketIpTtlTag'])
+    register_Ns3SocketIpv6HopLimitTag_methods(root_module, root_module['ns3::SocketIpv6HopLimitTag'])
+    register_Ns3SocketIpv6TclassTag_methods(root_module, root_module['ns3::SocketIpv6TclassTag'])
     register_Ns3SocketSetDontFragmentTag_methods(root_module, root_module['ns3::SocketSetDontFragmentTag'])
     register_Ns3Time_methods(root_module, root_module['ns3::Time'])
     register_Ns3TraceSourceAccessor_methods(root_module, root_module['ns3::TraceSourceAccessor'])
@@ -413,13 +474,17 @@
     register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue'])
     register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper'])
     register_Ns3Packet_methods(root_module, root_module['ns3::Packet'])
-    register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
     register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
     register_Ns3AddressChecker_methods(root_module, root_module['ns3::AddressChecker'])
     register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue'])
     register_Ns3Ipv4ClickRouting_methods(root_module, root_module['ns3::Ipv4ClickRouting'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     return
 
 def register_Ns3Address_methods(root_module, cls):
@@ -945,6 +1010,121 @@
                    is_const=True)
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
+def register_Ns3Inet6SocketAddress_methods(root_module, cls):
+    ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress::Inet6SocketAddress(ns3::Inet6SocketAddress const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Inet6SocketAddress const &', 'arg0')])
+    ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress::Inet6SocketAddress(ns3::Ipv6Address ipv6, uint16_t port) [constructor]
+    cls.add_constructor([param('ns3::Ipv6Address', 'ipv6'), param('uint16_t', 'port')])
+    ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress::Inet6SocketAddress(ns3::Ipv6Address ipv6) [constructor]
+    cls.add_constructor([param('ns3::Ipv6Address', 'ipv6')])
+    ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress::Inet6SocketAddress(uint16_t port) [constructor]
+    cls.add_constructor([param('uint16_t', 'port')])
+    ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress::Inet6SocketAddress(char const * ipv6, uint16_t port) [constructor]
+    cls.add_constructor([param('char const *', 'ipv6'), param('uint16_t', 'port')])
+    ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress::Inet6SocketAddress(char const * ipv6) [constructor]
+    cls.add_constructor([param('char const *', 'ipv6')])
+    ## inet6-socket-address.h (module 'network'): static ns3::Inet6SocketAddress ns3::Inet6SocketAddress::ConvertFrom(ns3::Address const & addr) [member function]
+    cls.add_method('ConvertFrom', 
+                   'ns3::Inet6SocketAddress', 
+                   [param('ns3::Address const &', 'addr')], 
+                   is_static=True)
+    ## inet6-socket-address.h (module 'network'): ns3::Ipv6Address ns3::Inet6SocketAddress::GetIpv6() const [member function]
+    cls.add_method('GetIpv6', 
+                   'ns3::Ipv6Address', 
+                   [], 
+                   is_const=True)
+    ## inet6-socket-address.h (module 'network'): uint16_t ns3::Inet6SocketAddress::GetPort() const [member function]
+    cls.add_method('GetPort', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## inet6-socket-address.h (module 'network'): static bool ns3::Inet6SocketAddress::IsMatchingType(ns3::Address const & addr) [member function]
+    cls.add_method('IsMatchingType', 
+                   'bool', 
+                   [param('ns3::Address const &', 'addr')], 
+                   is_static=True)
+    ## inet6-socket-address.h (module 'network'): void ns3::Inet6SocketAddress::SetIpv6(ns3::Ipv6Address ipv6) [member function]
+    cls.add_method('SetIpv6', 
+                   'void', 
+                   [param('ns3::Ipv6Address', 'ipv6')])
+    ## inet6-socket-address.h (module 'network'): void ns3::Inet6SocketAddress::SetPort(uint16_t port) [member function]
+    cls.add_method('SetPort', 
+                   'void', 
+                   [param('uint16_t', 'port')])
+    return
+
+def register_Ns3InetSocketAddress_methods(root_module, cls):
+    ## inet-socket-address.h (module 'network'): ns3::InetSocketAddress::InetSocketAddress(ns3::InetSocketAddress const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::InetSocketAddress const &', 'arg0')])
+    ## inet-socket-address.h (module 'network'): ns3::InetSocketAddress::InetSocketAddress(ns3::Ipv4Address ipv4, uint16_t port) [constructor]
+    cls.add_constructor([param('ns3::Ipv4Address', 'ipv4'), param('uint16_t', 'port')])
+    ## inet-socket-address.h (module 'network'): ns3::InetSocketAddress::InetSocketAddress(ns3::Ipv4Address ipv4) [constructor]
+    cls.add_constructor([param('ns3::Ipv4Address', 'ipv4')])
+    ## inet-socket-address.h (module 'network'): ns3::InetSocketAddress::InetSocketAddress(uint16_t port) [constructor]
+    cls.add_constructor([param('uint16_t', 'port')])
+    ## inet-socket-address.h (module 'network'): ns3::InetSocketAddress::InetSocketAddress(char const * ipv4, uint16_t port) [constructor]
+    cls.add_constructor([param('char const *', 'ipv4'), param('uint16_t', 'port')])
+    ## inet-socket-address.h (module 'network'): ns3::InetSocketAddress::InetSocketAddress(char const * ipv4) [constructor]
+    cls.add_constructor([param('char const *', 'ipv4')])
+    ## inet-socket-address.h (module 'network'): static ns3::InetSocketAddress ns3::InetSocketAddress::ConvertFrom(ns3::Address const & address) [member function]
+    cls.add_method('ConvertFrom', 
+                   'ns3::InetSocketAddress', 
+                   [param('ns3::Address const &', 'address')], 
+                   is_static=True)
+    ## inet-socket-address.h (module 'network'): ns3::Ipv4Address ns3::InetSocketAddress::GetIpv4() const [member function]
+    cls.add_method('GetIpv4', 
+                   'ns3::Ipv4Address', 
+                   [], 
+                   is_const=True)
+    ## inet-socket-address.h (module 'network'): uint16_t ns3::InetSocketAddress::GetPort() const [member function]
+    cls.add_method('GetPort', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## inet-socket-address.h (module 'network'): static bool ns3::InetSocketAddress::IsMatchingType(ns3::Address const & address) [member function]
+    cls.add_method('IsMatchingType', 
+                   'bool', 
+                   [param('ns3::Address const &', 'address')], 
+                   is_static=True)
+    ## inet-socket-address.h (module 'network'): void ns3::InetSocketAddress::SetIpv4(ns3::Ipv4Address address) [member function]
+    cls.add_method('SetIpv4', 
+                   'void', 
+                   [param('ns3::Ipv4Address', 'address')])
+    ## inet-socket-address.h (module 'network'): void ns3::InetSocketAddress::SetPort(uint16_t port) [member function]
+    cls.add_method('SetPort', 
+                   'void', 
+                   [param('uint16_t', 'port')])
+    return
+
 def register_Ns3IntToType__0_methods(root_module, cls):
     ## int-to-type.h (module 'core'): ns3::IntToType<0>::IntToType() [constructor]
     cls.add_constructor([])
@@ -1320,6 +1500,11 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
     cls.add_method('IsEqual', 
                    'bool', 
@@ -1359,16 +1544,36 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
     cls.add_method('MakeAutoconfiguredAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
     cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'mac')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
     cls.add_method('MakeIpv4MappedAddress', 
                    'ns3::Ipv6Address', 
@@ -1529,6 +1734,11 @@
     cls.add_method('EnvVarCheck', 
                    'void', 
                    [param('char const *', 'name')])
+    ## log.h (module 'core'): std::string ns3::LogComponent::GetLevelLabel(ns3::LogLevel const level) const [member function]
+    cls.add_method('GetLevelLabel', 
+                   'std::string', 
+                   [param('ns3::LogLevel const', 'level')], 
+                   is_const=True)
     ## log.h (module 'core'): bool ns3::LogComponent::IsEnabled(ns3::LogLevel level) const [member function]
     cls.add_method('IsEnabled', 
                    'bool', 
@@ -1825,6 +2035,10 @@
     cls.add_method('RemoveAll', 
                    'void', 
                    [])
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function]
+    cls.add_method('Replace', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     return
 
 def register_Ns3PacketTagListTagData_methods(root_module, cls):
@@ -2191,6 +2405,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -2250,6 +2469,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -2784,8 +3013,8 @@
                    'ns3::TypeId', 
                    [], 
                    is_static=True)
-    ## object.h (module 'core'): void ns3::Object::Start() [member function]
-    cls.add_method('Start', 
+    ## object.h (module 'core'): void ns3::Object::Initialize() [member function]
+    cls.add_method('Initialize', 
                    'void', 
                    [])
     ## object.h (module 'core'): ns3::Object::Object(ns3::Object const & o) [copy constructor]
@@ -2796,8 +3025,8 @@
                    'void', 
                    [], 
                    visibility='protected', is_virtual=True)
-    ## object.h (module 'core'): void ns3::Object::DoStart() [member function]
-    cls.add_method('DoStart', 
+    ## object.h (module 'core'): void ns3::Object::DoInitialize() [member function]
+    cls.add_method('DoInitialize', 
                    'void', 
                    [], 
                    visibility='protected', is_virtual=True)
@@ -2884,6 +3113,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3Ipv4MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4MulticastRoute__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -3010,6 +3251,26 @@
                    'ns3::Socket::SocketErrno', 
                    [], 
                    is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## socket.h (module 'network'): uint8_t ns3::Socket::GetIpTos() const [member function]
+    cls.add_method('GetIpTos', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## socket.h (module 'network'): uint8_t ns3::Socket::GetIpTtl() const [member function]
+    cls.add_method('GetIpTtl', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## socket.h (module 'network'): uint8_t ns3::Socket::GetIpv6HopLimit() const [member function]
+    cls.add_method('GetIpv6HopLimit', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## socket.h (module 'network'): uint8_t ns3::Socket::GetIpv6Tclass() const [member function]
+    cls.add_method('GetIpv6Tclass', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
     ## socket.h (module 'network'): ns3::Ptr<ns3::Node> ns3::Socket::GetNode() const [member function]
     cls.add_method('GetNode', 
                    'ns3::Ptr< ns3::Node >', 
@@ -3040,6 +3301,26 @@
                    'ns3::TypeId', 
                    [], 
                    is_static=True)
+    ## socket.h (module 'network'): bool ns3::Socket::IsIpRecvTos() const [member function]
+    cls.add_method('IsIpRecvTos', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## socket.h (module 'network'): bool ns3::Socket::IsIpRecvTtl() const [member function]
+    cls.add_method('IsIpRecvTtl', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## socket.h (module 'network'): bool ns3::Socket::IsIpv6RecvHopLimit() const [member function]
+    cls.add_method('IsIpv6RecvHopLimit', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## socket.h (module 'network'): bool ns3::Socket::IsIpv6RecvTclass() const [member function]
+    cls.add_method('IsIpv6RecvTclass', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## socket.h (module 'network'): bool ns3::Socket::IsRecvPktInfo() const [member function]
     cls.add_method('IsRecvPktInfo', 
                    'bool', 
@@ -3119,6 +3400,40 @@
     cls.add_method('SetDataSentCallback', 
                    'void', 
                    [param('ns3::Callback< void, ns3::Ptr< ns3::Socket >, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'dataSent')])
+    ## socket.h (module 'network'): void ns3::Socket::SetIpRecvTos(bool ipv4RecvTos) [member function]
+    cls.add_method('SetIpRecvTos', 
+                   'void', 
+                   [param('bool', 'ipv4RecvTos')])
+    ## socket.h (module 'network'): void ns3::Socket::SetIpRecvTtl(bool ipv4RecvTtl) [member function]
+    cls.add_method('SetIpRecvTtl', 
+                   'void', 
+                   [param('bool', 'ipv4RecvTtl')])
+    ## socket.h (module 'network'): void ns3::Socket::SetIpTos(uint8_t ipTos) [member function]
+    cls.add_method('SetIpTos', 
+                   'void', 
+                   [param('uint8_t', 'ipTos')])
+    ## socket.h (module 'network'): void ns3::Socket::SetIpTtl(uint8_t ipTtl) [member function]
+    cls.add_method('SetIpTtl', 
+                   'void', 
+                   [param('uint8_t', 'ipTtl')], 
+                   is_virtual=True)
+    ## socket.h (module 'network'): void ns3::Socket::SetIpv6HopLimit(uint8_t ipHopLimit) [member function]
+    cls.add_method('SetIpv6HopLimit', 
+                   'void', 
+                   [param('uint8_t', 'ipHopLimit')], 
+                   is_virtual=True)
+    ## socket.h (module 'network'): void ns3::Socket::SetIpv6RecvHopLimit(bool ipv6RecvHopLimit) [member function]
+    cls.add_method('SetIpv6RecvHopLimit', 
+                   'void', 
+                   [param('bool', 'ipv6RecvHopLimit')])
+    ## socket.h (module 'network'): void ns3::Socket::SetIpv6RecvTclass(bool ipv6RecvTclass) [member function]
+    cls.add_method('SetIpv6RecvTclass', 
+                   'void', 
+                   [param('bool', 'ipv6RecvTclass')])
+    ## socket.h (module 'network'): void ns3::Socket::SetIpv6Tclass(int ipTclass) [member function]
+    cls.add_method('SetIpv6Tclass', 
+                   'void', 
+                   [param('int', 'ipTclass')])
     ## socket.h (module 'network'): void ns3::Socket::SetRecvCallback(ns3::Callback<void, ns3::Ptr<ns3::Socket>, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> arg0) [member function]
     cls.add_method('SetRecvCallback', 
                    'void', 
@@ -3146,6 +3461,26 @@
                    'void', 
                    [], 
                    visibility='protected', is_virtual=True)
+    ## socket.h (module 'network'): bool ns3::Socket::IsManualIpTos() const [member function]
+    cls.add_method('IsManualIpTos', 
+                   'bool', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## socket.h (module 'network'): bool ns3::Socket::IsManualIpTtl() const [member function]
+    cls.add_method('IsManualIpTtl', 
+                   'bool', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## socket.h (module 'network'): bool ns3::Socket::IsManualIpv6HopLimit() const [member function]
+    cls.add_method('IsManualIpv6HopLimit', 
+                   'bool', 
+                   [], 
+                   is_const=True, visibility='protected')
+    ## socket.h (module 'network'): bool ns3::Socket::IsManualIpv6Tclass() const [member function]
+    cls.add_method('IsManualIpv6Tclass', 
+                   'bool', 
+                   [], 
+                   is_const=True, visibility='protected')
     ## socket.h (module 'network'): void ns3::Socket::NotifyConnectionFailed() [member function]
     cls.add_method('NotifyConnectionFailed', 
                    'void', 
@@ -3239,6 +3574,52 @@
                    [param('ns3::Address', 'addr')])
     return
 
+def register_Ns3SocketIpTosTag_methods(root_module, cls):
+    ## socket.h (module 'network'): ns3::SocketIpTosTag::SocketIpTosTag(ns3::SocketIpTosTag const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::SocketIpTosTag const &', 'arg0')])
+    ## socket.h (module 'network'): ns3::SocketIpTosTag::SocketIpTosTag() [constructor]
+    cls.add_constructor([])
+    ## socket.h (module 'network'): void ns3::SocketIpTosTag::Deserialize(ns3::TagBuffer i) [member function]
+    cls.add_method('Deserialize', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'i')], 
+                   is_virtual=True)
+    ## socket.h (module 'network'): ns3::TypeId ns3::SocketIpTosTag::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## socket.h (module 'network'): uint32_t ns3::SocketIpTosTag::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## socket.h (module 'network'): uint8_t ns3::SocketIpTosTag::GetTos() const [member function]
+    cls.add_method('GetTos', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## socket.h (module 'network'): static ns3::TypeId ns3::SocketIpTosTag::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## socket.h (module 'network'): void ns3::SocketIpTosTag::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## socket.h (module 'network'): void ns3::SocketIpTosTag::Serialize(ns3::TagBuffer i) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'i')], 
+                   is_const=True, is_virtual=True)
+    ## socket.h (module 'network'): void ns3::SocketIpTosTag::SetTos(uint8_t tos) [member function]
+    cls.add_method('SetTos', 
+                   'void', 
+                   [param('uint8_t', 'tos')])
+    return
+
 def register_Ns3SocketIpTtlTag_methods(root_module, cls):
     ## socket.h (module 'network'): ns3::SocketIpTtlTag::SocketIpTtlTag(ns3::SocketIpTtlTag const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::SocketIpTtlTag const &', 'arg0')])
@@ -3285,6 +3666,98 @@
                    [param('uint8_t', 'ttl')])
     return
 
+def register_Ns3SocketIpv6HopLimitTag_methods(root_module, cls):
+    ## socket.h (module 'network'): ns3::SocketIpv6HopLimitTag::SocketIpv6HopLimitTag(ns3::SocketIpv6HopLimitTag const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::SocketIpv6HopLimitTag const &', 'arg0')])
+    ## socket.h (module 'network'): ns3::SocketIpv6HopLimitTag::SocketIpv6HopLimitTag() [constructor]
+    cls.add_constructor([])
+    ## socket.h (module 'network'): void ns3::SocketIpv6HopLimitTag::Deserialize(ns3::TagBuffer i) [member function]
+    cls.add_method('Deserialize', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'i')], 
+                   is_virtual=True)
+    ## socket.h (module 'network'): uint8_t ns3::SocketIpv6HopLimitTag::GetHopLimit() const [member function]
+    cls.add_method('GetHopLimit', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## socket.h (module 'network'): ns3::TypeId ns3::SocketIpv6HopLimitTag::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## socket.h (module 'network'): uint32_t ns3::SocketIpv6HopLimitTag::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## socket.h (module 'network'): static ns3::TypeId ns3::SocketIpv6HopLimitTag::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## socket.h (module 'network'): void ns3::SocketIpv6HopLimitTag::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## socket.h (module 'network'): void ns3::SocketIpv6HopLimitTag::Serialize(ns3::TagBuffer i) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'i')], 
+                   is_const=True, is_virtual=True)
+    ## socket.h (module 'network'): void ns3::SocketIpv6HopLimitTag::SetHopLimit(uint8_t hopLimit) [member function]
+    cls.add_method('SetHopLimit', 
+                   'void', 
+                   [param('uint8_t', 'hopLimit')])
+    return
+
+def register_Ns3SocketIpv6TclassTag_methods(root_module, cls):
+    ## socket.h (module 'network'): ns3::SocketIpv6TclassTag::SocketIpv6TclassTag(ns3::SocketIpv6TclassTag const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::SocketIpv6TclassTag const &', 'arg0')])
+    ## socket.h (module 'network'): ns3::SocketIpv6TclassTag::SocketIpv6TclassTag() [constructor]
+    cls.add_constructor([])
+    ## socket.h (module 'network'): void ns3::SocketIpv6TclassTag::Deserialize(ns3::TagBuffer i) [member function]
+    cls.add_method('Deserialize', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'i')], 
+                   is_virtual=True)
+    ## socket.h (module 'network'): ns3::TypeId ns3::SocketIpv6TclassTag::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## socket.h (module 'network'): uint32_t ns3::SocketIpv6TclassTag::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## socket.h (module 'network'): uint8_t ns3::SocketIpv6TclassTag::GetTclass() const [member function]
+    cls.add_method('GetTclass', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## socket.h (module 'network'): static ns3::TypeId ns3::SocketIpv6TclassTag::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## socket.h (module 'network'): void ns3::SocketIpv6TclassTag::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## socket.h (module 'network'): void ns3::SocketIpv6TclassTag::Serialize(ns3::TagBuffer i) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::TagBuffer', 'i')], 
+                   is_const=True, is_virtual=True)
+    ## socket.h (module 'network'): void ns3::SocketIpv6TclassTag::SetTclass(uint8_t tclass) [member function]
+    cls.add_method('SetTclass', 
+                   'void', 
+                   [param('uint8_t', 'tclass')])
+    return
+
 def register_Ns3SocketSetDontFragmentTag_methods(root_module, cls):
     ## socket.h (module 'network'): ns3::SocketSetDontFragmentTag::SocketSetDontFragmentTag(ns3::SocketSetDontFragmentTag const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::SocketSetDontFragmentTag const &', 'arg0')])
@@ -3469,11 +3942,26 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
     cls.add_method('SetResolution', 
                    'void', 
                    [param('ns3::Time::Unit', 'resolution')], 
                    is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
     cls.add_method('To', 
                    'ns3::int64x64_t', 
@@ -3765,10 +4253,10 @@
                    'ns3::IpL4Protocol::RxStatus', 
                    [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv4Header const &', 'header'), param('ns3::Ptr< ns3::Ipv4Interface >', 'incomingInterface')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## ip-l4-protocol.h (module 'internet'): ns3::IpL4Protocol::RxStatus ns3::IpL4Protocol::Receive(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Address & src, ns3::Ipv6Address & dst, ns3::Ptr<ns3::Ipv6Interface> incomingInterface) [member function]
+    ## ip-l4-protocol.h (module 'internet'): ns3::IpL4Protocol::RxStatus ns3::IpL4Protocol::Receive(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Header const & header, ns3::Ptr<ns3::Ipv6Interface> incomingInterface) [member function]
     cls.add_method('Receive', 
                    'ns3::IpL4Protocol::RxStatus', 
-                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv6Address &', 'src'), param('ns3::Ipv6Address &', 'dst'), param('ns3::Ptr< ns3::Ipv6Interface >', 'incomingInterface')], 
+                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::Ipv6Interface >', 'incomingInterface')], 
                    is_pure_virtual=True, is_virtual=True)
     ## ip-l4-protocol.h (module 'internet'): void ns3::IpL4Protocol::ReceiveIcmp(ns3::Ipv4Address icmpSource, uint8_t icmpTtl, uint8_t icmpType, uint8_t icmpCode, uint32_t icmpInfo, ns3::Ipv4Address payloadSource, ns3::Ipv4Address payloadDestination, uint8_t const * payload) [member function]
     cls.add_method('ReceiveIcmp', 
@@ -3807,6 +4295,16 @@
                    'uint32_t', 
                    [param('ns3::Ptr< ns3::NetDevice >', 'device')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## ipv4.h (module 'internet'): ns3::Ptr<ns3::Socket> ns3::Ipv4::CreateRawSocket() [member function]
+    cls.add_method('CreateRawSocket', 
+                   'ns3::Ptr< ns3::Socket >', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## ipv4.h (module 'internet'): void ns3::Ipv4::DeleteRawSocket(ns3::Ptr<ns3::Socket> socket) [member function]
+    cls.add_method('DeleteRawSocket', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Socket >', 'socket')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## ipv4.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4::GetAddress(uint32_t interface, uint32_t addressIndex) const [member function]
     cls.add_method('GetAddress', 
                    'ns3::Ipv4InterfaceAddress', 
@@ -3852,6 +4350,11 @@
                    'ns3::Ptr< ns3::NetDevice >', 
                    [param('uint32_t', 'interface')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## ipv4.h (module 'internet'): ns3::Ptr<ns3::IpL4Protocol> ns3::Ipv4::GetProtocol(int protocolNumber) const [member function]
+    cls.add_method('GetProtocol', 
+                   'ns3::Ptr< ns3::IpL4Protocol >', 
+                   [param('int', 'protocolNumber')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
     ## ipv4.h (module 'internet'): ns3::Ptr<ns3::Ipv4RoutingProtocol> ns3::Ipv4::GetRoutingProtocol() const [member function]
     cls.add_method('GetRoutingProtocol', 
                    'ns3::Ptr< ns3::Ipv4RoutingProtocol >', 
@@ -3887,6 +4390,11 @@
                    'bool', 
                    [param('uint32_t', 'interface'), param('uint32_t', 'addressIndex')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## ipv4.h (module 'internet'): bool ns3::Ipv4::RemoveAddress(uint32_t interface, ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4Address', 'address')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## ipv4.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4::SelectSourceAddress(ns3::Ptr<const ns3::NetDevice> device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function]
     cls.add_method('SelectSourceAddress', 
                    'ns3::Ipv4Address', 
@@ -3897,6 +4405,11 @@
                    'void', 
                    [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## ipv4.h (module 'internet'): void ns3::Ipv4::SendWithHeader(ns3::Ptr<ns3::Packet> packet, ns3::Ipv4Header ipHeader, ns3::Ptr<ns3::Ipv4Route> route) [member function]
+    cls.add_method('SendWithHeader', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Header', 'ipHeader'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## ipv4.h (module 'internet'): void ns3::Ipv4::SetDown(uint32_t interface) [member function]
     cls.add_method('SetDown', 
                    'void', 
@@ -4044,6 +4557,10 @@
     cls.add_method('RemoveAddress', 
                    'ns3::Ipv4InterfaceAddress', 
                    [param('uint32_t', 'index')])
+    ## ipv4-interface.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4Interface::RemoveAddress(ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'ns3::Ipv4InterfaceAddress', 
+                   [param('ns3::Ipv4Address', 'address')])
     ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::Send(ns3::Ptr<ns3::Packet> p, ns3::Ipv4Address dest) [member function]
     cls.add_method('Send', 
                    'void', 
@@ -4400,6 +4917,10 @@
     cls.add_method('RemoveAddress', 
                    'ns3::Ipv6InterfaceAddress', 
                    [param('uint32_t', 'index')])
+    ## ipv6-interface.h (module 'internet'): ns3::Ipv6InterfaceAddress ns3::Ipv6Interface::RemoveAddress(ns3::Ipv6Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'ns3::Ipv6InterfaceAddress', 
+                   [param('ns3::Ipv6Address', 'address')])
     ## ipv6-interface.h (module 'internet'): void ns3::Ipv6Interface::Send(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Address dest) [member function]
     cls.add_method('Send', 
                    'void', 
@@ -4898,6 +5419,10 @@
     cls.add_method('RemoveTrailer', 
                    'uint32_t', 
                    [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('ReplacePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
     cls.add_method('Serialize', 
                    'uint32_t', 
@@ -4909,13 +5434,6 @@
                    [param('ns3::Ptr< ns3::NixVector >', 'arg0')])
     return
 
-def register_Ns3TimeChecker_methods(root_module, cls):
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor]
-    cls.add_constructor([])
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')])
-    return
-
 def register_Ns3TimeValue_methods(root_module, cls):
     ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
     cls.add_constructor([])
@@ -5036,14 +5554,127 @@
     cls.add_constructor([param('ns3::Ipv4ClickRouting const &', 'arg0')])
     return
 
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_functions(root_module):
     module = root_module
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     return
 
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def main():
     out = FileCodeSink(sys.stdout)
     root_module = module_init()
diff -Naur ns-3.17/src/click/model/ipv4-click-routing.cc ns-3.18/src/click/model/ipv4-click-routing.cc
--- ns-3.17/src/click/model/ipv4-click-routing.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/click/model/ipv4-click-routing.cc	2013-10-26 07:07:30.539364406 -0700
@@ -506,6 +506,7 @@
         }
       else
         {
+          /** \todo Implement IP aliasing and Click */
           NS_FATAL_ERROR ("XXX Not implemented yet:  IP aliasing and Click");
         }
       rtentry->SetSource (ifAddr.GetLocal ());
diff -Naur ns-3.17/src/click/model/ipv4-l3-click-protocol.cc ns-3.18/src/click/model/ipv4-l3-click-protocol.cc
--- ns-3.17/src/click/model/ipv4-l3-click-protocol.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/click/model/ipv4-l3-click-protocol.cc	2013-10-26 07:07:30.539364406 -0700
@@ -434,6 +434,29 @@
   return false;
 }
 
+bool
+Ipv4L3ClickProtocol::RemoveAddress (uint32_t i, Ipv4Address address)
+{
+  NS_LOG_FUNCTION (this << i << address);
+
+  if (address == Ipv4Address::GetLoopback())
+    {
+      NS_LOG_WARN ("Cannot remove loopback address.");
+      return false;
+    }
+  Ptr<Ipv4Interface> interface = GetInterface (i);
+  Ipv4InterfaceAddress ifAddr = interface->RemoveAddress (address);
+  if (ifAddr != Ipv4InterfaceAddress ())
+    {
+      if (m_routingProtocol != 0)
+        {
+          m_routingProtocol->NotifyRemoveAddress (i, ifAddr);
+        }
+      return true;
+    }
+  return false;
+}
+
 Ipv4Address
 Ipv4L3ClickProtocol::SelectSourceAddress (Ptr<const NetDevice> device,
                                           Ipv4Address dst, Ipv4InterfaceAddress::InterfaceAddressScope_e scope)
@@ -609,9 +632,9 @@
   return index;
 }
 
-// XXX when should we set ip_id?   check whether we are incrementing
-// m_identification on packets that may later be dropped in this stack
-// and whether that deviates from Linux
+/// \todo when should we set ip_id?   check whether we are incrementing
+/// m_identification on packets that may later be dropped in this stack
+/// and whether that deviates from Linux
 Ipv4Header
 Ipv4L3ClickProtocol::BuildHeader (
   Ipv4Address source,
diff -Naur ns-3.17/src/click/model/ipv4-l3-click-protocol.h ns-3.18/src/click/model/ipv4-l3-click-protocol.h
--- ns-3.17/src/click/model/ipv4-l3-click-protocol.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/click/model/ipv4-l3-click-protocol.h	2013-10-26 07:07:30.539364406 -0700
@@ -215,6 +215,7 @@
   Ipv4InterfaceAddress GetAddress (uint32_t interfaceIndex, uint32_t addressIndex) const;
   uint32_t GetNAddresses (uint32_t interface) const;
   bool RemoveAddress (uint32_t interfaceIndex, uint32_t addressIndex);
+  bool RemoveAddress (uint32_t interfaceIndex, Ipv4Address address);
   Ipv4Address SelectSourceAddress (Ptr<const NetDevice> device,
                                    Ipv4Address dst, Ipv4InterfaceAddress::InterfaceAddressScope_e scope);
 
diff -Naur ns-3.17/src/config-store/bindings/modulegen__gcc_ILP32.py ns-3.18/src/config-store/bindings/modulegen__gcc_ILP32.py
--- ns-3.17/src/config-store/bindings/modulegen__gcc_ILP32.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/config-store/bindings/modulegen__gcc_ILP32.py	2013-10-26 07:07:30.551364406 -0700
@@ -26,6 +26,8 @@
     module.add_class('FileConfig', allow_subclassing=True)
     ## gtk-config-store.h (module 'config-store'): ns3::GtkConfigStore [class]
     module.add_class('GtkConfigStore')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
     ## file-config.h (module 'config-store'): ns3::NoneFileConfig [class]
     module.add_class('NoneFileConfig', parent=root_module['ns3::FileConfig'])
     ## object-base.h (module 'core'): ns3::ObjectBase [class]
@@ -54,6 +56,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::AttributeValue', 'ns3::empty', 'ns3::DefaultDeleter<ns3::AttributeValue>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::TraceSourceAccessor', 'ns3::empty', 'ns3::DefaultDeleter<ns3::TraceSourceAccessor>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -82,15 +86,52 @@
     nested_module = module.add_cpp_namespace('FatalImpl')
     register_types_ns3_FatalImpl(nested_module)
     
+    
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
 
 def register_types_ns3_FatalImpl(module):
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_methods(root_module):
     register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase'])
     register_Ns3FileConfig_methods(root_module, root_module['ns3::FileConfig'])
     register_Ns3GtkConfigStore_methods(root_module, root_module['ns3::GtkConfigStore'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3NoneFileConfig_methods(root_module, root_module['ns3::NoneFileConfig'])
     register_Ns3ObjectBase_methods(root_module, root_module['ns3::ObjectBase'])
     register_Ns3TypeId_methods(root_module, root_module['ns3::TypeId'])
@@ -102,6 +143,7 @@
     register_Ns3SimpleRefCount__Ns3AttributeChecker_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeChecker__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> >'])
     register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >'])
     register_Ns3TraceSourceAccessor_methods(root_module, root_module['ns3::TraceSourceAccessor'])
     register_Ns3AttributeAccessor_methods(root_module, root_module['ns3::AttributeAccessor'])
@@ -113,6 +155,11 @@
     register_Ns3EmptyAttributeValue_methods(root_module, root_module['ns3::EmptyAttributeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
     register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     return
 
 def register_Ns3CallbackBase_methods(root_module, cls):
@@ -177,6 +224,35 @@
                    [])
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3NoneFileConfig_methods(root_module, cls):
     ## file-config.h (module 'config-store'): ns3::NoneFileConfig::NoneFileConfig(ns3::NoneFileConfig const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::NoneFileConfig const &', 'arg0')])
@@ -313,6 +389,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -372,6 +453,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -531,6 +622,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -770,14 +873,127 @@
                    [param('ns3::TypeId const &', 'value')])
     return
 
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_functions(root_module):
     module = root_module
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     return
 
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def main():
     out = FileCodeSink(sys.stdout)
     root_module = module_init()
diff -Naur ns-3.17/src/config-store/bindings/modulegen__gcc_LP64.py ns-3.18/src/config-store/bindings/modulegen__gcc_LP64.py
--- ns-3.17/src/config-store/bindings/modulegen__gcc_LP64.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/config-store/bindings/modulegen__gcc_LP64.py	2013-10-26 07:07:30.551364406 -0700
@@ -26,6 +26,8 @@
     module.add_class('FileConfig', allow_subclassing=True)
     ## gtk-config-store.h (module 'config-store'): ns3::GtkConfigStore [class]
     module.add_class('GtkConfigStore')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
     ## file-config.h (module 'config-store'): ns3::NoneFileConfig [class]
     module.add_class('NoneFileConfig', parent=root_module['ns3::FileConfig'])
     ## object-base.h (module 'core'): ns3::ObjectBase [class]
@@ -54,6 +56,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::AttributeValue', 'ns3::empty', 'ns3::DefaultDeleter<ns3::AttributeValue>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::TraceSourceAccessor', 'ns3::empty', 'ns3::DefaultDeleter<ns3::TraceSourceAccessor>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class]
@@ -82,15 +86,52 @@
     nested_module = module.add_cpp_namespace('FatalImpl')
     register_types_ns3_FatalImpl(nested_module)
     
+    
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
 
 def register_types_ns3_FatalImpl(module):
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_methods(root_module):
     register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase'])
     register_Ns3FileConfig_methods(root_module, root_module['ns3::FileConfig'])
     register_Ns3GtkConfigStore_methods(root_module, root_module['ns3::GtkConfigStore'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3NoneFileConfig_methods(root_module, root_module['ns3::NoneFileConfig'])
     register_Ns3ObjectBase_methods(root_module, root_module['ns3::ObjectBase'])
     register_Ns3TypeId_methods(root_module, root_module['ns3::TypeId'])
@@ -102,6 +143,7 @@
     register_Ns3SimpleRefCount__Ns3AttributeChecker_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeChecker__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> >'])
     register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >'])
     register_Ns3TraceSourceAccessor_methods(root_module, root_module['ns3::TraceSourceAccessor'])
     register_Ns3AttributeAccessor_methods(root_module, root_module['ns3::AttributeAccessor'])
@@ -113,6 +155,11 @@
     register_Ns3EmptyAttributeValue_methods(root_module, root_module['ns3::EmptyAttributeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
     register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     return
 
 def register_Ns3CallbackBase_methods(root_module, cls):
@@ -177,6 +224,35 @@
                    [])
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3NoneFileConfig_methods(root_module, cls):
     ## file-config.h (module 'config-store'): ns3::NoneFileConfig::NoneFileConfig(ns3::NoneFileConfig const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::NoneFileConfig const &', 'arg0')])
@@ -313,6 +389,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -372,6 +453,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -531,6 +622,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -770,14 +873,127 @@
                    [param('ns3::TypeId const &', 'value')])
     return
 
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_functions(root_module):
     module = root_module
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     return
 
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def main():
     out = FileCodeSink(sys.stdout)
     root_module = module_init()
diff -Naur ns-3.17/src/core/bindings/modulegen__gcc_ILP32.py ns-3.18/src/core/bindings/modulegen__gcc_ILP32.py
--- ns-3.17/src/core/bindings/modulegen__gcc_ILP32.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/bindings/modulegen__gcc_ILP32.py	2013-10-26 07:07:30.055364394 -0700
@@ -32,10 +32,14 @@
     module.add_class('CommandLine', allow_subclassing=True)
     ## system-mutex.h (module 'core'): ns3::CriticalSection [class]
     module.add_class('CriticalSection')
+    ## event-garbage-collector.h (module 'core'): ns3::EventGarbageCollector [class]
+    module.add_class('EventGarbageCollector')
     ## event-id.h (module 'core'): ns3::EventId [class]
     module.add_class('EventId')
     ## global-value.h (module 'core'): ns3::GlobalValue [class]
     module.add_class('GlobalValue')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher')
     ## int-to-type.h (module 'core'): ns3::IntToType<0> [struct]
     module.add_class('IntToType', template_parameters=['0'])
     ## int-to-type.h (module 'core'): ns3::IntToType<0>::v_e [enumeration]
@@ -76,6 +80,8 @@
     module.add_class('ObjectFactory')
     ## random-variable.h (module 'core'): ns3::RandomVariable [class]
     module.add_class('RandomVariable')
+    ## random-variable-stream-helper.h (module 'core'): ns3::RandomVariableStreamHelper [class]
+    module.add_class('RandomVariableStreamHelper')
     ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager [class]
     module.add_class('RngSeedManager')
     ## rng-stream.h (module 'core'): ns3::RngStream [class]
@@ -174,6 +180,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::FdReader, ns3::empty, ns3::DefaultDeleter<ns3::FdReader> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, template_parameters=['ns3::FdReader', 'ns3::empty', 'ns3::DefaultDeleter<ns3::FdReader>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::RefCountBase, ns3::empty, ns3::DefaultDeleter<ns3::RefCountBase> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, template_parameters=['ns3::RefCountBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::RefCountBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::SystemThread, ns3::empty, ns3::DefaultDeleter<ns3::SystemThread> > [class]
@@ -292,8 +300,6 @@
     module.add_class('StringChecker', parent=root_module['ns3::AttributeChecker'])
     ## string.h (module 'core'): ns3::StringValue [class]
     module.add_class('StringValue', parent=root_module['ns3::AttributeValue'])
-    ## nstime.h (module 'core'): ns3::TimeChecker [class]
-    module.add_class('TimeChecker', parent=root_module['ns3::AttributeChecker'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
     module.add_class('TimeValue', parent=root_module['ns3::AttributeValue'])
     ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
@@ -310,6 +316,10 @@
     module.add_class('Vector3DChecker', parent=root_module['ns3::AttributeChecker'])
     ## vector.h (module 'core'): ns3::Vector3DValue [class]
     module.add_class('Vector3DValue', parent=root_module['ns3::AttributeValue'])
+    typehandlers.add_type_alias('ns3::Vector3D', 'ns3::Vector')
+    typehandlers.add_type_alias('ns3::Vector3D*', 'ns3::Vector*')
+    typehandlers.add_type_alias('ns3::Vector3D&', 'ns3::Vector&')
+    module.add_typedef(root_module['ns3::Vector3D'], 'Vector')
     typehandlers.add_type_alias('ns3::ObjectPtrContainerValue', 'ns3::ObjectVectorValue')
     typehandlers.add_type_alias('ns3::ObjectPtrContainerValue*', 'ns3::ObjectVectorValue*')
     typehandlers.add_type_alias('ns3::ObjectPtrContainerValue&', 'ns3::ObjectVectorValue&')
@@ -324,10 +334,6 @@
     typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *', 'ns3::LogNodePrinter')
     typehandlers.add_type_alias('void ( * ) ( std::ostream & ) **', 'ns3::LogNodePrinter*')
     typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *&', 'ns3::LogNodePrinter&')
-    typehandlers.add_type_alias('ns3::Vector3D', 'ns3::Vector')
-    typehandlers.add_type_alias('ns3::Vector3D*', 'ns3::Vector*')
-    typehandlers.add_type_alias('ns3::Vector3D&', 'ns3::Vector&')
-    module.add_typedef(root_module['ns3::Vector3D'], 'Vector')
     typehandlers.add_type_alias('ns3::Vector3DValue', 'ns3::VectorValue')
     typehandlers.add_type_alias('ns3::Vector3DValue*', 'ns3::VectorValue*')
     typehandlers.add_type_alias('ns3::Vector3DValue&', 'ns3::VectorValue&')
@@ -341,6 +347,12 @@
     typehandlers.add_type_alias('ns3::Vector3DChecker&', 'ns3::VectorChecker&')
     module.add_typedef(root_module['ns3::Vector3DChecker'], 'VectorChecker')
     
+    ## Register a nested module for the namespace CommandLineHelper
+    
+    nested_module = module.add_cpp_namespace('CommandLineHelper')
+    register_types_ns3_CommandLineHelper(nested_module)
+    
+    
     ## Register a nested module for the namespace Config
     
     nested_module = module.add_cpp_namespace('Config')
@@ -353,6 +365,12 @@
     register_types_ns3_FatalImpl(nested_module)
     
     
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
+    
     ## Register a nested module for the namespace SystemPath
     
     nested_module = module.add_cpp_namespace('SystemPath')
@@ -365,6 +383,10 @@
     register_types_ns3_internal(nested_module)
     
 
+def register_types_ns3_CommandLineHelper(module):
+    root_module = module.get_root()
+    
+
 def register_types_ns3_Config(module):
     root_module = module.get_root()
     
@@ -377,6 +399,36 @@
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', parent=root_module['ns3::Hash::Implementation'])
+
 def register_types_ns3_SystemPath(module):
     root_module = module.get_root()
     
@@ -392,8 +444,10 @@
     register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase'])
     register_Ns3CommandLine_methods(root_module, root_module['ns3::CommandLine'])
     register_Ns3CriticalSection_methods(root_module, root_module['ns3::CriticalSection'])
+    register_Ns3EventGarbageCollector_methods(root_module, root_module['ns3::EventGarbageCollector'])
     register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
     register_Ns3GlobalValue_methods(root_module, root_module['ns3::GlobalValue'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3IntToType__0_methods(root_module, root_module['ns3::IntToType< 0 >'])
     register_Ns3IntToType__1_methods(root_module, root_module['ns3::IntToType< 1 >'])
     register_Ns3IntToType__2_methods(root_module, root_module['ns3::IntToType< 2 >'])
@@ -407,6 +461,7 @@
     register_Ns3ObjectDeleter_methods(root_module, root_module['ns3::ObjectDeleter'])
     register_Ns3ObjectFactory_methods(root_module, root_module['ns3::ObjectFactory'])
     register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable'])
+    register_Ns3RandomVariableStreamHelper_methods(root_module, root_module['ns3::RandomVariableStreamHelper'])
     register_Ns3RngSeedManager_methods(root_module, root_module['ns3::RngSeedManager'])
     register_Ns3RngStream_methods(root_module, root_module['ns3::RngStream'])
     register_Ns3SequentialVariable_methods(root_module, root_module['ns3::SequentialVariable'])
@@ -453,6 +508,7 @@
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
     register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
     register_Ns3SimpleRefCount__Ns3FdReader_Ns3Empty_Ns3DefaultDeleter__lt__ns3FdReader__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::FdReader, ns3::empty, ns3::DefaultDeleter<ns3::FdReader> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3RefCountBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3RefCountBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::RefCountBase, ns3::empty, ns3::DefaultDeleter<ns3::RefCountBase> >'])
     register_Ns3SimpleRefCount__Ns3SystemThread_Ns3Empty_Ns3DefaultDeleter__lt__ns3SystemThread__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::SystemThread, ns3::empty, ns3::DefaultDeleter<ns3::SystemThread> >'])
     register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >'])
@@ -509,7 +565,6 @@
     register_Ns3RefCountBase_methods(root_module, root_module['ns3::RefCountBase'])
     register_Ns3StringChecker_methods(root_module, root_module['ns3::StringChecker'])
     register_Ns3StringValue_methods(root_module, root_module['ns3::StringValue'])
-    register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
     register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
@@ -519,6 +574,11 @@
     register_Ns3Vector3DChecker_methods(root_module, root_module['ns3::Vector3DChecker'])
     register_Ns3Vector3DValue_methods(root_module, root_module['ns3::Vector3DValue'])
     register_Ns3ConfigMatchContainer_methods(root_module, root_module['ns3::Config::MatchContainer'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     return
 
 def register_Ns3AttributeConstructionList_methods(root_module, cls):
@@ -589,6 +649,24 @@
     cls.add_method('AddValue', 
                    'void', 
                    [param('std::string const &', 'name'), param('std::string const &', 'help'), param('ns3::Callback< bool, std::string, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')])
+    ## command-line.h (module 'core'): std::string ns3::CommandLine::GetName() const [member function]
+    cls.add_method('GetName', 
+                   'std::string', 
+                   [], 
+                   is_const=True)
+    ## command-line.h (module 'core'): void ns3::CommandLine::Parse(int argc, char * * argv) [member function]
+    cls.add_method('Parse', 
+                   'void', 
+                   [param('int', 'argc'), param('char * *', 'argv')])
+    ## command-line.h (module 'core'): void ns3::CommandLine::PrintHelp(std::ostream & os) const [member function]
+    cls.add_method('PrintHelp', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True)
+    ## command-line.h (module 'core'): void ns3::CommandLine::Usage(std::string const usage) [member function]
+    cls.add_method('Usage', 
+                   'void', 
+                   [param('std::string const', 'usage')])
     return
 
 def register_Ns3CriticalSection_methods(root_module, cls):
@@ -598,6 +676,17 @@
     cls.add_constructor([param('ns3::SystemMutex &', 'mutex')])
     return
 
+def register_Ns3EventGarbageCollector_methods(root_module, cls):
+    ## event-garbage-collector.h (module 'core'): ns3::EventGarbageCollector::EventGarbageCollector(ns3::EventGarbageCollector const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::EventGarbageCollector const &', 'arg0')])
+    ## event-garbage-collector.h (module 'core'): ns3::EventGarbageCollector::EventGarbageCollector() [constructor]
+    cls.add_constructor([])
+    ## event-garbage-collector.h (module 'core'): void ns3::EventGarbageCollector::Track(ns3::EventId event) [member function]
+    cls.add_method('Track', 
+                   'void', 
+                   [param('ns3::EventId', 'event')])
+    return
+
 def register_Ns3EventId_methods(root_module, cls):
     cls.add_binary_comparison_operator('!=')
     cls.add_binary_comparison_operator('==')
@@ -708,6 +797,35 @@
                    [param('ns3::AttributeValue const &', 'value')])
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3IntToType__0_methods(root_module, cls):
     ## int-to-type.h (module 'core'): ns3::IntToType<0>::IntToType() [constructor]
     cls.add_constructor([])
@@ -975,6 +1093,18 @@
                    is_const=True)
     return
 
+def register_Ns3RandomVariableStreamHelper_methods(root_module, cls):
+    ## random-variable-stream-helper.h (module 'core'): ns3::RandomVariableStreamHelper::RandomVariableStreamHelper() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream-helper.h (module 'core'): ns3::RandomVariableStreamHelper::RandomVariableStreamHelper(ns3::RandomVariableStreamHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::RandomVariableStreamHelper const &', 'arg0')])
+    ## random-variable-stream-helper.h (module 'core'): static int64_t ns3::RandomVariableStreamHelper::AssignStreams(std::string path, int64_t stream) [member function]
+    cls.add_method('AssignStreams', 
+                   'int64_t', 
+                   [param('std::string', 'path'), param('int64_t', 'stream')], 
+                   is_static=True)
+    return
+
 def register_Ns3RngSeedManager_methods(root_module, cls):
     ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager() [constructor]
     cls.add_constructor([])
@@ -1336,6 +1466,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -1395,6 +1530,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -2083,6 +2228,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3RefCountBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3RefCountBase__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::RefCountBase, ns3::empty, ns3::DefaultDeleter<ns3::RefCountBase> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -2477,11 +2634,26 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
     cls.add_method('SetResolution', 
                    'void', 
                    [param('ns3::Time::Unit', 'resolution')], 
                    is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
     cls.add_method('To', 
                    'ns3::int64x64_t', 
@@ -4203,13 +4375,6 @@
                    [param('std::string const &', 'value')])
     return
 
-def register_Ns3TimeChecker_methods(root_module, cls):
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor]
-    cls.add_constructor([])
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')])
-    return
-
 def register_Ns3TimeValue_methods(root_module, cls):
     ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
     cls.add_constructor([])
@@ -4455,6 +4620,111 @@
                    [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')])
     return
 
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_functions(root_module):
     module = root_module
     ## nstime.h (module 'core'): ns3::Time ns3::Abs(ns3::Time const & time) [free function]
@@ -4495,6 +4765,22 @@
     module.add_function('FemtoSeconds', 
                         'ns3::Time', 
                         [param('uint64_t', 'fs')])
+    ## hash.h (module 'core'): uint32_t ns3::Hash32(std::string const s) [free function]
+    module.add_function('Hash32', 
+                        'uint32_t', 
+                        [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint32_t ns3::Hash32(char const * buffer, size_t const size) [free function]
+    module.add_function('Hash32', 
+                        'uint32_t', 
+                        [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hash64(std::string const s) [free function]
+    module.add_function('Hash64', 
+                        'uint64_t', 
+                        [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hash64(char const * buffer, size_t const size) [free function]
+    module.add_function('Hash64', 
+                        'uint64_t', 
+                        [param('char const *', 'buffer'), param('size_t const', 'size')])
     ## log.h (module 'core'): extern void ns3::LogComponentDisable(char const * name, ns3::LogLevel level) [free function]
     module.add_function('LogComponentDisable', 
                         'void', 
@@ -4559,10 +4845,18 @@
     module.add_function('MakeStringChecker', 
                         'ns3::Ptr< ns3::AttributeChecker const >', 
                         [])
-    ## nstime.h (module 'core'): extern ns3::Ptr<ns3::AttributeChecker const> ns3::MakeTimeChecker() [free function]
+    ## nstime.h (module 'core'): ns3::Ptr<ns3::AttributeChecker const> ns3::MakeTimeChecker() [free function]
     module.add_function('MakeTimeChecker', 
                         'ns3::Ptr< ns3::AttributeChecker const >', 
                         [])
+    ## nstime.h (module 'core'): ns3::Ptr<ns3::AttributeChecker const> ns3::MakeTimeChecker(ns3::Time const min) [free function]
+    module.add_function('MakeTimeChecker', 
+                        'ns3::Ptr< ns3::AttributeChecker const >', 
+                        [param('ns3::Time const', 'min')])
+    ## nstime.h (module 'core'): extern ns3::Ptr<ns3::AttributeChecker const> ns3::MakeTimeChecker(ns3::Time const min, ns3::Time const max) [free function]
+    module.add_function('MakeTimeChecker', 
+                        'ns3::Ptr< ns3::AttributeChecker const >', 
+                        [param('ns3::Time const', 'min'), param('ns3::Time const', 'max')])
     ## type-id.h (module 'core'): extern ns3::Ptr<ns3::AttributeChecker const> ns3::MakeTypeIdChecker() [free function]
     module.add_function('MakeTypeIdChecker', 
                         'ns3::Ptr< ns3::AttributeChecker const >', 
@@ -4697,12 +4991,27 @@
                         'std::string', 
                         [], 
                         template_parameters=['unsigned char'])
+    register_functions_ns3_CommandLineHelper(module.get_submodule('CommandLineHelper'), root_module)
     register_functions_ns3_Config(module.get_submodule('Config'), root_module)
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     register_functions_ns3_SystemPath(module.get_submodule('SystemPath'), root_module)
     register_functions_ns3_internal(module.get_submodule('internal'), root_module)
     return
 
+def register_functions_ns3_CommandLineHelper(module, root_module):
+    ## command-line.h (module 'core'): extern std::string ns3::CommandLineHelper::GetDefault(bool const & val) [free function]
+    module.add_function('GetDefault', 
+                        'std::string', 
+                        [param('bool &', 'val')], 
+                        template_parameters=['bool'])
+    ## command-line.h (module 'core'): extern bool ns3::CommandLineHelper::UserItemParse(std::string const value, bool & val) [free function]
+    module.add_function('UserItemParse', 
+                        'bool', 
+                        [param('std::string const', 'value'), param('bool &', 'val')], 
+                        template_parameters=['bool'])
+    return
+
 def register_functions_ns3_Config(module, root_module):
     ## config.h (module 'core'): extern void ns3::Config::Connect(std::string path, ns3::CallbackBase const & cb) [free function]
     module.add_function('Connect', 
@@ -4781,6 +5090,13 @@
                         [param('std::ostream *', 'stream')])
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def register_functions_ns3_SystemPath(module, root_module):
     ## system-path.h (module 'core'): extern std::string ns3::SystemPath::Append(std::string left, std::string right) [free function]
     module.add_function('Append', 
diff -Naur ns-3.17/src/core/bindings/modulegen__gcc_LP64.py ns-3.18/src/core/bindings/modulegen__gcc_LP64.py
--- ns-3.17/src/core/bindings/modulegen__gcc_LP64.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/bindings/modulegen__gcc_LP64.py	2013-10-26 07:07:30.051364394 -0700
@@ -32,10 +32,14 @@
     module.add_class('CommandLine', allow_subclassing=True)
     ## system-mutex.h (module 'core'): ns3::CriticalSection [class]
     module.add_class('CriticalSection')
+    ## event-garbage-collector.h (module 'core'): ns3::EventGarbageCollector [class]
+    module.add_class('EventGarbageCollector')
     ## event-id.h (module 'core'): ns3::EventId [class]
     module.add_class('EventId')
     ## global-value.h (module 'core'): ns3::GlobalValue [class]
     module.add_class('GlobalValue')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher')
     ## int-to-type.h (module 'core'): ns3::IntToType<0> [struct]
     module.add_class('IntToType', template_parameters=['0'])
     ## int-to-type.h (module 'core'): ns3::IntToType<0>::v_e [enumeration]
@@ -76,6 +80,8 @@
     module.add_class('ObjectFactory')
     ## random-variable.h (module 'core'): ns3::RandomVariable [class]
     module.add_class('RandomVariable')
+    ## random-variable-stream-helper.h (module 'core'): ns3::RandomVariableStreamHelper [class]
+    module.add_class('RandomVariableStreamHelper')
     ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager [class]
     module.add_class('RngSeedManager')
     ## rng-stream.h (module 'core'): ns3::RngStream [class]
@@ -174,6 +180,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::FdReader, ns3::empty, ns3::DefaultDeleter<ns3::FdReader> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, template_parameters=['ns3::FdReader', 'ns3::empty', 'ns3::DefaultDeleter<ns3::FdReader>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::RefCountBase, ns3::empty, ns3::DefaultDeleter<ns3::RefCountBase> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, template_parameters=['ns3::RefCountBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::RefCountBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::SystemThread, ns3::empty, ns3::DefaultDeleter<ns3::SystemThread> > [class]
@@ -292,8 +300,6 @@
     module.add_class('StringChecker', parent=root_module['ns3::AttributeChecker'])
     ## string.h (module 'core'): ns3::StringValue [class]
     module.add_class('StringValue', parent=root_module['ns3::AttributeValue'])
-    ## nstime.h (module 'core'): ns3::TimeChecker [class]
-    module.add_class('TimeChecker', parent=root_module['ns3::AttributeChecker'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
     module.add_class('TimeValue', parent=root_module['ns3::AttributeValue'])
     ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
@@ -310,6 +316,10 @@
     module.add_class('Vector3DChecker', parent=root_module['ns3::AttributeChecker'])
     ## vector.h (module 'core'): ns3::Vector3DValue [class]
     module.add_class('Vector3DValue', parent=root_module['ns3::AttributeValue'])
+    typehandlers.add_type_alias('ns3::Vector3D', 'ns3::Vector')
+    typehandlers.add_type_alias('ns3::Vector3D*', 'ns3::Vector*')
+    typehandlers.add_type_alias('ns3::Vector3D&', 'ns3::Vector&')
+    module.add_typedef(root_module['ns3::Vector3D'], 'Vector')
     typehandlers.add_type_alias('ns3::ObjectPtrContainerValue', 'ns3::ObjectVectorValue')
     typehandlers.add_type_alias('ns3::ObjectPtrContainerValue*', 'ns3::ObjectVectorValue*')
     typehandlers.add_type_alias('ns3::ObjectPtrContainerValue&', 'ns3::ObjectVectorValue&')
@@ -324,10 +334,6 @@
     typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *', 'ns3::LogNodePrinter')
     typehandlers.add_type_alias('void ( * ) ( std::ostream & ) **', 'ns3::LogNodePrinter*')
     typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *&', 'ns3::LogNodePrinter&')
-    typehandlers.add_type_alias('ns3::Vector3D', 'ns3::Vector')
-    typehandlers.add_type_alias('ns3::Vector3D*', 'ns3::Vector*')
-    typehandlers.add_type_alias('ns3::Vector3D&', 'ns3::Vector&')
-    module.add_typedef(root_module['ns3::Vector3D'], 'Vector')
     typehandlers.add_type_alias('ns3::Vector3DValue', 'ns3::VectorValue')
     typehandlers.add_type_alias('ns3::Vector3DValue*', 'ns3::VectorValue*')
     typehandlers.add_type_alias('ns3::Vector3DValue&', 'ns3::VectorValue&')
@@ -341,6 +347,12 @@
     typehandlers.add_type_alias('ns3::Vector3DChecker&', 'ns3::VectorChecker&')
     module.add_typedef(root_module['ns3::Vector3DChecker'], 'VectorChecker')
     
+    ## Register a nested module for the namespace CommandLineHelper
+    
+    nested_module = module.add_cpp_namespace('CommandLineHelper')
+    register_types_ns3_CommandLineHelper(nested_module)
+    
+    
     ## Register a nested module for the namespace Config
     
     nested_module = module.add_cpp_namespace('Config')
@@ -353,6 +365,12 @@
     register_types_ns3_FatalImpl(nested_module)
     
     
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
+    
     ## Register a nested module for the namespace SystemPath
     
     nested_module = module.add_cpp_namespace('SystemPath')
@@ -365,6 +383,10 @@
     register_types_ns3_internal(nested_module)
     
 
+def register_types_ns3_CommandLineHelper(module):
+    root_module = module.get_root()
+    
+
 def register_types_ns3_Config(module):
     root_module = module.get_root()
     
@@ -377,6 +399,36 @@
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', parent=root_module['ns3::Hash::Implementation'])
+
 def register_types_ns3_SystemPath(module):
     root_module = module.get_root()
     
@@ -392,8 +444,10 @@
     register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase'])
     register_Ns3CommandLine_methods(root_module, root_module['ns3::CommandLine'])
     register_Ns3CriticalSection_methods(root_module, root_module['ns3::CriticalSection'])
+    register_Ns3EventGarbageCollector_methods(root_module, root_module['ns3::EventGarbageCollector'])
     register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
     register_Ns3GlobalValue_methods(root_module, root_module['ns3::GlobalValue'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3IntToType__0_methods(root_module, root_module['ns3::IntToType< 0 >'])
     register_Ns3IntToType__1_methods(root_module, root_module['ns3::IntToType< 1 >'])
     register_Ns3IntToType__2_methods(root_module, root_module['ns3::IntToType< 2 >'])
@@ -407,6 +461,7 @@
     register_Ns3ObjectDeleter_methods(root_module, root_module['ns3::ObjectDeleter'])
     register_Ns3ObjectFactory_methods(root_module, root_module['ns3::ObjectFactory'])
     register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable'])
+    register_Ns3RandomVariableStreamHelper_methods(root_module, root_module['ns3::RandomVariableStreamHelper'])
     register_Ns3RngSeedManager_methods(root_module, root_module['ns3::RngSeedManager'])
     register_Ns3RngStream_methods(root_module, root_module['ns3::RngStream'])
     register_Ns3SequentialVariable_methods(root_module, root_module['ns3::SequentialVariable'])
@@ -453,6 +508,7 @@
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
     register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
     register_Ns3SimpleRefCount__Ns3FdReader_Ns3Empty_Ns3DefaultDeleter__lt__ns3FdReader__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::FdReader, ns3::empty, ns3::DefaultDeleter<ns3::FdReader> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3RefCountBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3RefCountBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::RefCountBase, ns3::empty, ns3::DefaultDeleter<ns3::RefCountBase> >'])
     register_Ns3SimpleRefCount__Ns3SystemThread_Ns3Empty_Ns3DefaultDeleter__lt__ns3SystemThread__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::SystemThread, ns3::empty, ns3::DefaultDeleter<ns3::SystemThread> >'])
     register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >'])
@@ -509,7 +565,6 @@
     register_Ns3RefCountBase_methods(root_module, root_module['ns3::RefCountBase'])
     register_Ns3StringChecker_methods(root_module, root_module['ns3::StringChecker'])
     register_Ns3StringValue_methods(root_module, root_module['ns3::StringValue'])
-    register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
     register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
@@ -519,6 +574,11 @@
     register_Ns3Vector3DChecker_methods(root_module, root_module['ns3::Vector3DChecker'])
     register_Ns3Vector3DValue_methods(root_module, root_module['ns3::Vector3DValue'])
     register_Ns3ConfigMatchContainer_methods(root_module, root_module['ns3::Config::MatchContainer'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     return
 
 def register_Ns3AttributeConstructionList_methods(root_module, cls):
@@ -589,6 +649,24 @@
     cls.add_method('AddValue', 
                    'void', 
                    [param('std::string const &', 'name'), param('std::string const &', 'help'), param('ns3::Callback< bool, std::string, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')])
+    ## command-line.h (module 'core'): std::string ns3::CommandLine::GetName() const [member function]
+    cls.add_method('GetName', 
+                   'std::string', 
+                   [], 
+                   is_const=True)
+    ## command-line.h (module 'core'): void ns3::CommandLine::Parse(int argc, char * * argv) [member function]
+    cls.add_method('Parse', 
+                   'void', 
+                   [param('int', 'argc'), param('char * *', 'argv')])
+    ## command-line.h (module 'core'): void ns3::CommandLine::PrintHelp(std::ostream & os) const [member function]
+    cls.add_method('PrintHelp', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True)
+    ## command-line.h (module 'core'): void ns3::CommandLine::Usage(std::string const usage) [member function]
+    cls.add_method('Usage', 
+                   'void', 
+                   [param('std::string const', 'usage')])
     return
 
 def register_Ns3CriticalSection_methods(root_module, cls):
@@ -598,6 +676,17 @@
     cls.add_constructor([param('ns3::SystemMutex &', 'mutex')])
     return
 
+def register_Ns3EventGarbageCollector_methods(root_module, cls):
+    ## event-garbage-collector.h (module 'core'): ns3::EventGarbageCollector::EventGarbageCollector(ns3::EventGarbageCollector const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::EventGarbageCollector const &', 'arg0')])
+    ## event-garbage-collector.h (module 'core'): ns3::EventGarbageCollector::EventGarbageCollector() [constructor]
+    cls.add_constructor([])
+    ## event-garbage-collector.h (module 'core'): void ns3::EventGarbageCollector::Track(ns3::EventId event) [member function]
+    cls.add_method('Track', 
+                   'void', 
+                   [param('ns3::EventId', 'event')])
+    return
+
 def register_Ns3EventId_methods(root_module, cls):
     cls.add_binary_comparison_operator('!=')
     cls.add_binary_comparison_operator('==')
@@ -708,6 +797,35 @@
                    [param('ns3::AttributeValue const &', 'value')])
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3IntToType__0_methods(root_module, cls):
     ## int-to-type.h (module 'core'): ns3::IntToType<0>::IntToType() [constructor]
     cls.add_constructor([])
@@ -975,6 +1093,18 @@
                    is_const=True)
     return
 
+def register_Ns3RandomVariableStreamHelper_methods(root_module, cls):
+    ## random-variable-stream-helper.h (module 'core'): ns3::RandomVariableStreamHelper::RandomVariableStreamHelper() [constructor]
+    cls.add_constructor([])
+    ## random-variable-stream-helper.h (module 'core'): ns3::RandomVariableStreamHelper::RandomVariableStreamHelper(ns3::RandomVariableStreamHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::RandomVariableStreamHelper const &', 'arg0')])
+    ## random-variable-stream-helper.h (module 'core'): static int64_t ns3::RandomVariableStreamHelper::AssignStreams(std::string path, int64_t stream) [member function]
+    cls.add_method('AssignStreams', 
+                   'int64_t', 
+                   [param('std::string', 'path'), param('int64_t', 'stream')], 
+                   is_static=True)
+    return
+
 def register_Ns3RngSeedManager_methods(root_module, cls):
     ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager() [constructor]
     cls.add_constructor([])
@@ -1336,6 +1466,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -1395,6 +1530,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -2083,6 +2228,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3RefCountBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3RefCountBase__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::RefCountBase, ns3::empty, ns3::DefaultDeleter<ns3::RefCountBase> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -2477,11 +2634,26 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
     cls.add_method('SetResolution', 
                    'void', 
                    [param('ns3::Time::Unit', 'resolution')], 
                    is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
     cls.add_method('To', 
                    'ns3::int64x64_t', 
@@ -4203,13 +4375,6 @@
                    [param('std::string const &', 'value')])
     return
 
-def register_Ns3TimeChecker_methods(root_module, cls):
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor]
-    cls.add_constructor([])
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')])
-    return
-
 def register_Ns3TimeValue_methods(root_module, cls):
     ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
     cls.add_constructor([])
@@ -4455,6 +4620,111 @@
                    [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')])
     return
 
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_functions(root_module):
     module = root_module
     ## nstime.h (module 'core'): ns3::Time ns3::Abs(ns3::Time const & time) [free function]
@@ -4495,6 +4765,22 @@
     module.add_function('FemtoSeconds', 
                         'ns3::Time', 
                         [param('uint64_t', 'fs')])
+    ## hash.h (module 'core'): uint32_t ns3::Hash32(std::string const s) [free function]
+    module.add_function('Hash32', 
+                        'uint32_t', 
+                        [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint32_t ns3::Hash32(char const * buffer, size_t const size) [free function]
+    module.add_function('Hash32', 
+                        'uint32_t', 
+                        [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hash64(std::string const s) [free function]
+    module.add_function('Hash64', 
+                        'uint64_t', 
+                        [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hash64(char const * buffer, size_t const size) [free function]
+    module.add_function('Hash64', 
+                        'uint64_t', 
+                        [param('char const *', 'buffer'), param('size_t const', 'size')])
     ## log.h (module 'core'): extern void ns3::LogComponentDisable(char const * name, ns3::LogLevel level) [free function]
     module.add_function('LogComponentDisable', 
                         'void', 
@@ -4559,10 +4845,18 @@
     module.add_function('MakeStringChecker', 
                         'ns3::Ptr< ns3::AttributeChecker const >', 
                         [])
-    ## nstime.h (module 'core'): extern ns3::Ptr<ns3::AttributeChecker const> ns3::MakeTimeChecker() [free function]
+    ## nstime.h (module 'core'): ns3::Ptr<ns3::AttributeChecker const> ns3::MakeTimeChecker() [free function]
     module.add_function('MakeTimeChecker', 
                         'ns3::Ptr< ns3::AttributeChecker const >', 
                         [])
+    ## nstime.h (module 'core'): ns3::Ptr<ns3::AttributeChecker const> ns3::MakeTimeChecker(ns3::Time const min) [free function]
+    module.add_function('MakeTimeChecker', 
+                        'ns3::Ptr< ns3::AttributeChecker const >', 
+                        [param('ns3::Time const', 'min')])
+    ## nstime.h (module 'core'): extern ns3::Ptr<ns3::AttributeChecker const> ns3::MakeTimeChecker(ns3::Time const min, ns3::Time const max) [free function]
+    module.add_function('MakeTimeChecker', 
+                        'ns3::Ptr< ns3::AttributeChecker const >', 
+                        [param('ns3::Time const', 'min'), param('ns3::Time const', 'max')])
     ## type-id.h (module 'core'): extern ns3::Ptr<ns3::AttributeChecker const> ns3::MakeTypeIdChecker() [free function]
     module.add_function('MakeTypeIdChecker', 
                         'ns3::Ptr< ns3::AttributeChecker const >', 
@@ -4697,12 +4991,27 @@
                         'std::string', 
                         [], 
                         template_parameters=['unsigned char'])
+    register_functions_ns3_CommandLineHelper(module.get_submodule('CommandLineHelper'), root_module)
     register_functions_ns3_Config(module.get_submodule('Config'), root_module)
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     register_functions_ns3_SystemPath(module.get_submodule('SystemPath'), root_module)
     register_functions_ns3_internal(module.get_submodule('internal'), root_module)
     return
 
+def register_functions_ns3_CommandLineHelper(module, root_module):
+    ## command-line.h (module 'core'): extern std::string ns3::CommandLineHelper::GetDefault(bool const & val) [free function]
+    module.add_function('GetDefault', 
+                        'std::string', 
+                        [param('bool &', 'val')], 
+                        template_parameters=['bool'])
+    ## command-line.h (module 'core'): extern bool ns3::CommandLineHelper::UserItemParse(std::string const value, bool & val) [free function]
+    module.add_function('UserItemParse', 
+                        'bool', 
+                        [param('std::string const', 'value'), param('bool &', 'val')], 
+                        template_parameters=['bool'])
+    return
+
 def register_functions_ns3_Config(module, root_module):
     ## config.h (module 'core'): extern void ns3::Config::Connect(std::string path, ns3::CallbackBase const & cb) [free function]
     module.add_function('Connect', 
@@ -4781,6 +5090,13 @@
                         [param('std::ostream *', 'stream')])
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def register_functions_ns3_SystemPath(module, root_module):
     ## system-path.h (module 'core'): extern std::string ns3::SystemPath::Append(std::string left, std::string right) [free function]
     module.add_function('Append', 
diff -Naur ns-3.17/src/core/examples/command-line-example.cc ns-3.18/src/core/examples/command-line-example.cc
--- ns-3.17/src/core/examples/command-line-example.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/core/examples/command-line-example.cc	2013-10-26 07:07:30.023364392 -0700
@@ -0,0 +1,67 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Lawrence Livermore National Laboratory
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Peter D. Barnes, Jr. <pdbarnes@llnl.gov>
+ */
+
+#include <iostream>
+#include <iomanip>
+#include <string>
+
+#include "ns3/core-module.h"
+
+
+using namespace ns3;
+
+
+std::string g_cbArg="cbArg default";
+
+bool SetCbArg (std::string val)
+{
+  g_cbArg = val;
+  return true;
+}
+
+
+int main (int argc, char *argv[])
+{
+
+  int         intArg  = 1;
+  bool        boolArg = false;
+  std::string strArg  = "strArg default";
+  
+  CommandLine cmd;
+  cmd.Usage ("CommandLine example program.\n"
+             "\n"
+             "This little program demonstrates how to use CommandLine.");
+  cmd.AddValue ("intArg",  "an int argument",       intArg);
+  cmd.AddValue ("boolArg", "a bool argument",       boolArg);
+  cmd.AddValue ("strArg",  "a string argument",     strArg);
+  cmd.AddValue ("cbArg",   "a string via callback", MakeCallback (SetCbArg));
+  cmd.Parse (argc, argv);
+
+  std::cout << std::left
+            << std::setw (10) << "intArg:"         << intArg           << std::endl;
+  std::cout << std::setw (10) << "boolArg:"
+            << std::boolalpha                      << boolArg
+            << std::noboolalpha                                        << std::endl;
+  
+  std::cout << std::setw (10) << "strArg:" << "\"" << strArg  << "\""  << std::endl;
+  std::cout << std::setw (10) << "cbArg:"  << "\"" << g_cbArg << "\""  << std::endl;
+
+  return 0;
+}
diff -Naur ns-3.17/src/core/examples/hash-example.cc ns-3.18/src/core/examples/hash-example.cc
--- ns-3.17/src/core/examples/hash-example.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/core/examples/hash-example.cc	2013-10-26 07:07:30.023364392 -0700
@@ -0,0 +1,564 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <algorithm>  // find
+#include <climits>    // CHAR_BIT
+#include <fstream>
+#include <iostream>
+#include <iomanip>
+#include <map>
+#include <vector>
+
+#include "ns3/core-module.h"
+#include "ns3/hash.h"
+
+NS_LOG_COMPONENT_DEFINE ("Hasher");
+
+namespace ns3
+{
+namespace Hash
+{
+
+/**
+ * \ingroup hash
+ *  Namespace for hasher-example
+*/
+namespace Example
+{
+  
+/**
+ * Keep track of collisions
+ */
+class Collider {
+
+public:
+  std::string m_name;                   /**< Name of this hash */
+  Hasher      m_hash;                   /**< The hash */
+
+  enum Bits {
+    Bits32,                             /**< Use 32-bit hash function */
+    Bits64                              /**< Use 64-bit hash function */
+  };
+
+  /**
+   * Constructor
+   *
+   * \param [in] name Hash function name
+   * \param [in] hash Hash function
+   * \param [in] bits Which hash length to use
+   */
+  Collider (const std::string name, Hasher hash, const enum Bits bits)
+    : m_name (name),
+      m_hash (hash),
+      m_bits (bits)
+  {  }
+
+  /**
+   * Add a string to the Collider
+   *
+   * \param [in] phrase the string to add
+   * \return true if this was a new string
+   */
+  bool Add (const std::string phrase)
+  {
+    uint64_t h = GetHash (phrase);
+    
+    // Check for collisions
+    if (m_dict.count (h) > 0)
+      {
+        // we've seen this hash before, why?
+        if (phrase == m_dict[h])
+          {
+            // duplicate phrase
+            return false;
+          }
+
+        // new phrase generating a real collision
+        // alphabetize
+        if ( m_dict[h] < phrase)
+          {       
+            m_coll.push_back (std::make_pair (h, phrase));
+          }
+        else
+          {
+            m_coll.push_back (std::make_pair (h, m_dict[h]));
+            m_dict[h] = phrase;
+          }            
+      }
+    else
+      {
+        // Insert new hash
+        m_dict.insert (std::make_pair (h, phrase));
+      }
+    return true;
+  }  // Add ()
+
+  /**
+   * \return The hash name, including the length
+   */
+  std::string GetName () const
+  {
+    std::string name = m_name;
+
+    switch (m_bits)
+      {
+      case Bits32:   name += " (32-bit version)";  break;
+      case Bits64:   name += " (64-bit version)";  break;
+      default:       name += " (unknown!?!)";
+      }
+    return name;
+  }
+
+  /** Print the collisions found */
+  void Report () const
+  {
+    std::cout << std::endl;
+    
+    std::cout << GetName () << ": " << m_coll.size () << " collisions:"
+              << std::endl;
+    for (collision_t::const_iterator it = m_coll.begin ();
+         it != m_coll.end ();
+         ++it)
+      {
+        uint64_t h = it->first;
+        
+        std::cout << std::setfill ('0') << std::hex << std::setw(8) << h
+                  << std::dec << std::setfill(' ')  << "  "
+                  << std::setw(20) << std::left
+                  << m_dict.find (h)->second
+                  << it->second
+                  << std::right
+                  << std::endl;
+      }
+  }  // Report ()
+
+  
+private:
+
+  /**
+   * Get the appropriate hash value
+   *
+   * \param [in] phrase the string to hash
+   * \return the hash value, using the number of bits set in the constructor
+   */
+  uint64_t GetHash (const std::string phrase)
+    {
+      m_hash.clear ();
+      uint64_t h = 0;
+
+      if (m_bits == Bits32)
+        {
+          h = m_hash.GetHash32 (phrase);
+        }
+      else
+        {
+          h = m_hash.GetHash64 (phrase);
+        }
+      return h;
+    }
+
+  /** Hash function */
+  enum Bits m_bits;
+  
+  /** Hashed dictionary of first instance of each hash */
+  typedef std::map <uint64_t, std::string> hashdict_t;
+
+  /** The dictionary map, indexed by hash */
+  hashdict_t  m_dict;
+
+  /** Collision map of subsequent instances */
+  typedef std::vector < std::pair<uint64_t, std::string> > collision_t;
+
+  /** The list of collisions */
+  collision_t m_coll;            
+
+};  // class Collider
+
+  
+/**
+ * Word list and hashers to test
+ */
+class Dictionary {
+public:
+  /** Constructor */
+  Dictionary ()
+    : m_nphrases (0)
+  {
+    m_words.reserve (320000);
+  }
+
+  /** Add a Collider containing a hash function */
+  void Add (Collider c)
+  {
+    m_hashes.push_back (c);
+  }
+
+  /**
+   * Add a string to the dictionary
+   *
+   * \param [in] phrase the string to add
+   */
+  void Add (const std::string phrase)
+  {
+    if (phrase.size () == 0)
+      {
+        return ;
+      }
+
+    int newPhrases = 0;
+    for (std::vector <Collider>::iterator it = m_hashes.begin ();
+           it != m_hashes.end ();
+           ++it)
+        {
+          newPhrases += it->Add (phrase);
+        }
+
+      if (newPhrases)
+        {
+          ++m_nphrases;
+          m_words.push_back (phrase);
+        }
+  }  // Add ()
+
+  /**
+   * Report the expected number of collisions
+   *
+   * See, e.g.,
+   * http://www.math.dartmouth.edu/archive/m19w03/public_html/Section6-5.pdf
+   *
+   *  \f[
+   *     E(collisions)  =  n - k + k (1 - 1/k)^n
+   *  \f]
+   *               
+   *  where <i>n</i> is the number of entries in the table, and
+   *  <i>k</i> is the number of buckets.
+   * 
+   *  This form is numerically unstable for low collision rates.
+   *  Expanding for large \f$ k \f$ we get
+   *
+   * \f{eqnarray*}{
+   *   E(c) &=& \frac{1}{k} {n \choose 2}
+   *            - \frac{1}{{{k^2}}} {n \choose 3}
+   *            + \frac{1}{{{k^3}}} {n \choose 4}
+   *            -  \ldots \\
+   *        &=& \frac{1}{k} {n \choose 2}
+   *            \left[ {1 - \frac{{n - 2}}{{3k}}
+   *                      + \frac{{\left( {n - 2} \right)
+   *                               \left( {n - 3} \right)}}{{12{k^2}}}
+   *                      -  \ldots } \right] \\
+   *        &=& \frac{1}{k} {n \choose 2}
+   *            \left\{ {1 - \frac{{n - 2}}{{3k}}
+   *                         \left[ {1 + \frac{{n - 3}}{{4k}}
+   *                                   -  \ldots }
+   *                         \right]}
+   *            \right\}
+   * \f}
+   * 
+   *   For simplicity, we'll use the first two terms
+   *   of the second form.
+   */
+  void ReportExpectedCollisions () const
+  {
+    // Expected number of collisions
+    //
+    // Number of buckets = k = 2^bits
+    long double k32 = 0xFFFFFFFF;
+    long double k64 = 0xFFFFFFFFFFFFFFFF;
+
+    long double n = m_nphrases;
+    long double Ec32 = n * (n - 1) / ( 2 * k32) * (1 - (n - 2)/(3 * k32));
+    long double Ec64 = n * (n - 1) / ( 2 * k64) * (1 - (n - 2)/(3 * k64));
+      
+    // Output collisions
+    std::cout << "" << std::endl;
+    std::cout << "Number of words or phrases: " << n << std::endl;
+    std::cout << "Expected number of collisions: (32-bit table) " << Ec32
+              << std::endl;
+    std::cout << "Expected number of collisions: (64-bit table) " << Ec64
+              << std::endl;
+  }  // ReportExpectedCollisions
+  
+    
+  /** Print the collisions for each Collider */
+  void Report () const
+  {
+    ReportExpectedCollisions ();
+    
+    for (std::vector <Collider>::const_iterator it = m_hashes.begin ();
+         it != m_hashes.end ();
+         ++it)
+      {
+        it->Report ();
+      }
+  }  // Report ()
+
+  /**
+   * Time and report the execution of one hash across the entire Dictionary
+   *
+   * \param [in] hindex index of the hash Collider to use
+   */
+  void TimeOne (const int hindex)
+  {
+    // Hashing speed
+    uint32_t reps = 100;
+    Hasher h = m_hashes[hindex].m_hash;
+    int start = clock ();
+    for (std::vector<std::string>::const_iterator w = m_words.begin ();
+         w != m_words.end();
+         ++w)
+      {
+        for (uint32_t i = 0; i < reps; ++i)
+          {
+            h.clear ().GetHash32 (*w);
+          }
+      }
+    int stop = clock ();
+    double delta = stop - start;
+    double per = 1e9 * delta / (m_nphrases * reps * CLOCKS_PER_SEC);
+    
+    std::cout << std::left
+              << std::setw (32) << m_hashes[hindex].GetName ()
+              << std::right
+              << std::setw (10) << m_nphrases
+              << std::setw (10) << reps
+              << std::setw (10) << stop - start
+              << std::setw (12) << per
+              << std::endl;
+    
+  }  // TimeOne ()
+
+  /** Report the execution time of each hash across the entire Dictionary */
+  void Time ()
+  {
+    std::cout << "" << std::endl;
+    std::cout << std::left
+              << std::setw (32) << "Hash timing"
+              << std::right
+              << std::setw (10) << "Phrases"
+              << std::setw (10) << "Reps"
+              << std::setw (10) << "Ticks"
+              << std::setw (12) << "ns/hash"
+              << std::endl;
+    
+    for (unsigned int i = 0; i < m_hashes.size (); ++i)
+      {
+        TimeOne (i);
+      }
+  }  // Time ()
+
+private:
+  unsigned long m_nphrases;             /**< Number of strings hashed */
+  std::vector <Collider> m_hashes;      /**< List of hash Colliders */
+  std::vector <std::string> m_words;    /**< List of unique words */
+
+};  // class Dictionary
+
+
+/**
+ * Source word list files
+ */
+class DictFiles
+{
+
+public:
+  
+  /**
+   * CommandLine callback function to add a file argument to the list
+   *
+   * \param [in] file the word file to add
+   * \return true if the file is new to the list
+   */
+  bool Add (const std::string file)
+  {
+    if (std::find (m_files.begin (), m_files.end (), file) == m_files.end ())
+      {
+        m_files.push_back (file);
+      }
+    
+    return true;
+  }
+
+  /**
+   * Add phrases from the files into the dict
+   *
+   * \param [in,out] dict the Dictionary to add words to
+   */
+  void ReadInto (Dictionary & dict)
+  {
+    if (m_files.size () == 0)
+      {
+        Add ("/usr/share/dict/web2");
+      }
+
+    std::cout << "Hashing the dictionar"
+              << (m_files.size () == 1 ? "y" : "ies")
+              << std::endl;
+
+    for (std::vector <std::string>::const_iterator it = m_files.begin ();
+         it != m_files.end ();
+         ++it)
+      {
+        std::string dictFile = *it;
+        std::cout << "Dictionary file: " << dictFile << std::endl;
+  
+        // Find collisions
+  
+        // Open the file
+        std::ifstream dictStream;
+        dictStream.open (dictFile.c_str () );
+        if (! dictStream.is_open () )
+          {
+            std::cerr << "Failed to open dictionary file."
+                      << "'" << dictFile << "'"
+                      << std::endl;
+            continue;
+          }
+    
+        while (dictStream.good () )
+          {
+            std::string phrase;
+            getline (dictStream, phrase);
+            dict.Add (phrase);
+          }  // while
+        
+        dictStream.close ();
+
+      }  // for m_files
+
+  }  // ReadInto
+
+private:
+  std::vector <std::string> m_files;    /**< List of word files to use */
+
+};  // class DictFiles
+
+}  // namespace Example
+
+}  // namespace Hash
+
+}  // namespace ns3
+
+
+using namespace ns3;
+using namespace ns3::Hash::Example;
+
+int 
+main (int argc, char *argv[])
+{
+  std::cout << std::endl;
+  std::cout << "Hasher" << std::endl;
+
+  bool timing = false;
+  DictFiles files;
+
+  CommandLine cmd;
+  cmd.Usage ("Find hash collisions in the dictionary.");
+  cmd.AddValue ("dict", "Dictionary file to hash",
+                MakeCallback(&DictFiles::Add,
+                             &files));
+  cmd.AddValue ("time", "Run timing test", timing);
+  cmd.Parse (argc, argv);
+
+  Dictionary dict;
+  dict.Add ( Collider ("FNV1a",
+                       Hasher ( Create<Hash::Function::Fnv1a> () ),
+                       Collider::Bits32));
+  dict.Add ( Collider ("FNV1a",
+                       Hasher ( Create<Hash::Function::Fnv1a> () ),
+                       Collider::Bits64));
+
+  dict.Add ( Collider ("Murmur3",
+                       Hasher ( Create<Hash::Function::Murmur3> () ),
+                       Collider::Bits32));
+  dict.Add ( Collider ("Murmur3",
+                       Hasher ( Create<Hash::Function::Murmur3> () ),
+                       Collider::Bits64));
+  
+  files.ReadInto (dict);
+  
+  dict.Report ();
+  
+  if (timing)
+    {
+      dict.Time ();
+    }  // if (timing)
+
+
+}  // main
+
+
+/*  Example Output:
+
+./waf --run="hasher-example --time \
+  --dict=/usr/share/dict/web2 \
+  --dict=/usr/share/dict/web2a \
+  --dict=/usr/share/dict/propernames \
+  --dict=/usr/share/dict/connectives"
+
+Waf: Entering directory `build'
+Waf: Leaving directory `build'
+'build' finished successfully (3.028s)
+
+Hasher
+Hashing the dictionaries
+Dictionary file: /usr/share/dict/web2
+Dictionary file: /usr/share/dict/web2a
+Dictionary file: /usr/share/dict/propernames
+Dictionary file: /usr/share/dict/connectives
+
+Number of words or phrases: 312094
+Expected number of collisions: (32-bit table) 11.3389
+Expected number of collisions: (64-bit table) 2.6401e-09
+
+FNV1a (32-bit version): 13 collisions:
+a75b0ae7  elephantlike        interventralia
+091c4808  diversionary        propenseness
+172be6ba  bairnishness        sora
+e6cb5099  purifier            spongoblastic
+4a841078  ameliorable         unsmotherable
+6ed21de2  brand-newness       peripherial
+22acb19b  Petrarchism         dewy-pinioned
+5723634a  grain gold          hyphenation
+f58026c1  seven-channeled     turritella
+946fc6ec  multiradiate        sister block
+88625851  brachtmema          ule tree
+dc28b5ea  Un-lutheran         gutturotetany
+9255bf44  re-sorter           working stress
+
+FNV1a (64-bit version): 0 collisions:
+
+Murmur3 (32-bit version): 11 collisions:
+5ea83eee  impalace            metahewettite
+e06fbdde  constancy           oligosynthetic
+2a713795  hypermonosyllable   presatisfaction
+c8bf0ef9  Hadromerina         starky
+d9c04b3d  Accipiter           syllable
+c0da8f81  seriation           trigonon
+17612b26  daemon              unerring
+c2349ad7  air spring          iron
+1d91386f  nine-pounder        semicrescentic
+fe17b1a5  cone speaker        oblong-wedgeshaped
+faa12798  saw bearing         wilting point
+
+Murmur3 (64-bit version): 0 collisions:
+
+Hash timing                        Phrases      Reps     Ticks     ns/hash
+FNV1a (32-bit version)              312094       100   3140531     100.628
+FNV1a (64-bit version)              312094       100   3145240     100.779
+Murmur3 (32-bit version)            312094       100   4152139     133.041
+Murmur3 (64-bit version)            312094       100   4191464     134.301
+
+*/
diff -Naur ns-3.17/src/core/examples/main-random-variable-stream.cc ns-3.18/src/core/examples/main-random-variable-stream.cc
--- ns-3.17/src/core/examples/main-random-variable-stream.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/examples/main-random-variable-stream.cc	2013-10-26 07:07:30.023364392 -0700
@@ -229,7 +229,7 @@
     gnuplots.AddPlot (plot);
   }
 
-  // XXX Turn this plot back on once its distribution has been finished.
+  /// \todo Turn this plot back on once its distribution has been finished.
   /*
   {
     Gnuplot plot;
@@ -249,10 +249,9 @@
 
     gnuplots.AddPlot (plot);
   }
-  // XXX Turn the above plot back on once its distribution has been finished.
   */
 
-  // XXX Turn this plot back on once its distribution has been finished.
+  /// \todo Turn this plot back on once its distribution has been finished.
   /*
   {
     Gnuplot plot;
@@ -267,7 +266,6 @@
 
     gnuplots.AddPlot (plot);
   }
-  // XXX Turn the above plot back on once its distribution has been finished.
   */
 
   {
diff -Naur ns-3.17/src/core/examples/wscript ns-3.18/src/core/examples/wscript
--- ns-3.17/src/core/examples/wscript	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/examples/wscript	2013-10-26 07:07:30.019364393 -0700
@@ -15,10 +15,10 @@
     obj = bld.create_ns3_program('main-ptr', ['core'] )
     obj.source = 'main-ptr.cc'
 
-    obj = bld.create_ns3_program('main-random-variable', ['core', 'config-store', 'tools'])
+    obj = bld.create_ns3_program('main-random-variable', ['core', 'config-store','stats'])
     obj.source = 'main-random-variable.cc'
 
-    obj = bld.create_ns3_program('main-random-variable-stream', ['core', 'config-store', 'tools'])
+    obj = bld.create_ns3_program('main-random-variable-stream', ['core', 'config-store','stats'])
     obj.source = 'main-random-variable-stream.cc'
 
     obj = bld.create_ns3_program('sample-random-variable',
@@ -29,6 +29,14 @@
                                  ['core'])
     obj.source = 'sample-random-variable-stream.cc'
 
+    obj = bld.create_ns3_program('command-line-example',
+                                 ['core'])
+    obj.source = 'command-line-example.cc'
+
+    obj = bld.create_ns3_program('hash-example',
+                                 ['core'])
+    obj.source = 'hash-example.cc'
+
     if bld.env['ENABLE_THREADING'] and bld.env["ENABLE_REAL_TIME"]:
         obj = bld.create_ns3_program('main-test-sync', ['network'])
         obj.source = 'main-test-sync.cc'
diff -Naur ns-3.17/src/core/helper/event-garbage-collector.cc ns-3.18/src/core/helper/event-garbage-collector.cc
--- ns-3.17/src/core/helper/event-garbage-collector.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/core/helper/event-garbage-collector.cc	2013-10-26 07:07:30.023364392 -0700
@@ -0,0 +1,90 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2007 INESC Porto
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Gustavo J. A. M. Carneiro  <gjc@inescporto.pt>
+ */
+#include "event-garbage-collector.h"
+
+#define CLEANUP_CHUNK_MIN_SIZE 8
+#define CLEANUP_CHUNK_MAX_SIZE 128
+
+
+namespace ns3 {
+
+
+EventGarbageCollector::EventGarbageCollector () :
+  m_nextCleanupSize (CLEANUP_CHUNK_MIN_SIZE)
+{
+}
+
+void
+EventGarbageCollector::Track (EventId event)
+{
+  m_events.insert (event);
+  if (m_events.size () >= m_nextCleanupSize)
+    Cleanup ();
+}
+
+void
+EventGarbageCollector::Grow ()
+{
+  m_nextCleanupSize += (m_nextCleanupSize < CLEANUP_CHUNK_MAX_SIZE ?
+                        m_nextCleanupSize : CLEANUP_CHUNK_MAX_SIZE);
+}
+
+void
+EventGarbageCollector::Shrink ()
+{
+  while (m_nextCleanupSize > m_events.size ())
+    m_nextCleanupSize >>= 1;
+  Grow ();
+}
+
+// Called when a new event was added and the cleanup limit was exceeded in consequence.
+void
+EventGarbageCollector::Cleanup ()
+{
+  for (EventList::iterator iter = m_events.begin (); iter != m_events.end ();)
+    {
+      if ((*iter).IsExpired ())
+        {
+          m_events.erase (iter++);
+        }
+      else
+        break;  // EventIds are sorted by timestamp => further events are not expired for sure
+    }
+
+  // If after cleanup we are still over the limit, increase the limit.
+  if (m_events.size () >= m_nextCleanupSize)
+    Grow ();
+  else
+    Shrink ();
+}
+
+
+EventGarbageCollector::~EventGarbageCollector ()
+{
+  for (EventList::iterator event = m_events.begin ();
+       event != m_events.end (); event++)
+    {
+      Simulator::Cancel (*event);
+    }
+}
+
+} // namespace ns3
+
+
diff -Naur ns-3.17/src/core/helper/event-garbage-collector.h ns-3.18/src/core/helper/event-garbage-collector.h
--- ns-3.17/src/core/helper/event-garbage-collector.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/core/helper/event-garbage-collector.h	2013-10-26 07:07:30.023364392 -0700
@@ -0,0 +1,73 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2007 INESC Porto
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Gustavo J. A. M. Carneiro  <gjc@inescporto.pt>
+ */
+#ifndef EVENT_GARBAGE_COLLECTOR_H
+#define EVENT_GARBAGE_COLLECTOR_H
+
+#include <set>
+#include "ns3/event-id.h"
+#include "ns3/simulator.h"
+
+namespace ns3 {
+
+/**
+ * \ingroup tools
+ *
+ * \brief An object that tracks scheduled events and automatically
+ * cancels them when it is destroyed.  It is useful in situations
+ * where multiple instances of the same type of event can
+ * simultaneously be scheduled, and when the events should be limited
+ * to the lifetime of a container object.
+ */
+class EventGarbageCollector
+{
+public:
+
+  EventGarbageCollector ();
+
+  /**
+   * \brief Tracks a new event
+   */
+  void Track (EventId event);
+
+  ~EventGarbageCollector ();
+
+private:
+
+  struct EventIdLessThanTs
+  {
+    bool operator () (const EventId &a, const EventId &b) const
+    {
+      return (a.GetTs () < b.GetTs ());
+    }
+  };
+
+  typedef std::multiset<EventId, EventIdLessThanTs> EventList;
+
+  EventList::size_type m_nextCleanupSize;
+  EventList m_events;
+
+  void Cleanup ();
+  void Grow ();
+  void Shrink ();
+};
+
+} // namespace ns3
+
+#endif /* EVENT_GARBAGE_COLLECTOR_H */
diff -Naur ns-3.17/src/core/helper/random-variable-stream-helper.cc ns-3.18/src/core/helper/random-variable-stream-helper.cc
--- ns-3.17/src/core/helper/random-variable-stream-helper.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/core/helper/random-variable-stream-helper.cc	2013-10-26 07:07:30.023364392 -0700
@@ -0,0 +1,46 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2012 University of Washington
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+#include "ns3/random-variable-stream.h"
+#include "ns3/config.h"
+#include "ns3/pointer.h"
+#include "ns3/log.h"
+#include "ns3/assert.h"
+#include "random-variable-stream-helper.h"
+
+NS_LOG_COMPONENT_DEFINE ("RandomVariableStreamHelper");
+
+namespace ns3 {
+
+int64_t RandomVariableStreamHelper::AssignStreams (std::string path, int64_t stream)
+{
+  NS_LOG_FUNCTION_NOARGS ();
+  NS_ASSERT (stream >= 0);
+  Config::MatchContainer mc = Config::LookupMatches (path);
+  int64_t i = 0;
+  for (Config::MatchContainer::Iterator mci = mc.Begin (); mci != mc.End (); ++mci, ++i)
+    {
+      PointerValue ptr = mc.Get (i);
+      Ptr<RandomVariableStream> rvs = ptr.Get<RandomVariableStream> ();
+      NS_LOG_DEBUG ("RandomVariableStream found: " << rvs << "; setting stream to " << (stream + i));
+      rvs->SetStream (stream + i);
+    }
+  return i;
+}
+
+} // namespace ns3
diff -Naur ns-3.17/src/core/helper/random-variable-stream-helper.h ns-3.18/src/core/helper/random-variable-stream-helper.h
--- ns-3.17/src/core/helper/random-variable-stream-helper.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/core/helper/random-variable-stream-helper.h	2013-10-26 07:07:30.023364392 -0700
@@ -0,0 +1,65 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2012 University of Washington
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+#ifndef RANDOM_VARIABLE_STREAM_HELPER_H
+#define RANDOM_VARIABLE_STREAM_HELPER_H
+
+#include <string>
+
+namespace ns3 {
+
+/**
+ * \brief Helper class for static methods involving RandomVariableStream
+ */
+class RandomVariableStreamHelper
+{
+public:
+  /**
+   * This helper method can be used to configure the stream number for
+   * one or more RNG streams.  The path passed in should correspond to
+   * an attribute path in the configuration system.  It may contain wildcards
+   * and may ultimately match zero, one, or more than one objects.
+   *
+   * The objects to match are of type PointerValue where the underlying
+   * type is of type Ptr<RandomVariableStream>.  
+   *
+   * \code
+   *    .AddAttribute ("Speed",
+   *                "A random variable used to pick the speed of a random waypoint model.",
+   *                StringValue("ns3::UniformRandomVariable[Min=0.3|Max=0.7]"),
+   *                MakePointerAccessor (&RandomWaypointMobilityModel::m_speed),
+   *                MakePointerChecker<RandomVariableStream> ())
+   *
+   * \endcode
+   *
+   * Usage would look (for node 3) like this:
+   * \code
+   * std::string path ("/$ns3::NodeListPriv/NodeList/3/$ns3::Node/$ns3::RandomWaypointMobilityModel/Speed/$ns3::UniformRandomVariable");
+   * int64_t retVal = RandomVariableStreamHelper::AssignStreams (path, 0);
+   * \endcode
+   *
+   * \return The number of streams set
+   * \param path (possibly wildcarded) path to a RandomVariableStream PointerValue
+   * \param stream stream number to set; must be non-negative
+   */
+  static int64_t AssignStreams (std::string path, int64_t stream);
+};
+
+} // namespace ns3
+
+#endif /* RANDOM_VARIABLE_STREAM_HELPER_H */
diff -Naur ns-3.17/src/core/model/assert.h ns-3.18/src/core/model/assert.h
--- ns-3.17/src/core/model/assert.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/assert.h	2013-10-26 07:07:30.031364393 -0700
@@ -28,7 +28,7 @@
 #include "fatal-error.h"
 
 /**
- * \ingroup constructs
+ * \ingroup core
  * \defgroup debugging Debugging
  */
 /**
diff -Naur ns-3.17/src/core/model/attribute.h ns-3.18/src/core/model/attribute.h
--- ns-3.17/src/core/model/attribute.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/attribute.h	2013-10-26 07:07:30.035364393 -0700
@@ -35,7 +35,12 @@
 /**
  *
  * \ingroup core
- * \defgroup attribute Attribute
+ * \defgroup attribute Attributes
+ *
+ * The \c ns-3 attribute system is the mechanism used in \c ns-3 to
+ * organize, document, and modify the *values* used by the various
+ * component models.  Attributes also enable the tracing and statistics
+ * gathering in the simulator.
  */
 
 /**
@@ -152,6 +157,13 @@
   AttributeChecker ();
   virtual ~AttributeChecker ();
 
+  /**
+   * Create a valid value from the argument value,
+   * or reinterpret the argument as a string.
+   *
+   * \param value the AttributeValue to check
+   * \return Ptr to a valid value
+   */
   Ptr<AttributeValue> CreateValidValue (const AttributeValue &value) const;
   /**
    * \param value a pointer to the value to check
@@ -190,7 +202,13 @@
    * to calling Attribute::DeserializeFromString.
    */
   virtual Ptr<AttributeValue> Create (void) const = 0;
+  /**
+   * Copy the source to the destination
 
+   * \param source source AttributeValue
+   * \param destination destination AttributeValue
+   * \return true if copy was successful
+   */
   virtual bool Copy (const AttributeValue &source, AttributeValue &destination) const = 0;
 
   
diff -Naur ns-3.17/src/core/model/attribute-helper.h ns-3.18/src/core/model/attribute-helper.h
--- ns-3.17/src/core/model/attribute-helper.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/attribute-helper.h	2013-10-26 07:07:30.043364393 -0700
@@ -27,6 +27,34 @@
 
 namespace ns3 {
 
+/**
+ * \ingroup attribute
+ * \defgroup attributehelper Attribute Helper
+ *
+ * All these macros can be used to generate automatically the code
+ * for subclasses of AttributeValue, AttributeAccessor, and, AttributeChecker,
+ * which can be used to give attribute powers to a normal class. i.e.,
+ * the user class can then effectively be made an attribute.
+ *
+ * There are two kinds of helper macros:
+ *  1) The simple macros.
+ *    - ATTRIBUTE_HELPER_HEADER(type)
+ *    - ATTRIBUTE_HELPER_CPP
+ *  2) The more complex macros.
+ *
+ * The simple macros are implemented in terms of the complex
+ * macros and should generally be preferred over the complex macros.
+ */
+  
+/**
+ * \ingroup attributehelper
+ *
+ * A simple string-based attribute checker
+ *
+ * \param name value type of the attribute
+ * \param underlying underlying type name
+ * \return Ptr to AttributeChecker
+ */
 template <typename T, typename BASE>
 Ptr<AttributeChecker>
 MakeSimpleAttributeChecker (std::string name, std::string underlying)
@@ -69,30 +97,11 @@
 }
 
 /**
- * \ingroup core
- * \defgroup AttributeHelper Attribute Helper
- *
- * All these macros can be used to generate automatically the code
- * for subclasses of AttributeValue, AttributeAccessor, and, AttributeChecker,
- * which can be used to give attribute powers to a normal class. i.e.,
- * the user class can then effectively be made an attribute.
- *
- * There are two kinds of helper macros:
- *  1) The simple macros.
- *  2) The more complex macros.
- *
- * The simple macros are implemented in terms of the complex
- * macros and should generally be preferred over the complex macros:
- *    - \ref ATTRIBUTE_HELPER_HEADER, and,
- *    - \ref ATTRIBUTE_HELPER_CPP,
- */
-
-/**
- * \ingroup AttributeHelper
+ * \ingroup attributehelper
  * \param type the name of the class
  *
  * This macro defines and generates the code for the implementation 
- * of the MakeXXXAccessor template functions. This macro is typically
+ * of the \c Make<type>Accessor template functions. This macro is typically
  * invoked in a class header to allow users of this class to view and
  * use the template functions defined here. This macro is implemented
  * through the helper templates functions ns3::MakeAccessorHelper<>.
@@ -109,6 +118,10 @@
     return MakeAccessorHelper<type ## Value> (a1, a2);                    \
   }
 
+/**
+ * \ingroup attributehelper
+ * \internal
+ */
 #define ATTRIBUTE_VALUE_DEFINE_WITH_NAME(type,name)                     \
   class name ## Value : public AttributeValue                             \
   {                                                                     \
@@ -131,39 +144,43 @@
 
 
 /**
- * \ingroup AttributeHelper
+ * \ingroup attributehelper
  * \param type the name of the class.
  *
- * This macro defines the class XXXValue associated to class XXX.
- * This macro is typically invoked in a class header.
+ * This macro defines the class \c typeValue associated to class \c type.
+ * This macro is typically invoked in the class header file.
  */
 #define ATTRIBUTE_VALUE_DEFINE(type)                                    \
   ATTRIBUTE_VALUE_DEFINE_WITH_NAME (type,type)
 
 
 /**
- * \ingroup AttributeHelper
+ * \ingroup attributehelper
  * \param type the name of the class
  *
- * This macro defines the conversion operators for class XXX to and
+ * This macro defines the conversion operators for class \c type to and
  * from instances of type Attribute.
- * Typically invoked from xxx.h.
+ * Typically invoked in the class header file.
  */
 #define ATTRIBUTE_CONVERTER_DEFINE(type)
 
 /**
- * \ingroup AttributeHelper
+ * \ingroup attributehelper
  * \param type the name of the class
  *
- * This macro defines the XXXChecker class and the associated
- * MakeXXXChecker function.
- * Typically invoked from xxx.h.
+ * This macro defines the \c typeChecker class and the associated
+ * \c Make<type>Checker function.
+ * Typically invoked in the class header file..
  */
 #define ATTRIBUTE_CHECKER_DEFINE(type)                          \
   class type ## Checker : public AttributeChecker {};             \
   Ptr<const AttributeChecker> Make ## type ## Checker (void);       \
 
 
+/**
+ * \ingroup attributehelper
+ * \internal
+ */
 #define ATTRIBUTE_VALUE_IMPLEMENT_WITH_NAME(type,name)                  \
   name ## Value::name ## Value ()                                           \
     : m_value () {}                                                     \
@@ -194,24 +211,24 @@
   }
 
 /**
- * \ingroup AttributeHelper
+ * \ingroup attributehelper
  * \param type the name of the class.
  *
- * This macro implements the XXXValue class (including the 
- * XXXValue::SerializeToString and XXXValue::DeserializeFromString 
+ * This macro implements the \c typeValue class (including the 
+ * \c typeValue::SerializeToString and \c typeValue::DeserializeFromString 
  * methods).
- * Typically invoked from xxx.cc.
+ * Typically invoked in the source file.
  */
 #define ATTRIBUTE_VALUE_IMPLEMENT(type)                                 \
   ATTRIBUTE_VALUE_IMPLEMENT_WITH_NAME (type,type)
 
 
 /**
- * \ingroup AttributeHelper
+ * \ingroup attributehelper
  * \param type the name of the class
  *
- * This macro implements the MakeXXXChecker function.
- * Typically invoked from xxx.cc.
+ * This macro implements the \c Make<type>Checker function.
+ * Typically invoked in the source file..
  */
 #define ATTRIBUTE_CHECKER_IMPLEMENT(type)                               \
   Ptr<const AttributeChecker> Make ## type ## Checker (void)                \
@@ -219,6 +236,10 @@
     return MakeSimpleAttributeChecker<type ## Value,type ## Checker> (# type "Value", # type); \
   }                                                                     \
 
+/**
+ * \ingroup attributehelper
+ * \internal
+ */
 #define ATTRIBUTE_CHECKER_IMPLEMENT_WITH_NAME(type,name)                    \
   Ptr<const AttributeChecker> Make ## type ## Checker (void)                \
   {                                                                     \
@@ -226,7 +247,7 @@
   }                                                                     \
 
 /**
- * \ingroup AttributeHelper
+ * \ingroup attributehelper
  * \param type the name of the class
  *
  * This macro should be invoked outside of the class
@@ -238,7 +259,7 @@
   ATTRIBUTE_CHECKER_DEFINE (type);
 
 /**
- * \ingroup AttributeHelper
+ * \ingroup attributehelper
  * \param type the name of the class
  *
  * This macro should be invoked from the class implementation file.
diff -Naur ns-3.17/src/core/model/breakpoint.h ns-3.18/src/core/model/breakpoint.h
--- ns-3.17/src/core/model/breakpoint.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/breakpoint.h	2013-10-26 07:07:30.039364393 -0700
@@ -57,6 +57,8 @@
 #endif
 
 /**
+ * \ingroup debugging
+ *
  * \brief fallback breakpoint function
  *
  * This function is used by the NS_BREAKPOINT() macro as a fallback
diff -Naur ns-3.17/src/core/model/calendar-scheduler.cc ns-3.18/src/core/model/calendar-scheduler.cc
--- ns-3.17/src/core/model/calendar-scheduler.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/calendar-scheduler.cc	2013-10-26 07:07:30.035364393 -0700
@@ -131,7 +131,11 @@
   NS_ASSERT (!IsEmpty ());
   uint32_t i = m_lastBucket;
   uint64_t bucketTop = m_bucketTop;
-  Scheduler::Event minEvent = { static_cast<uint64_t>(0), { static_cast<uint32_t>(~0), static_cast<uint32_t>(~0)}};
+  Scheduler::Event minEvent;
+  minEvent.impl = 0;
+  minEvent.key.m_ts = ~0;
+  minEvent.key.m_uid = ~0;
+  minEvent.key.m_context = 0;
   do
     {
       if (!m_buckets[i].empty ())
diff -Naur ns-3.17/src/core/model/callback.cc ns-3.18/src/core/model/callback.cc
--- ns-3.17/src/core/model/callback.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/callback.cc	2013-10-26 07:07:30.023364392 -0700
@@ -46,6 +46,7 @@
   return false;
 }
 
+/** Attribute checker */
 ATTRIBUTE_CHECKER_IMPLEMENT (Callback);
 
 } // namespace ns3
diff -Naur ns-3.17/src/core/model/callback.h ns-3.18/src/core/model/callback.h
--- ns-3.17/src/core/model/callback.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/callback.h	2013-10-26 07:07:30.039364393 -0700
@@ -32,166 +32,277 @@
 
 namespace ns3 {
 
-/***
- * \internal
- * This code was originally written based on the techniques 
- * described in http://www.codeproject.com/cpp/TTLFunction.asp
- * It was subsequently rewritten to follow the architecture
- * outlined in "Modern C++ Design" by Andrei Alexandrescu in 
- * chapter 5, "Generalized Functors".
- *
- * This code uses:
- *   - default template parameters to saves users from having to
- *     specify empty parameters when the number of parameters
- *     is smaller than the maximum supported number
- *   - the pimpl idiom: the Callback class is passed around by 
- *     value and delegates the crux of the work to its pimpl
- *     pointer.
- *   - two pimpl implementations which derive from CallbackImpl
- *     FunctorCallbackImpl can be used with any functor-type
- *     while MemPtrCallbackImpl can be used with pointers to
- *     member functions.
- *   - a reference list implementation to implement the Callback's
- *     value semantics.
- *
- * This code most notably departs from the alexandrescu 
- * implementation in that it does not use type lists to specify
- * and pass around the types of the callback arguments.
- * Of course, it also does not use copy-destruction semantics
- * and relies on a reference list rather than autoPtr to hold
- * the pointer.
+/**
+ * \ingroup core
+ * \defgroup callback Callbacks
+ */
+/**
+ * \ingroup callback
+ */
+/**@{*/
+/**
+ * Trait class to convert a pointer into a reference,
+ * used by MemPtrCallBackImpl
  */
 template <typename T>
 struct CallbackTraits;
 
+/**
+ * Trait class to convert a pointer into a reference,
+ * used by MemPtrCallBackImpl
+ */
 template <typename T>
 struct CallbackTraits<T *>
 {
+  /**
+   * \param p object pointer
+   * \return a reference to the object pointed to by p
+   */
   static T & GetReference (T * const p)
   {
     return *p;
   }
 };
+/**@}*/
 
+/**
+ * \ingroup callback
+ * \defgroup callbackimpl CallbackImpl
+ * CallbackImpl classes
+ */
+/**
+ * \ingroup callbackimpl
+ * Abstract base class for CallbackImpl
+ * Provides reference counting and equality test.
+ */
 class CallbackImplBase : public SimpleRefCount<CallbackImplBase>
 {
 public:
+  /** Virtual destructor */
   virtual ~CallbackImplBase () {}
+  /**
+   * Equality test
+   *
+   * \param other Callback Ptr
+   * \return true if we are equal
+   */
   virtual bool IsEqual (Ptr<const CallbackImplBase> other) const = 0;
 };
 
-// declare the CallbackImpl class
+/**
+ * \ingroup callbackimpl
+ * The unqualified CallbackImpl class
+ */
 template <typename R, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9>
 class CallbackImpl;
-// define CallbackImpl for 0 params
+  
+/**
+ * \ingroup callbackimpl
+ * CallbackImpl classes with varying numbers of argument types
+ */
+/**@{*/
+/** CallbackImpl class with no arguments. */
 template <typename R>
 class CallbackImpl<R,empty,empty,empty,empty,empty,empty,empty,empty,empty> : public CallbackImplBase {
 public:
   virtual ~CallbackImpl () {}
-  virtual R operator() (void) = 0;
+  virtual R operator() (void) = 0;      //!< Abstract operator
 };
-// define CallbackImpl for 1 params
+/** CallbackImpl class with one argument. */
 template <typename R, typename T1>
 class CallbackImpl<R,T1,empty,empty,empty,empty,empty,empty,empty,empty> : public CallbackImplBase {
 public:
   virtual ~CallbackImpl () {}
-  virtual R operator() (T1) = 0;
+  virtual R operator() (T1) = 0;        //!< Abstract operator
 };
-// define CallbackImpl for 2 params
+/** CallbackImpl class with two arguments. */
 template <typename R, typename T1, typename T2>
 class CallbackImpl<R,T1,T2,empty,empty,empty,empty,empty,empty,empty> : public CallbackImplBase {
 public:
   virtual ~CallbackImpl () {}
-  virtual R operator() (T1, T2) = 0;
+  virtual R operator() (T1, T2) = 0;    //!< Abstract operator
 };
-// define CallbackImpl for 3 params
+/** CallbackImpl class with three arguments. */
 template <typename R, typename T1, typename T2, typename T3>
 class CallbackImpl<R,T1,T2,T3,empty,empty,empty,empty,empty,empty> : public CallbackImplBase {
 public:
   virtual ~CallbackImpl () {}
-  virtual R operator() (T1, T2, T3) = 0;
+  virtual R operator() (T1, T2, T3) = 0;  //!< Abstract operator
 };
-// define CallbackImpl for 4 params
+/** CallbackImpl class with four arguments. */
 template <typename R, typename T1, typename T2, typename T3, typename T4>
 class CallbackImpl<R,T1,T2,T3,T4,empty,empty,empty,empty,empty> : public CallbackImplBase {
 public:
   virtual ~CallbackImpl () {}
-  virtual R operator() (T1, T2, T3, T4) = 0;
+  virtual R operator() (T1, T2, T3, T4) = 0;  //!< Abstract operator
 };
-// define CallbackImpl for 5 params
+/** CallbackImpl class with five arguments. */
 template <typename R, typename T1, typename T2, typename T3, typename T4, typename T5>
 class CallbackImpl<R,T1,T2,T3,T4,T5,empty,empty,empty,empty> : public CallbackImplBase {
 public:
   virtual ~CallbackImpl () {}
-  virtual R operator() (T1, T2, T3, T4, T5) = 0;
+  virtual R operator() (T1, T2, T3, T4, T5) = 0;  //!< Abstract operator
 };
-// define CallbackImpl for 6 params
+/** CallbackImpl class with six arguments. */
 template <typename R, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
 class CallbackImpl<R,T1,T2,T3,T4,T5,T6,empty,empty,empty> : public CallbackImplBase {
 public:
   virtual ~CallbackImpl () {}
-  virtual R operator() (T1, T2, T3, T4, T5, T6) = 0;
+  virtual R operator() (T1, T2, T3, T4, T5, T6) = 0;  //!< Abstract operator
 };
-// define CallbackImpl for 7 params
+/** CallbackImpl class with seven arguments. */
 template <typename R, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>
 class CallbackImpl<R,T1,T2,T3,T4,T5,T6,T7,empty,empty> : public CallbackImplBase {
 public:
   virtual ~CallbackImpl () {}
-  virtual R operator() (T1, T2, T3, T4, T5, T6, T7) = 0;
+  virtual R operator() (T1, T2, T3, T4, T5, T6, T7) = 0;  //!< Abstract operator
 };
-// define CallbackImpl for 8 params
+/** CallbackImpl class with eight arguments. */
 template <typename R, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8>
 class CallbackImpl<R,T1,T2,T3,T4,T5,T6,T7,T8,empty> : public CallbackImplBase {
 public:
   virtual ~CallbackImpl () {}
-  virtual R operator() (T1, T2, T3, T4, T5, T6, T7, T8) = 0;
+  virtual R operator() (T1, T2, T3, T4, T5, T6, T7, T8) = 0;  //!< Abstract operator
 };
-// define CallbackImpl for 9 params
+/** CallbackImpl class with nine arguments. */
 template <typename R, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9>
 class CallbackImpl : public CallbackImplBase {
 public:
   virtual ~CallbackImpl () {}
-  virtual R operator() (T1, T2, T3, T4, T5, T6, T7, T8, T9) = 0;
+  virtual R operator() (T1, T2, T3, T4, T5, T6, T7, T8, T9) = 0;  //!< Abstract operator
 };
+/**@}*/
 
 
-// an impl for Functors:
+/**
+ * \ingroup callback
+ * CallbackImpl with functors
+ */
 template <typename T, typename R, typename T1, typename T2, typename T3, typename T4,typename T5, typename T6, typename T7, typename T8, typename T9>
 class FunctorCallbackImpl : public CallbackImpl<R,T1,T2,T3,T4,T5,T6,T7,T8,T9> {
 public:
+  /**
+   * Construct from a functor
+   *
+   * \param functor the functor 
+   */
   FunctorCallbackImpl (T const &functor)
     : m_functor (functor) {}
   virtual ~FunctorCallbackImpl () {}
+  /**
+   * Functor with varying numbers of arguments
+   * @{
+   */
+  /** \return Callback value */
   R operator() (void) {
     return m_functor ();
   }
+  /**
+   * \param a1 first argument
+   * \return Callback value
+   */
   R operator() (T1 a1) {
     return m_functor (a1);
   }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \return Callback value
+   */
   R operator() (T1 a1,T2 a2) {
     return m_functor (a1,a2);
   }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \return Callback value
+   */
   R operator() (T1 a1,T2 a2,T3 a3) {
     return m_functor (a1,a2,a3);
   }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \param a4 fourth argument
+   * \return Callback value
+   */
   R operator() (T1 a1,T2 a2,T3 a3,T4 a4) {
     return m_functor (a1,a2,a3,a4);
   }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \param a4 fourth argument
+   * \param a5 fifth argument
+   * \return Callback value
+   */
   R operator() (T1 a1,T2 a2,T3 a3,T4 a4,T5 a5) {
     return m_functor (a1,a2,a3,a4,a5);
   }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \param a4 fourth argument
+   * \param a5 fifth argument
+   * \param a6 sixth argument
+   * \return Callback value
+   */
   R operator() (T1 a1,T2 a2,T3 a3,T4 a4,T5 a5,T6 a6) {
     return m_functor (a1,a2,a3,a4,a5,a6);
   }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \param a4 fourth argument
+   * \param a5 fifth argument
+   * \param a6 sixth argument
+   * \param a7 seventh argument
+   * \return Callback value
+   */
   R operator() (T1 a1,T2 a2,T3 a3,T4 a4,T5 a5,T6 a6,T7 a7) {
     return m_functor (a1,a2,a3,a4,a5,a6,a7);
   }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \param a4 fourth argument
+   * \param a5 fifth argument
+   * \param a6 sixth argument
+   * \param a7 seventh argument
+   * \param a8 eighth argument
+   * \return Callback value
+   */
   R operator() (T1 a1,T2 a2,T3 a3,T4 a4,T5 a5,T6 a6,T7 a7,T8 a8) {
     return m_functor (a1,a2,a3,a4,a5,a6,a7,a8);
   }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \param a4 fourth argument
+   * \param a5 fifth argument
+   * \param a6 sixth argument
+   * \param a7 seventh argument
+   * \param a8 eighth argument
+   * \param a9 ninth argument
+   * \return Callback value
+   */
   R operator() (T1 a1,T2 a2,T3 a3,T4 a4,T5 a5,T6 a6,T7 a7,T8 a8,T9 a9) {
     return m_functor (a1,a2,a3,a4,a5,a6,a7,a8,a9);
   }
+  /**@}*/
+  /**
+   * Equality test.
+   *
+   * \param other CallbackImpl Ptr
+   * \return true if this and other have the same functor
+   */
   virtual bool IsEqual (Ptr<const CallbackImplBase> other) const {
     FunctorCallbackImpl<T,R,T1,T2,T3,T4,T5,T6,T7,T8,T9> const *otherDerived = 
       dynamic_cast<FunctorCallbackImpl<T,R,T1,T2,T3,T4,T5,T6,T7,T8,T9> const *> (PeekPointer (other));
@@ -206,46 +317,139 @@
     return true;
   }
 private:
-  T m_functor;
+  T m_functor;                          //!< the functor
 };
 
-// an impl for pointer to member functions
+/**
+ * \ingroup callback
+ * CallbackImpl for pointer to member functions
+ */
 template <typename OBJ_PTR, typename MEM_PTR, typename R, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9>
 class MemPtrCallbackImpl : public CallbackImpl<R,T1,T2,T3,T4,T5,T6,T7,T8,T9> {
 public:
-  MemPtrCallbackImpl (OBJ_PTR const&objPtr, MEM_PTR mem_ptr)
-    : m_objPtr (objPtr), m_memPtr (mem_ptr) {}
+  /**
+   * Construct from an object pointer and member function pointer
+   *
+   * \param objPtr the object pointer
+   * \param memPtr the object class member function
+   */
+  MemPtrCallbackImpl (OBJ_PTR const&objPtr, MEM_PTR memPtr)
+    : m_objPtr (objPtr), m_memPtr (memPtr) {}
   virtual ~MemPtrCallbackImpl () {}
+  /**
+   * Functor with varying numbers of arguments
+   * @{
+   */
+  /** \return Callback value */
   R operator() (void) {
     return ((CallbackTraits<OBJ_PTR>::GetReference (m_objPtr)).*m_memPtr)();
   }
+  /**
+   * \param a1 first argument
+   * \return Callback value
+   */
   R operator() (T1 a1) {
     return ((CallbackTraits<OBJ_PTR>::GetReference (m_objPtr)).*m_memPtr)(a1);
   }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \return Callback value
+   */
   R operator() (T1 a1,T2 a2) {
     return ((CallbackTraits<OBJ_PTR>::GetReference (m_objPtr)).*m_memPtr)(a1, a2);
   }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \return Callback value
+   */
   R operator() (T1 a1,T2 a2,T3 a3) {
     return ((CallbackTraits<OBJ_PTR>::GetReference (m_objPtr)).*m_memPtr)(a1, a2, a3);
   }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \param a4 fourth argument
+   * \return Callback value
+   */
   R operator() (T1 a1,T2 a2,T3 a3,T4 a4) {
     return ((CallbackTraits<OBJ_PTR>::GetReference (m_objPtr)).*m_memPtr)(a1, a2, a3, a4);
   }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \param a4 fourth argument
+   * \param a5 fifth argument
+   * \return Callback value
+   */
   R operator() (T1 a1,T2 a2,T3 a3,T4 a4,T5 a5) {
     return ((CallbackTraits<OBJ_PTR>::GetReference (m_objPtr)).*m_memPtr)(a1, a2, a3, a4, a5);
   }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \param a4 fourth argument
+   * \param a5 fifth argument
+   * \param a6 sixth argument
+   * \return Callback value
+   */
   R operator() (T1 a1,T2 a2,T3 a3,T4 a4,T5 a5,T6 a6) {
     return ((CallbackTraits<OBJ_PTR>::GetReference (m_objPtr)).*m_memPtr)(a1, a2, a3, a4, a5, a6);
   }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \param a4 fourth argument
+   * \param a5 fifth argument
+   * \param a6 sixth argument
+   * \param a7 seventh argument
+   * \return Callback value
+   */
   R operator() (T1 a1,T2 a2,T3 a3,T4 a4,T5 a5,T6 a6,T7 a7) {
     return ((CallbackTraits<OBJ_PTR>::GetReference (m_objPtr)).*m_memPtr)(a1, a2, a3, a4, a5, a6, a7);
   }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \param a4 fourth argument
+   * \param a5 fifth argument
+   * \param a6 sixth argument
+   * \param a7 seventh argument
+   * \param a8 eighth argument
+   * \return Callback value
+   */
   R operator() (T1 a1,T2 a2,T3 a3,T4 a4,T5 a5,T6 a6,T7 a7,T8 a8) {
     return ((CallbackTraits<OBJ_PTR>::GetReference (m_objPtr)).*m_memPtr)(a1, a2, a3, a4, a5, a6, a7, a8);
   }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \param a4 fourth argument
+   * \param a5 fifth argument
+   * \param a6 sixth argument
+   * \param a7 seventh argument
+   * \param a8 eighth argument
+   * \param a9 ninth argument
+   * \return Callback value
+   */
   R operator() (T1 a1,T2 a2,T3 a3,T4 a4,T5 a5,T6 a6,T7 a7,T8 a8, T9 a9) {
     return ((CallbackTraits<OBJ_PTR>::GetReference (m_objPtr)).*m_memPtr)(a1, a2, a3, a4, a5, a6, a7, a8, a9);
   }
+  /**@}*/
+  /**
+   * Equality test.
+   *
+   * \param other Callback Ptr
+   * \return true if we have the same object and member function
+   */
   virtual bool IsEqual (Ptr<const CallbackImplBase> other) const {
     MemPtrCallbackImpl<OBJ_PTR,MEM_PTR,R,T1,T2,T3,T4,T5,T6,T7,T8,T9> const *otherDerived = 
       dynamic_cast<MemPtrCallbackImpl<OBJ_PTR,MEM_PTR,R,T1,T2,T3,T4,T5,T6,T7,T8,T9> const *> (PeekPointer (other));
@@ -261,45 +465,125 @@
     return true;
   }
 private:
-  OBJ_PTR const m_objPtr;
-  MEM_PTR m_memPtr;
+  OBJ_PTR const m_objPtr;               //!< the object pointer
+  MEM_PTR m_memPtr;                     //!< the member function pointer
 };
 
-// an impl for Bound Functors:
+/**
+ * \ingroup callback
+ * CallbackImpl for functors with first argument bound at construction
+ */
 template <typename T, typename R, typename TX, typename T1, typename T2, typename T3, typename T4,typename T5, typename T6, typename T7, typename T8>
 class BoundFunctorCallbackImpl : public CallbackImpl<R,T1,T2,T3,T4,T5,T6,T7,T8,empty> {
 public:
+  /**
+   * Construct from functor and a bound argument
+   * \param functor the functor 
+   * \param a the argument to bind
+   */
   template <typename FUNCTOR, typename ARG>
   BoundFunctorCallbackImpl (FUNCTOR functor, ARG a)
     : m_functor (functor), m_a (a) {}
   virtual ~BoundFunctorCallbackImpl () {}
+  /**
+   * Functor with varying numbers of arguments
+   * @{
+   */
+  /** \return Callback value */
   R operator() (void) {
     return m_functor (m_a);
   }
+  /**
+   * \param a1 first argument
+   * \return Callback value
+   */
   R operator() (T1 a1) {
     return m_functor (m_a,a1);
   }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \return Callback value
+   */
   R operator() (T1 a1,T2 a2) {
     return m_functor (m_a,a1,a2);
   }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \return Callback value
+   */
   R operator() (T1 a1,T2 a2,T3 a3) {
     return m_functor (m_a,a1,a2,a3);
   }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \param a4 fourth argument
+   * \return Callback value
+   */
   R operator() (T1 a1,T2 a2,T3 a3,T4 a4) {
     return m_functor (m_a,a1,a2,a3,a4);
   }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \param a4 fourth argument
+   * \param a5 fifth argument
+   * \return Callback value
+   */
   R operator() (T1 a1,T2 a2,T3 a3,T4 a4,T5 a5) {
     return m_functor (m_a,a1,a2,a3,a4,a5);
   }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \param a4 fourth argument
+   * \param a5 fifth argument
+   * \param a6 sixth argument
+   * \return Callback value
+   */
   R operator() (T1 a1,T2 a2,T3 a3,T4 a4,T5 a5,T6 a6) {
     return m_functor (m_a,a1,a2,a3,a4,a5,a6);
   }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \param a4 fourth argument
+   * \param a5 fifth argument
+   * \param a6 sixth argument
+   * \param a7 seventh argument
+   * \return Callback value
+   */
   R operator() (T1 a1,T2 a2,T3 a3,T4 a4,T5 a5,T6 a6,T7 a7) {
     return m_functor (m_a,a1,a2,a3,a4,a5,a6,a7);
   }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \param a4 fourth argument
+   * \param a5 fifth argument
+   * \param a6 sixth argument
+   * \param a7 seventh argument
+   * \param a8 eighth argument
+   * \return Callback value
+   */
   R operator() (T1 a1,T2 a2,T3 a3,T4 a4,T5 a5,T6 a6,T7 a7,T8 a8) {
     return m_functor (m_a,a1,a2,a3,a4,a5,a6,a7,a8);
   }
+  /**@}*/
+  /**
+   * Equality test.
+   *
+   * \param other Callback Ptr
+   * \return true if we have the same functor and bound arguments
+   */
   virtual bool IsEqual (Ptr<const CallbackImplBase> other) const {
     BoundFunctorCallbackImpl<T,R,TX,T1,T2,T3,T4,T5,T6,T7,T8> const *otherDerived = 
       dynamic_cast<BoundFunctorCallbackImpl<T,R,TX,T1,T2,T3,T4,T5,T6,T7,T8> const *> (PeekPointer (other));
@@ -315,39 +599,279 @@
     return true;
   }
 private:
-  T m_functor;
-  typename TypeTraits<TX>::ReferencedType m_a;
+  T m_functor;                          //!< The functor
+  typename TypeTraits<TX>::ReferencedType m_a;  //!< the bound argument
 };
 
+/**
+ * \ingroup callback
+ * CallbackImpl for functors with first two arguments bound at construction
+ */
+template <typename T, typename R, typename TX1, typename TX2, typename T1, typename T2, typename T3, typename T4,typename T5, typename T6, typename T7>
+class TwoBoundFunctorCallbackImpl : public CallbackImpl<R,T1,T2,T3,T4,T5,T6,T7,empty,empty> {
+public:
+  /**
+   * Construct from functor and two arguments
+   * \param functor the functor
+   * \param arg1 the first argument to bind
+   * \param arg2 the second argument to bind
+   */
+  template <typename FUNCTOR, typename ARG1, typename ARG2>
+  TwoBoundFunctorCallbackImpl (FUNCTOR functor, ARG1 arg1, ARG2 arg2)
+    : m_functor (functor), m_a1 (arg1), m_a2 (arg2) {}
+  virtual ~TwoBoundFunctorCallbackImpl () {}
+  /**
+   * Functor with varying numbers of arguments
+   * @{
+   */
+  /** \return Callback value */
+  R operator() (void) {
+    return m_functor (m_a1,m_a2);
+  }
+  /**
+   * \param a1 first argument
+   * \return Callback value
+   */
+  R operator() (T1 a1) {
+    return m_functor (m_a1,m_a2,a1);
+  }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \return Callback value
+   */
+  R operator() (T1 a1,T2 a2) {
+    return m_functor (m_a1,m_a2,a1,a2);
+  }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \return Callback value
+   */
+  R operator() (T1 a1,T2 a2,T3 a3) {
+    return m_functor (m_a1,m_a2,a1,a2,a3);
+  }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \param a4 fourth argument
+   * \return Callback value
+   */
+  R operator() (T1 a1,T2 a2,T3 a3,T4 a4) {
+    return m_functor (m_a1,m_a2,a1,a2,a3,a4);
+  }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \param a4 fourth argument
+   * \param a5 fifth argument
+   * \return Callback value
+   */
+  R operator() (T1 a1,T2 a2,T3 a3,T4 a4,T5 a5) {
+    return m_functor (m_a1,m_a2,a1,a2,a3,a4,a5);
+  }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \param a4 fourth argument
+   * \param a5 fifth argument
+   * \param a6 sixth argument
+   * \return Callback value
+   */
+  R operator() (T1 a1,T2 a2,T3 a3,T4 a4,T5 a5,T6 a6) {
+    return m_functor (m_a1,m_a2,a1,a2,a3,a4,a5,a6);
+  }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \param a4 fourth argument
+   * \param a5 fifth argument
+   * \param a6 sixth argument
+   * \param a7 seventh argument
+   * \return Callback value
+   */
+  R operator() (T1 a1,T2 a2,T3 a3,T4 a4,T5 a5,T6 a6,T7 a7) {
+    return m_functor (m_a1,m_a2,a1,a2,a3,a4,a5,a6,a7);
+  }
+  /**@}*/
+  /**
+   * Equality test.
+   *
+   * \param other Callback Ptr
+   * \return true if we have the same functor and bound arguments
+   */
+  virtual bool IsEqual (Ptr<const CallbackImplBase> other) const {
+    TwoBoundFunctorCallbackImpl<T,R,TX1,TX2,T1,T2,T3,T4,T5,T6,T7> const *otherDerived = 
+      dynamic_cast<TwoBoundFunctorCallbackImpl<T,R,TX1,TX2,T1,T2,T3,T4,T5,T6,T7> const *> (PeekPointer (other));
+    if (otherDerived == 0)
+      {
+        return false;
+      }
+    else if (otherDerived->m_functor != m_functor ||
+             otherDerived->m_a1 != m_a1 || otherDerived->m_a2 != m_a2)
+      {
+        return false;
+      }
+    return true;
+  }
+private:
+  T m_functor;                                    //!< The functor
+  typename TypeTraits<TX1>::ReferencedType m_a1;  //!< first bound argument
+  typename TypeTraits<TX2>::ReferencedType m_a2;  //!< second bound argument
+};
+
+/**
+ * \ingroup callback
+ * CallbackImpl for functors with first three arguments bound at construction
+ */
+template <typename T, typename R, typename TX1, typename TX2, typename TX3, typename T1, typename T2, typename T3, typename T4,typename T5, typename T6>
+class ThreeBoundFunctorCallbackImpl : public CallbackImpl<R,T1,T2,T3,T4,T5,T6,empty,empty,empty> {
+public:
+  /**
+   * Construct from functor and three arguments
+   * \param functor the functor
+   * \param arg1 the first argument to bind
+   * \param arg2 the second argument to bind
+   * \param arg3 the third argument to bind
+   */
+  template <typename FUNCTOR, typename ARG1, typename ARG2, typename ARG3>
+  ThreeBoundFunctorCallbackImpl (FUNCTOR functor, ARG1 arg1, ARG2 arg2, ARG3 arg3)
+    : m_functor (functor), m_a1 (arg1), m_a2 (arg2), m_a3 (arg3) {}
+  virtual ~ThreeBoundFunctorCallbackImpl () {}
+  /**
+   * Functor with varying numbers of arguments
+   * @{
+   */
+  /** \return Callback value */
+  R operator() (void) {
+    return m_functor (m_a1,m_a2,m_a3);
+  }
+  /**
+   * \param a1 first argument
+   * \return Callback value
+   */
+  R operator() (T1 a1) {
+    return m_functor (m_a1,m_a2,m_a3,a1);
+  }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \return Callback value
+   */
+  R operator() (T1 a1,T2 a2) {
+    return m_functor (m_a1,m_a2,m_a3,a1,a2);
+  }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \return Callback value
+   */
+  R operator() (T1 a1,T2 a2,T3 a3) {
+    return m_functor (m_a1,m_a2,m_a3,a1,a2,a3);
+  }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \param a4 fourth argument
+   * \return Callback value
+   */
+  R operator() (T1 a1,T2 a2,T3 a3,T4 a4) {
+    return m_functor (m_a1,m_a2,m_a3,a1,a2,a3,a4);
+  }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \param a4 fourth argument
+   * \param a5 fifth argument
+   * \return Callback value
+   */
+  R operator() (T1 a1,T2 a2,T3 a3,T4 a4,T5 a5) {
+    return m_functor (m_a1,m_a2,m_a3,a1,a2,a3,a4,a5);
+  }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \param a4 fourth argument
+   * \param a5 fifth argument
+   * \param a6 sixth argument
+   * \return Callback value
+   */
+  R operator() (T1 a1,T2 a2,T3 a3,T4 a4,T5 a5,T6 a6) {
+    return m_functor (m_a1,m_a2,m_a3,a1,a2,a3,a4,a5,a6);
+  }
+  /**@}*/
+  /**
+   * Equality test.
+   *
+   * \param other Callback Ptr
+   * \return true if we have the same functor and bound arguments
+   */
+  virtual bool IsEqual (Ptr<const CallbackImplBase> other) const {
+    ThreeBoundFunctorCallbackImpl<T,R,TX1,TX2,TX3,T1,T2,T3,T4,T5,T6> const *otherDerived = 
+      dynamic_cast<ThreeBoundFunctorCallbackImpl<T,R,TX1,TX2,TX3,T1,T2,T3,T4,T5,T6> const *> (PeekPointer (other));
+    if (otherDerived == 0)
+      {
+        return false;
+      }
+    else if (otherDerived->m_functor != m_functor ||
+             otherDerived->m_a1 != m_a1 || otherDerived->m_a2 != m_a2 || otherDerived->m_a3 != m_a3)
+      {
+        return false;
+      }
+    return true;
+  }
+private:
+  T m_functor;                                    //!< The functor      
+  typename TypeTraits<TX1>::ReferencedType m_a1;  //!< first bound argument 
+  typename TypeTraits<TX2>::ReferencedType m_a2;  //!< second bound argument
+  typename TypeTraits<TX3>::ReferencedType m_a3;  //!< third bound argument
+};
 
+/**
+ * \ingroup callback
+ * Base class for Callback class.
+ * Provides pimpl abstraction.
+ */
 class CallbackBase {
 public:
   CallbackBase () : m_impl () {}
+  /** \return the impl pointer */
   Ptr<CallbackImplBase> GetImpl (void) const { return m_impl; }
 protected:
+  /**
+   * Construct from a pimpl
+   * \param impl the CallbackImplBase Ptr
+   */
   CallbackBase (Ptr<CallbackImplBase> impl) : m_impl (impl) {}
-  Ptr<CallbackImplBase> m_impl;
+  Ptr<CallbackImplBase> m_impl;         //!< the pimpl
 
+  /**
+   * \param mangled the mangled string
+   * \return the demangled form of mangled
+   */
   static std::string Demangle (const std::string& mangled);
 };
 
 /**
+ * \ingroup callback
  * \brief Callback template class
  *
  * This class template implements the Functor Design Pattern.
  * It is used to declare the type of a Callback:
  *  - the first non-optional template argument represents
  *    the return type of the callback.
- *  - the second optional template argument represents
- *    the type of the first argument to the callback.
- *  - the third optional template argument represents
- *    the type of the second argument to the callback.
- *  - the fourth optional template argument represents
- *    the type of the third argument to the callback.
- *  - the fifth optional template argument represents
- *    the type of the fourth argument to the callback.
- *  - the sixth optional template argument represents
- *    the type of the fifth argument to the callback.
+ *  - the remaining (optional) template arguments represent
+ *    the type of the subsequent arguments to the callback.
+ *  - up to nine arguments are supported.
  *
  * Callback instances are built with the \ref MakeCallback
  * template functions. Callback instances have POD semantics:
@@ -358,8 +882,35 @@
  * Sample code which shows how to use this class template 
  * as well as the function templates \ref MakeCallback :
  * \include src/core/examples/main-callback.cc
+ *
+ * \internal
+ * This code was originally written based on the techniques 
+ * described in http://www.codeproject.com/cpp/TTLFunction.asp
+ * It was subsequently rewritten to follow the architecture
+ * outlined in "Modern C++ Design" by Andrei Alexandrescu in 
+ * chapter 5, "Generalized Functors".
+ *
+ * This code uses:
+ *   - default template parameters to saves users from having to
+ *     specify empty parameters when the number of parameters
+ *     is smaller than the maximum supported number
+ *   - the pimpl idiom: the Callback class is passed around by 
+ *     value and delegates the crux of the work to its pimpl
+ *     pointer.
+ *   - two pimpl implementations which derive from CallbackImpl
+ *     FunctorCallbackImpl can be used with any functor-type
+ *     while MemPtrCallbackImpl can be used with pointers to
+ *     member functions.
+ *   - a reference list implementation to implement the Callback's
+ *     value semantics.
+ *
+ * This code most notably departs from the alexandrescu 
+ * implementation in that it does not use type lists to specify
+ * and pass around the types of the callback arguments.
+ * Of course, it also does not use copy-destruction semantics
+ * and relies on a reference list rather than autoPtr to hold
+ * the pointer.
  */
-
 template<typename R, 
          typename T1 = empty, typename T2 = empty, 
          typename T3 = empty, typename T4 = empty,
@@ -370,22 +921,46 @@
 public:
   Callback () {}
 
-  // There are two dummy args below to ensure that this constructor is
-  // always properly disambiguated by the c++ compiler
+  /**
+   * Construct a functor call back, supporting operator() calls
+   *
+   * \param functor the functor to run on this callback
+   *
+   * \internal
+   * There are two dummy args below to ensure that this constructor is
+   * always properly disambiguated by the c++ compiler.
+   */
   template <typename FUNCTOR>
   Callback (FUNCTOR const &functor, bool, bool) 
     : CallbackBase (Create<FunctorCallbackImpl<FUNCTOR,R,T1,T2,T3,T4,T5,T6,T7,T8,T9> > (functor))
   {}
 
+  /**
+   * Construct a member function pointer call back.
+   *
+   * \param objPtr pointer to the object
+   * \param memPtr  pointer to the member function
+   */
   template <typename OBJ_PTR, typename MEM_PTR>
-  Callback (OBJ_PTR const &objPtr, MEM_PTR mem_ptr)
-    : CallbackBase (Create<MemPtrCallbackImpl<OBJ_PTR,MEM_PTR,R,T1,T2,T3,T4,T5,T6,T7,T8,T9> > (objPtr, mem_ptr))
+  Callback (OBJ_PTR const &objPtr, MEM_PTR memPtr)
+    : CallbackBase (Create<MemPtrCallbackImpl<OBJ_PTR,MEM_PTR,R,T1,T2,T3,T4,T5,T6,T7,T8,T9> > (objPtr, memPtr))
   {}
 
+  /**
+   * Construct from a CallbackImpl pointer
+   *
+   * \param impl the CallbackImpl Ptr
+   */
   Callback (Ptr<CallbackImpl<R,T1,T2,T3,T4,T5,T6,T7,T8,T9> > const &impl)
     : CallbackBase (impl)
   {}
 
+  /**
+   * Bind the first arguments
+   *
+   * \param a argument to bind
+   * \return the bound callback
+   */
   template <typename T>
   Callback<R,T2,T3,T4,T5,T6,T7,T8,T9> Bind (T a) {
     Ptr<CallbackImpl<R,T2,T3,T4,T5,T6,T7,T8,T9,empty> > impl =
@@ -396,58 +971,201 @@
     return Callback<R,T2,T3,T4,T5,T6,T7,T8,T9> (impl);
   }
 
+  /**
+   * Bind the first two arguments
+   *
+   * \param a1 first argument to bind
+   * \param a2 second argument to bind
+   * \return the bound callback
+   */
+  template <typename TX1, typename TX2>
+  Callback<R,T3,T4,T5,T6,T7,T8,T9> TwoBind (TX1 a1, TX2 a2) {
+    Ptr<CallbackImpl<R,T3,T4,T5,T6,T7,T8,T9,empty,empty> > impl =
+      Ptr<CallbackImpl<R,T3,T4,T5,T6,T7,T8,T9,empty,empty> > (
+        new TwoBoundFunctorCallbackImpl<
+          Callback<R,T1,T2,T3,T4,T5,T6,T7,T8,T9>,
+          R,T1,T2,T3,T4,T5,T6,T7,T8,T9> (*this, a1, a2), false);
+    return Callback<R,T3,T4,T5,T6,T7,T8,T9> (impl);
+  }
+
+  /**
+   * Bind the first three arguments
+   *
+   * \param a1 first argument to bind
+   * \param a2 second argument to bind
+   * \param a3 third argument to bind
+   * \return the bound callback
+   */
+  template <typename TX1, typename TX2, typename TX3>
+  Callback<R,T4,T5,T6,T7,T8,T9> ThreeBind (TX1 a1, TX2 a2, TX3 a3) {
+    Ptr<CallbackImpl<R,T4,T5,T6,T7,T8,T9,empty,empty,empty> > impl =
+      Ptr<CallbackImpl<R,T4,T5,T6,T7,T8,T9,empty,empty,empty> > (
+        new ThreeBoundFunctorCallbackImpl<
+          Callback<R,T1,T2,T3,T4,T5,T6,T7,T8,T9>,
+          R,T1,T2,T3,T4,T5,T6,T7,T8,T9> (*this, a1, a2, a3), false);
+    return Callback<R,T4,T5,T6,T7,T8,T9> (impl);
+  }
+
+  /**
+   * Check for null implementation
+   *
+   * \return true if I don't have an implementation
+   */
   bool IsNull (void) const {
     return (DoPeekImpl () == 0) ? true : false;
   }
+  /** Discard the implementation, set it to null */
   void Nullify (void) {
     m_impl = 0;
   }
 
+  /**
+   * Functor with varying numbers of arguments
+   * @{
+   */
+  /** \return Callback value */
   R operator() (void) const {
     return (*(DoPeekImpl ()))();
   }
+  /**
+   * \param a1 first argument
+   * \return Callback value
+   */
   R operator() (T1 a1) const {
     return (*(DoPeekImpl ()))(a1);
   }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \return Callback value
+   */
   R operator() (T1 a1, T2 a2) const {
     return (*(DoPeekImpl ()))(a1,a2);
   }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \return Callback value
+   */
   R operator() (T1 a1, T2 a2, T3 a3) const {
     return (*(DoPeekImpl ()))(a1,a2,a3);
   }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \param a4 fourth argument
+   * \return Callback value
+   */
   R operator() (T1 a1, T2 a2, T3 a3, T4 a4) const {
     return (*(DoPeekImpl ()))(a1,a2,a3,a4);
   }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \param a4 fourth argument
+   * \param a5 fifth argument
+   * \return Callback value
+   */
   R operator() (T1 a1, T2 a2, T3 a3, T4 a4,T5 a5) const {
     return (*(DoPeekImpl ()))(a1,a2,a3,a4,a5);
   }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \param a4 fourth argument
+   * \param a5 fifth argument
+   * \param a6 sixth argument
+   * \return Callback value
+   */
   R operator() (T1 a1, T2 a2, T3 a3, T4 a4,T5 a5,T6 a6) const {
     return (*(DoPeekImpl ()))(a1,a2,a3,a4,a5,a6);
   }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \param a4 fourth argument
+   * \param a5 fifth argument
+   * \param a6 sixth argument
+   * \param a7 seventh argument
+   * \return Callback value
+   */
   R operator() (T1 a1, T2 a2, T3 a3, T4 a4,T5 a5,T6 a6,T7 a7) const {
     return (*(DoPeekImpl ()))(a1,a2,a3,a4,a5,a6,a7);
   }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \param a4 fourth argument
+   * \param a5 fifth argument
+   * \param a6 sixth argument
+   * \param a7 seventh argument
+   * \param a8 seventh argument
+   * \return Callback value
+   */
   R operator() (T1 a1, T2 a2, T3 a3, T4 a4,T5 a5,T6 a6,T7 a7,T8 a8) const {
     return (*(DoPeekImpl ()))(a1,a2,a3,a4,a5,a6,a7,a8);
   }
+  /**
+   * \param a1 first argument
+   * \param a2 second argument
+   * \param a3 third argument
+   * \param a4 fourth argument
+   * \param a5 fifth argument
+   * \param a6 sixth argument
+   * \param a7 seventh argument
+   * \param a8 eighth argument
+   * \param a9 ninth argument
+   * \return Callback value
+   */
   R operator() (T1 a1, T2 a2, T3 a3, T4 a4,T5 a5,T6 a6,T7 a7,T8 a8, T9 a9) const {
     return (*(DoPeekImpl ()))(a1,a2,a3,a4,a5,a6,a7,a8,a9);
   }
+  /**@}*/
 
+  /**
+   * Equality test.
+   *
+   * \param other Callback
+   * \return true if we are equal
+   */
   bool IsEqual (const CallbackBase &other) const {
     return m_impl->IsEqual (other.GetImpl ());
   }
 
+  /**
+   * Check for compatible types
+   *
+   * \param other Callback Ptr
+   * \return true if other can be dynamic_cast to my type
+   */
   bool CheckType (const CallbackBase & other) const {
     return DoCheckType (other.GetImpl ());
   }
+  /**
+   * Adopt the other's implementation, if type compatible
+   *
+   * \param other Callback
+   */
   void Assign (const CallbackBase &other) {
     DoAssign (other.GetImpl ());
   }
 private:
+  /** \return the pimpl pointer */
   CallbackImpl<R,T1,T2,T3,T4,T5,T6,T7,T8,T9> *DoPeekImpl (void) const {
     return static_cast<CallbackImpl<R,T1,T2,T3,T4,T5,T6,T7,T8,T9> *> (PeekPointer (m_impl));
   }
+  /**
+   * Check for compatible types
+   *
+   * \param other Callback Ptr
+   * \return true if other can be dynamic_cast to my type
+   */
   bool DoCheckType (Ptr<const CallbackImplBase> other) const {
     if (other != 0 && dynamic_cast<const CallbackImpl<R,T1,T2,T3,T4,T5,T6,T7,T8,T9> *> (PeekPointer (other)) != 0)
       {
@@ -462,6 +1180,11 @@
         return false;
       }
   }
+  /**
+   * Adopt the other's implementation, if type compatible
+   *
+   * \param other Callback Ptr to adopt from
+   */
   void DoAssign (Ptr<const CallbackImplBase> other) {
     if (!DoCheckType (other))
       {
@@ -474,6 +1197,14 @@
 };
 
 
+/**
+ * Inequality test.
+ *
+ * \param a Callback
+ * \param b Callback
+ *
+ * \return true if the Callbacks are not equal
+ */
 template <typename R, typename T1, typename T2,
           typename T3, typename T4,
           typename T5, typename T6,
@@ -485,497 +1216,489 @@
 }
 
 /**
- * \ingroup core
- * \defgroup MakeCallback MakeCallback
+ * \ingroup callback
+ * \defgroup makecallbackmemptr MakeCallback from member function pointer
  *
+ * Build Callbacks for class method members which take varying numbers of arguments
+ * and potentially returning a value.
+ */
+/**
+ * \ingroup makecallbackmemptr
+ * @{
  */
-
 /**
- * \ingroup MakeCallback
  * \param memPtr class method member pointer
  * \param objPtr class instance
  * \return a wrapper Callback
- * Build Callbacks for class method members which takes no arguments
- * and potentially return a value.
- */
+ * 
+ * Build Callbacks for class method members which take varying numbers of arguments
+ * and potentially returning a value.
+ */     
 template <typename T, typename OBJ, typename R>
 Callback<R> MakeCallback (R (T::*memPtr)(void), OBJ objPtr) {
   return Callback<R> (objPtr, memPtr);
 }
 template <typename T, typename OBJ, typename R>
-Callback<R> MakeCallback (R (T::*mem_ptr)() const, OBJ objPtr) {
-  return Callback<R> (objPtr, mem_ptr);
+Callback<R> MakeCallback (R (T::*memPtr)() const, OBJ objPtr) {
+  return Callback<R> (objPtr, memPtr);
 }
-/**
- * \ingroup MakeCallback
- * \param mem_ptr class method member pointer
- * \param objPtr class instance
- * \return a wrapper Callback
- * Build Callbacks for class method members which takes one argument
- * and potentially return a value.
- */
 template <typename T, typename OBJ, typename R, typename T1>
-Callback<R,T1> MakeCallback (R (T::*mem_ptr)(T1), OBJ objPtr) {
-  return Callback<R,T1> (objPtr, mem_ptr);
+Callback<R,T1> MakeCallback (R (T::*memPtr)(T1), OBJ objPtr) {
+  return Callback<R,T1> (objPtr, memPtr);
 }
 template <typename T, typename OBJ, typename R, typename T1>
-Callback<R,T1> MakeCallback (R (T::*mem_ptr)(T1) const, OBJ objPtr) {
-  return Callback<R,T1> (objPtr, mem_ptr);
+Callback<R,T1> MakeCallback (R (T::*memPtr)(T1) const, OBJ objPtr) {
+  return Callback<R,T1> (objPtr, memPtr);
 }
-/**
- * \ingroup MakeCallback
- * \param mem_ptr class method member pointer
- * \param objPtr class instance
- * \return a wrapper Callback
- * Build Callbacks for class method members which takes two arguments
- * and potentially return a value.
- */
 template <typename T, typename OBJ, typename R, typename T1, typename T2>
-Callback<R,T1,T2> MakeCallback (R (T::*mem_ptr)(T1,T2), OBJ objPtr) {
-  return Callback<R,T1,T2> (objPtr, mem_ptr);
+Callback<R,T1,T2> MakeCallback (R (T::*memPtr)(T1,T2), OBJ objPtr) {
+  return Callback<R,T1,T2> (objPtr, memPtr);
 }
 template <typename T, typename OBJ, typename R, typename T1, typename T2>
-Callback<R,T1,T2> MakeCallback (R (T::*mem_ptr)(T1,T2) const, OBJ objPtr) {
-  return Callback<R,T1,T2> (objPtr, mem_ptr);
+Callback<R,T1,T2> MakeCallback (R (T::*memPtr)(T1,T2) const, OBJ objPtr) {
+  return Callback<R,T1,T2> (objPtr, memPtr);
 }
-/**
- * \ingroup MakeCallback
- * \param mem_ptr class method member pointer
- * \param objPtr class instance
- * \return a wrapper Callback
- * Build Callbacks for class method members which takes three arguments
- * and potentially return a value.
- */
 template <typename T, typename OBJ, typename R, typename T1,typename T2, typename T3>
-Callback<R,T1,T2,T3> MakeCallback (R (T::*mem_ptr)(T1,T2,T3), OBJ objPtr) {
-  return Callback<R,T1,T2,T3> (objPtr, mem_ptr);
+Callback<R,T1,T2,T3> MakeCallback (R (T::*memPtr)(T1,T2,T3), OBJ objPtr) {
+  return Callback<R,T1,T2,T3> (objPtr, memPtr);
 }
 template <typename T, typename OBJ, typename R, typename T1,typename T2, typename T3>
-Callback<R,T1,T2,T3> MakeCallback (R (T::*mem_ptr)(T1,T2,T3) const, OBJ objPtr) {
-  return Callback<R,T1,T2,T3> (objPtr, mem_ptr);
+Callback<R,T1,T2,T3> MakeCallback (R (T::*memPtr)(T1,T2,T3) const, OBJ objPtr) {
+  return Callback<R,T1,T2,T3> (objPtr, memPtr);
 }
-/**
- * \ingroup MakeCallback
- * \param mem_ptr class method member pointer
- * \param objPtr class instance
- * \return a wrapper Callback
- * Build Callbacks for class method members which takes four arguments
- * and potentially return a value.
- */
 template <typename T, typename OBJ, typename R, typename T1, typename T2, typename T3, typename T4>
-Callback<R,T1,T2,T3,T4> MakeCallback (R (T::*mem_ptr)(T1,T2,T3,T4), OBJ objPtr) {
-  return Callback<R,T1,T2,T3,T4> (objPtr, mem_ptr);
+Callback<R,T1,T2,T3,T4> MakeCallback (R (T::*memPtr)(T1,T2,T3,T4), OBJ objPtr) {
+  return Callback<R,T1,T2,T3,T4> (objPtr, memPtr);
 }
 template <typename T, typename OBJ, typename R, typename T1, typename T2, typename T3, typename T4>
-Callback<R,T1,T2,T3,T4> MakeCallback (R (T::*mem_ptr)(T1,T2,T3,T4) const, OBJ objPtr) {
-  return Callback<R,T1,T2,T3,T4> (objPtr, mem_ptr);
+Callback<R,T1,T2,T3,T4> MakeCallback (R (T::*memPtr)(T1,T2,T3,T4) const, OBJ objPtr) {
+  return Callback<R,T1,T2,T3,T4> (objPtr, memPtr);
 }
-/**
- * \ingroup MakeCallback
- * \param mem_ptr class method member pointer
- * \param objPtr class instance
- * \return a wrapper Callback
- * Build Callbacks for class method members which takes five arguments
- * and potentially return a value.
- */
 template <typename T, typename OBJ, typename R, typename T1, typename T2, typename T3, typename T4,typename T5>
-Callback<R,T1,T2,T3,T4,T5> MakeCallback (R (T::*mem_ptr)(T1,T2,T3,T4,T5), OBJ objPtr) {
-  return Callback<R,T1,T2,T3,T4,T5> (objPtr, mem_ptr);
+Callback<R,T1,T2,T3,T4,T5> MakeCallback (R (T::*memPtr)(T1,T2,T3,T4,T5), OBJ objPtr) {
+  return Callback<R,T1,T2,T3,T4,T5> (objPtr, memPtr);
 }
 template <typename T, typename OBJ, typename R, typename T1, typename T2, typename T3, typename T4,typename T5>
-Callback<R,T1,T2,T3,T4,T5> MakeCallback (R (T::*mem_ptr)(T1,T2,T3,T4,T5) const, OBJ objPtr) {
-  return Callback<R,T1,T2,T3,T4,T5> (objPtr, mem_ptr);
+Callback<R,T1,T2,T3,T4,T5> MakeCallback (R (T::*memPtr)(T1,T2,T3,T4,T5) const, OBJ objPtr) {
+  return Callback<R,T1,T2,T3,T4,T5> (objPtr, memPtr);
 }
-/**
- * \ingroup MakeCallback
- * \param mem_ptr class method member pointer
- * \param objPtr class instance
- * \return a wrapper Callback
- * Build Callbacks for class method members which takes six arguments
- * and potentially return a value.
- */
 template <typename T, typename OBJ, typename R, typename T1, typename T2, typename T3, typename T4,typename T5,typename T6>
-Callback<R,T1,T2,T3,T4,T5,T6> MakeCallback (R (T::*mem_ptr)(T1,T2,T3,T4,T5,T6), OBJ objPtr) {
-  return Callback<R,T1,T2,T3,T4,T5,T6> (objPtr, mem_ptr);
+Callback<R,T1,T2,T3,T4,T5,T6> MakeCallback (R (T::*memPtr)(T1,T2,T3,T4,T5,T6), OBJ objPtr) {
+  return Callback<R,T1,T2,T3,T4,T5,T6> (objPtr, memPtr);
 }
 template <typename T, typename OBJ, typename R, typename T1, typename T2, typename T3, typename T4,typename T5, typename T6>
-Callback<R,T1,T2,T3,T4,T5,T6> MakeCallback (R (T::*mem_ptr)(T1,T2,T3,T4,T5,T6) const, OBJ objPtr) {
-  return Callback<R,T1,T2,T3,T4,T5,T6> (objPtr, mem_ptr);
+Callback<R,T1,T2,T3,T4,T5,T6> MakeCallback (R (T::*memPtr)(T1,T2,T3,T4,T5,T6) const, OBJ objPtr) {
+  return Callback<R,T1,T2,T3,T4,T5,T6> (objPtr, memPtr);
 }
-
-/**
- * \ingroup MakeCallback
- * \param mem_ptr class method member pointer
- * \param objPtr class instance
- * \return a wrapper Callback
- * Build Callbacks for class method members which takes seven arguments
- * and potentially return a value.
- */
 template <typename T, typename OBJ, typename R, typename T1, typename T2, typename T3, typename T4,typename T5,typename T6, typename T7>
-Callback<R,T1,T2,T3,T4,T5,T6,T7> MakeCallback (R (T::*mem_ptr)(T1,T2,T3,T4,T5,T6,T7), OBJ objPtr) {
-  return Callback<R,T1,T2,T3,T4,T5,T6,T7> (objPtr, mem_ptr);
+Callback<R,T1,T2,T3,T4,T5,T6,T7> MakeCallback (R (T::*memPtr)(T1,T2,T3,T4,T5,T6,T7), OBJ objPtr) {
+  return Callback<R,T1,T2,T3,T4,T5,T6,T7> (objPtr, memPtr);
 }
 template <typename T, typename OBJ, typename R, typename T1, typename T2, typename T3, typename T4,typename T5, typename T6, typename T7>
-Callback<R,T1,T2,T3,T4,T5,T6,T7> MakeCallback (R (T::*mem_ptr)(T1,T2,T3,T4,T5,T6,T7) const, OBJ objPtr) {
-  return Callback<R,T1,T2,T3,T4,T5,T6,T7> (objPtr, mem_ptr);
+Callback<R,T1,T2,T3,T4,T5,T6,T7> MakeCallback (R (T::*memPtr)(T1,T2,T3,T4,T5,T6,T7) const, OBJ objPtr) {
+  return Callback<R,T1,T2,T3,T4,T5,T6,T7> (objPtr, memPtr);
 }
-
-
-/**
- * \ingroup MakeCallback
- * \param mem_ptr class method member pointer
- * \param objPtr class instance
- * \return a wrapper Callback
- * Build Callbacks for class method members which takes eight arguments
- * and potentially return a value.
- */
 template <typename T, typename OBJ, typename R, typename T1, typename T2, typename T3, typename T4,typename T5,typename T6, typename T7, typename T8>
-Callback<R,T1,T2,T3,T4,T5,T6,T7,T8> MakeCallback (R (T::*mem_ptr)(T1,T2,T3,T4,T5,T6,T7,T8), OBJ objPtr) {
-  return Callback<R,T1,T2,T3,T4,T5,T6,T7,T8> (objPtr, mem_ptr);
+Callback<R,T1,T2,T3,T4,T5,T6,T7,T8> MakeCallback (R (T::*memPtr)(T1,T2,T3,T4,T5,T6,T7,T8), OBJ objPtr) {
+  return Callback<R,T1,T2,T3,T4,T5,T6,T7,T8> (objPtr, memPtr);
 }
 template <typename T, typename OBJ, typename R, typename T1, typename T2, typename T3, typename T4,typename T5, typename T6, typename T7, typename T8>
-Callback<R,T1,T2,T3,T4,T5,T6,T7,T8> MakeCallback (R (T::*mem_ptr)(T1,T2,T3,T4,T5,T6,T7,T8) const, OBJ objPtr) {
-  return Callback<R,T1,T2,T3,T4,T5,T6,T7,T8> (objPtr, mem_ptr);
+Callback<R,T1,T2,T3,T4,T5,T6,T7,T8> MakeCallback (R (T::*memPtr)(T1,T2,T3,T4,T5,T6,T7,T8) const, OBJ objPtr) {
+  return Callback<R,T1,T2,T3,T4,T5,T6,T7,T8> (objPtr, memPtr);
 }
-
-/**
- * \ingroup MakeCallback
- * \param mem_ptr class method member pointer
- * \param objPtr class instance
- * \return a wrapper Callback
- * Build Callbacks for class method members which takes nine arguments
- * and potentially return a value.
- */
 template <typename T, typename OBJ, typename R, typename T1, typename T2, typename T3, typename T4,typename T5,typename T6, typename T7, typename T8, typename T9>
-Callback<R,T1,T2,T3,T4,T5,T6,T7,T8,T9> MakeCallback (R (T::*mem_ptr)(T1,T2,T3,T4,T5,T6,T7,T8,T9), OBJ objPtr) {
-  return Callback<R,T1,T2,T3,T4,T5,T6,T7,T8,T9> (objPtr, mem_ptr);
+Callback<R,T1,T2,T3,T4,T5,T6,T7,T8,T9> MakeCallback (R (T::*memPtr)(T1,T2,T3,T4,T5,T6,T7,T8,T9), OBJ objPtr) {
+  return Callback<R,T1,T2,T3,T4,T5,T6,T7,T8,T9> (objPtr, memPtr);
 }
 template <typename T, typename OBJ, typename R, typename T1, typename T2, typename T3, typename T4,typename T5, typename T6, typename T7, typename T8, typename T9>
-Callback<R,T1,T2,T3,T4,T5,T6,T7,T8,T9> MakeCallback (R (T::*mem_ptr)(T1,T2,T3,T4,T5,T6,T7,T8,T9) const, OBJ objPtr) {
-  return Callback<R,T1,T2,T3,T4,T5,T6,T7,T8,T9> (objPtr, mem_ptr);
+Callback<R,T1,T2,T3,T4,T5,T6,T7,T8,T9> MakeCallback (R (T::*memPtr)(T1,T2,T3,T4,T5,T6,T7,T8,T9) const, OBJ objPtr) {
+  return Callback<R,T1,T2,T3,T4,T5,T6,T7,T8,T9> (objPtr, memPtr);
 }
+/**@}*/
 
 /**
- * \ingroup MakeCallback
+ * \ingroup callback
+ * \defgroup makecallbackfnptr MakeCallback from function pointers
+ *
+ * Build Callbacks for functions which take varying numbers of arguments
+ * and potentially returning a value.
+ */
+/**
+ * \ingroup makecallbackfnptr
+ * @{
+ */
+/**
  * \param fnPtr function pointer
  * \return a wrapper Callback
- * Build Callbacks for functions which takes no arguments
- * and potentially return a value.
+ * 
+ * Build Callbacks for functions which take varying numbers of arguments
+ * and potentially returning a value.
  */
 template <typename R>
 Callback<R> MakeCallback (R (*fnPtr)()) {
   return Callback<R> (fnPtr, true, true);
 }
-/**
- * \ingroup MakeCallback
- * \param fnPtr function pointer
- * \return a wrapper Callback
- * Build Callbacks for functions which takes one argument
- * and potentially return a value.
- */
 template <typename R, typename T1>
 Callback<R,T1> MakeCallback (R (*fnPtr)(T1)) {
   return Callback<R,T1> (fnPtr, true, true);
 }
-/**
- * \ingroup MakeCallback
- * \param fnPtr function pointer
- * \return a wrapper Callback
- * Build Callbacks for functions which takes two arguments
- * and potentially return a value.
- */
 template <typename R, typename T1, typename T2>
 Callback<R,T1,T2> MakeCallback (R (*fnPtr)(T1,T2)) {
   return Callback<R,T1,T2> (fnPtr, true, true);
 }
-/**
- * \ingroup MakeCallback
- * \param fnPtr function pointer
- * \return a wrapper Callback
- * Build Callbacks for functions which takes three arguments
- * and potentially return a value.
- */
 template <typename R, typename T1, typename T2,typename T3>
 Callback<R,T1,T2,T3> MakeCallback (R (*fnPtr)(T1,T2,T3)) {
   return Callback<R,T1,T2,T3> (fnPtr, true, true);
 }
-/**
- * \ingroup MakeCallback
- * \param fnPtr function pointer
- * \return a wrapper Callback
- * Build Callbacks for functions which takes four arguments
- * and potentially return a value.
- */
 template <typename R, typename T1, typename T2,typename T3,typename T4>
 Callback<R,T1,T2,T3,T4> MakeCallback (R (*fnPtr)(T1,T2,T3,T4)) {
   return Callback<R,T1,T2,T3,T4> (fnPtr, true, true);
 }
-/**
- * \ingroup MakeCallback
- * \param fnPtr function pointer
- * \return a wrapper Callback
- * Build Callbacks for functions which takes five arguments
- * and potentially return a value.
- */
 template <typename R, typename T1, typename T2,typename T3,typename T4,typename T5>
 Callback<R,T1,T2,T3,T4,T5> MakeCallback (R (*fnPtr)(T1,T2,T3,T4,T5)) {
   return Callback<R,T1,T2,T3,T4,T5> (fnPtr, true, true);
 }
-/**
- * \ingroup MakeCallback
- * \param fnPtr function pointer
- * \return a wrapper Callback
- * Build Callbacks for functions which takes six arguments
- * and potentially return a value.
- */
 template <typename R, typename T1, typename T2,typename T3,typename T4,typename T5,typename T6>
 Callback<R,T1,T2,T3,T4,T5,T6> MakeCallback (R (*fnPtr)(T1,T2,T3,T4,T5,T6)) {
   return Callback<R,T1,T2,T3,T4,T5,T6> (fnPtr, true, true);
 }
-
-/**
- * \ingroup MakeCallback
- * \param fnPtr function pointer
- * \return a wrapper Callback
- * Build Callbacks for functions which takes seven arguments
- * and potentially return a value.
- */
 template <typename R, typename T1, typename T2,typename T3,typename T4,typename T5,typename T6, typename T7>
 Callback<R,T1,T2,T3,T4,T5,T6,T7> MakeCallback (R (*fnPtr)(T1,T2,T3,T4,T5,T6,T7)) {
   return Callback<R,T1,T2,T3,T4,T5,T6,T7> (fnPtr, true, true);
 }
-
-/**
- * \ingroup MakeCallback
- * \param fnPtr function pointer
- * \return a wrapper Callback
- * Build Callbacks for functions which takes eight arguments
- * and potentially return a value.
- */
 template <typename R, typename T1, typename T2,typename T3,typename T4,typename T5,typename T6, typename T7, typename T8>
 Callback<R,T1,T2,T3,T4,T5,T6,T7,T8> MakeCallback (R (*fnPtr)(T1,T2,T3,T4,T5,T6,T7,T8)) {
   return Callback<R,T1,T2,T3,T4,T5,T6,T7,T8> (fnPtr, true, true);
 }
-
-/**
- * \ingroup MakeCallback
- * \param fnPtr function pointer
- * \return a wrapper Callback
- * Build Callbacks for functions which takes nine arguments
- * and potentially return a value.
- */
 template <typename R, typename T1, typename T2,typename T3,typename T4,typename T5,typename T6, typename T7, typename T8, typename T9>
 Callback<R,T1,T2,T3,T4,T5,T6,T7,T8,T9> MakeCallback (R (*fnPtr)(T1,T2,T3,T4,T5,T6,T7,T8,T9)) {
   return Callback<R,T1,T2,T3,T4,T5,T6,T7,T8,T9> (fnPtr, true, true);
 }
-
-
+/**@}*/
 
 /**
- * \ingroup MakeCallback
- * \return a wrapper Callback
- * Build a null callback which takes no arguments
- * and potentially return a value.
+ * \ingroup callback
+ * \defgroup makenullcallback MakeCallbacks with no arguments
  */
+/**
+ * \ingroup makenullcallback
+ * @{
+ */
+/**
+ * \return a wrapper Callback
+ *
+ * Build null Callbacks which take no arguments,
+ * for varying number of template arguments,
+ * and potentially returning a value.
+ */     
 template <typename R>
 Callback<R> MakeNullCallback (void) {
   return Callback<R> ();
 }
-/**
- * \ingroup MakeCallback
- * \overload Callback<R> MakeNullCallback (void)
- * \return a wrapper Callback
- * Build a null callback which takes one argument
- * and potentially return a value.
- */
 template <typename R, typename T1>
 Callback<R,T1> MakeNullCallback (void) {
   return Callback<R,T1> ();
 }
-/**
- * \ingroup MakeCallback
- * \overload Callback<R> MakeNullCallback (void)
- * \return a wrapper Callback
- * Build a null callback which takes two arguments
- * and potentially return a value.
- */
 template <typename R, typename T1, typename T2>
 Callback<R,T1,T2> MakeNullCallback (void) {
   return Callback<R,T1,T2> ();
 }
-/**
- * \ingroup MakeCallback
- * \overload Callback<R> MakeNullCallback (void)
- * \return a wrapper Callback
- * Build a null callback which takes three arguments
- * and potentially return a value.
- */
 template <typename R, typename T1, typename T2,typename T3>
 Callback<R,T1,T2,T3> MakeNullCallback (void) {
   return Callback<R,T1,T2,T3> ();
 }
-/**
- * \ingroup MakeCallback
- * \overload Callback<R> MakeNullCallback (void)
- * \return a wrapper Callback
- * Build a null callback which takes four arguments
- * and potentially return a value.
- */
 template <typename R, typename T1, typename T2,typename T3,typename T4>
 Callback<R,T1,T2,T3,T4> MakeNullCallback (void) {
   return Callback<R,T1,T2,T3,T4> ();
 }
-/**
- * \ingroup MakeCallback
- * \overload Callback<R> MakeNullCallback (void)
- * \return a wrapper Callback
- * Build a null callback which takes five arguments
- * and potentially return a value.
- */
 template <typename R, typename T1, typename T2,typename T3,typename T4,typename T5>
 Callback<R,T1,T2,T3,T4,T5> MakeNullCallback (void) {
   return Callback<R,T1,T2,T3,T4,T5> ();
 }
-/**
- * \ingroup MakeCallback
- * \overload Callback<R> MakeNullCallback (void)
- * \return a wrapper Callback
- * Build a null callback which takes six arguments
- * and potentially return a value.
- */
 template <typename R, typename T1, typename T2,typename T3,typename T4,typename T5,typename T6>
 Callback<R,T1,T2,T3,T4,T5,T6> MakeNullCallback (void) {
   return Callback<R,T1,T2,T3,T4,T5,T6> ();
 }
-
-/**
- * \ingroup MakeCallback
- * \overload Callback<R> MakeNullCallback (void)
- * \return a wrapper Callback
- * Build a null callback which takes seven arguments
- * and potentially return a value.
- */
 template <typename R, typename T1, typename T2,typename T3,typename T4,typename T5,typename T6, typename T7>
 Callback<R,T1,T2,T3,T4,T5,T6,T7> MakeNullCallback (void) {
   return Callback<R,T1,T2,T3,T4,T5,T6,T7> ();
 }
-
-/**
- * \ingroup MakeCallback
- * \overload Callback<R> MakeNullCallback (void)
- * \return a wrapper Callback
- * Build a null callback which takes eight arguments
- * and potentially return a value.
- */
 template <typename R, typename T1, typename T2,typename T3,typename T4,typename T5,typename T6, typename T7, typename T8>
 Callback<R,T1,T2,T3,T4,T5,T6,T7,T8> MakeNullCallback (void) {
   return Callback<R,T1,T2,T3,T4,T5,T6,T7,T8> ();
 }
-
-/**
- * \ingroup MakeCallback
- * \overload Callback<R> MakeNullCallback (void)
- * \return a wrapper Callback
- * Build a null callback which takes nine arguments
- * and potentially return a value.
- */
 template <typename R, typename T1, typename T2,typename T3,typename T4,typename T5,typename T6, typename T7, typename T8, typename T9>
 Callback<R,T1,T2,T3,T4,T5,T6,T7,T8,T9> MakeNullCallback (void) {
   return Callback<R,T1,T2,T3,T4,T5,T6,T7,T8,T9> ();
 }
+/**@}*/
 
 
-/*
+/**
+ * \ingroup callback
+ * \defgroup makeboundcallback MakeBoundCallback from functions bound with up to three arguments.
+ */
+  
+/**
+ * \ingroup makeboundcallback
+ *
+ * Build bound Callbacks which take varying numbers of arguments,
+ * and potentially returning a value.
+ *
+ * \internal
+ *
  * The following is experimental code. It works but we have
  * not yet determined whether or not it is really useful and whether
  * or not we really want to use it.
+ *
+ * @{
  */
-
+/**
+ * @{
+ * \param fnPtr function pointer
+ * \param a1 first bound argument
+ * \return a bound Callback
+ */   
 template <typename R, typename TX, typename ARG>
-Callback<R> MakeBoundCallback (R (*fnPtr)(TX), ARG a) {
+Callback<R> MakeBoundCallback (R (*fnPtr)(TX), ARG a1) {
   Ptr<CallbackImpl<R,empty,empty,empty,empty,empty,empty,empty,empty,empty> > impl =
-    Create<BoundFunctorCallbackImpl<R (*)(TX),R,TX,empty,empty,empty,empty,empty,empty,empty,empty> >(fnPtr, a);
+    Create<BoundFunctorCallbackImpl<R (*)(TX),R,TX,empty,empty,empty,empty,empty,empty,empty,empty> >(fnPtr, a1);
   return Callback<R> (impl);
 }
-
 template <typename R, typename TX, typename ARG, 
           typename T1>
-Callback<R,T1> MakeBoundCallback (R (*fnPtr)(TX,T1), ARG a) {
+Callback<R,T1> MakeBoundCallback (R (*fnPtr)(TX,T1), ARG a1) {
   Ptr<CallbackImpl<R,T1,empty,empty,empty,empty,empty,empty,empty,empty> > impl =
-    Create<BoundFunctorCallbackImpl<R (*)(TX,T1),R,TX,T1,empty,empty,empty,empty,empty,empty,empty> > (fnPtr, a);
+    Create<BoundFunctorCallbackImpl<R (*)(TX,T1),R,TX,T1,empty,empty,empty,empty,empty,empty,empty> > (fnPtr, a1);
   return Callback<R,T1> (impl);
 }
 template <typename R, typename TX, typename ARG, 
           typename T1, typename T2>
-Callback<R,T1,T2> MakeBoundCallback (R (*fnPtr)(TX,T1,T2), ARG a) {
+Callback<R,T1,T2> MakeBoundCallback (R (*fnPtr)(TX,T1,T2), ARG a1) {
   Ptr<CallbackImpl<R,T1,T2,empty,empty,empty,empty,empty,empty,empty> > impl =
-    Create<BoundFunctorCallbackImpl<R (*)(TX,T1,T2),R,TX,T1,T2,empty,empty,empty,empty,empty,empty> > (fnPtr, a);
+    Create<BoundFunctorCallbackImpl<R (*)(TX,T1,T2),R,TX,T1,T2,empty,empty,empty,empty,empty,empty> > (fnPtr, a1);
   return Callback<R,T1,T2> (impl);
 }
 template <typename R, typename TX, typename ARG,
           typename T1, typename T2,typename T3>
-Callback<R,T1,T2,T3> MakeBoundCallback (R (*fnPtr)(TX,T1,T2,T3), ARG a) {
+Callback<R,T1,T2,T3> MakeBoundCallback (R (*fnPtr)(TX,T1,T2,T3), ARG a1) {
   Ptr<CallbackImpl<R,T1,T2,T3,empty,empty,empty,empty,empty,empty> > impl =
-    Create<BoundFunctorCallbackImpl<R (*)(TX,T1,T2,T3),R,TX,T1,T2,T3,empty,empty,empty,empty,empty> > (fnPtr, a);
+    Create<BoundFunctorCallbackImpl<R (*)(TX,T1,T2,T3),R,TX,T1,T2,T3,empty,empty,empty,empty,empty> > (fnPtr, a1);
   return Callback<R,T1,T2,T3> (impl);
 }
 template <typename R, typename TX, typename ARG,
           typename T1, typename T2,typename T3,typename T4>
-Callback<R,T1,T2,T3,T4> MakeBoundCallback (R (*fnPtr)(TX,T1,T2,T3,T4), ARG a) {
+Callback<R,T1,T2,T3,T4> MakeBoundCallback (R (*fnPtr)(TX,T1,T2,T3,T4), ARG a1) {
   Ptr<CallbackImpl<R,T1,T2,T3,T4,empty,empty,empty,empty,empty> > impl =
-    Create<BoundFunctorCallbackImpl<R (*)(TX,T1,T2,T3,T4),R,TX,T1,T2,T3,T4,empty,empty,empty,empty> > (fnPtr, a);
+    Create<BoundFunctorCallbackImpl<R (*)(TX,T1,T2,T3,T4),R,TX,T1,T2,T3,T4,empty,empty,empty,empty> > (fnPtr, a1);
   return Callback<R,T1,T2,T3,T4> (impl);
 }
 template <typename R, typename TX, typename ARG,
           typename T1, typename T2,typename T3,typename T4,typename T5>
-Callback<R,T1,T2,T3,T4,T5> MakeBoundCallback (R (*fnPtr)(TX,T1,T2,T3,T4,T5), ARG a) {
+Callback<R,T1,T2,T3,T4,T5> MakeBoundCallback (R (*fnPtr)(TX,T1,T2,T3,T4,T5), ARG a1) {
   Ptr<CallbackImpl<R,T1,T2,T3,T4,T5,empty,empty,empty,empty> > impl =
-    Create<BoundFunctorCallbackImpl<R (*)(TX,T1,T2,T3,T4,T5),R,TX,T1,T2,T3,T4,T5,empty,empty,empty> > (fnPtr, a);
+    Create<BoundFunctorCallbackImpl<R (*)(TX,T1,T2,T3,T4,T5),R,TX,T1,T2,T3,T4,T5,empty,empty,empty> > (fnPtr, a1);
   return Callback<R,T1,T2,T3,T4,T5> (impl);
 }
 template <typename R, typename TX, typename ARG,
           typename T1, typename T2,typename T3,typename T4,typename T5, typename T6>
-Callback<R,T1,T2,T3,T4,T5,T6> MakeBoundCallback (R (*fnPtr)(TX,T1,T2,T3,T4,T5,T6), ARG a) {
+Callback<R,T1,T2,T3,T4,T5,T6> MakeBoundCallback (R (*fnPtr)(TX,T1,T2,T3,T4,T5,T6), ARG a1) {
   Ptr<CallbackImpl<R,T1,T2,T3,T4,T5,T6,empty,empty,empty> > impl =
-    Create<BoundFunctorCallbackImpl<R (*)(TX,T1,T2,T3,T4,T5,T6),R,TX,T1,T2,T3,T4,T5,T6,empty,empty> > (fnPtr, a);
+    Create<BoundFunctorCallbackImpl<R (*)(TX,T1,T2,T3,T4,T5,T6),R,TX,T1,T2,T3,T4,T5,T6,empty,empty> > (fnPtr, a1);
   return Callback<R,T1,T2,T3,T4,T5,T6> (impl);
 }
 template <typename R, typename TX, typename ARG,
           typename T1, typename T2,typename T3,typename T4,typename T5, typename T6, typename T7>
-Callback<R,T1,T2,T3,T4,T5,T6,T7> MakeBoundCallback (R (*fnPtr)(TX,T1,T2,T3,T4,T5,T6,T7), ARG a) {
+Callback<R,T1,T2,T3,T4,T5,T6,T7> MakeBoundCallback (R (*fnPtr)(TX,T1,T2,T3,T4,T5,T6,T7), ARG a1) {
   Ptr<CallbackImpl<R,T1,T2,T3,T4,T5,T6,T7,empty,empty> > impl =
-    Create<BoundFunctorCallbackImpl<R (*)(TX,T1,T2,T3,T4,T5,T6,T7),R,TX,T1,T2,T3,T4,T5,T6,T7,empty> > (fnPtr, a);
+    Create<BoundFunctorCallbackImpl<R (*)(TX,T1,T2,T3,T4,T5,T6,T7),R,TX,T1,T2,T3,T4,T5,T6,T7,empty> > (fnPtr, a1);
   return Callback<R,T1,T2,T3,T4,T5,T6,T7> (impl);
 }
 template <typename R, typename TX, typename ARG,
           typename T1, typename T2,typename T3,typename T4,typename T5, typename T6, typename T7, typename T8>
-Callback<R,T1,T2,T3,T4,T5,T6,T7,T8> MakeBoundCallback (R (*fnPtr)(TX,T1,T2,T3,T4,T5,T6,T7,T8), ARG a) {
+Callback<R,T1,T2,T3,T4,T5,T6,T7,T8> MakeBoundCallback (R (*fnPtr)(TX,T1,T2,T3,T4,T5,T6,T7,T8), ARG a1) {
   Ptr<CallbackImpl<R,T1,T2,T3,T4,T5,T6,T7,T8,empty> > impl =
-    Create<BoundFunctorCallbackImpl<R (*)(TX,T1,T2,T3,T4,T5,T6,T7,T8),R,TX,T1,T2,T3,T4,T5,T6,T7,T8> > (fnPtr, a);
+    Create<BoundFunctorCallbackImpl<R (*)(TX,T1,T2,T3,T4,T5,T6,T7,T8),R,TX,T1,T2,T3,T4,T5,T6,T7,T8> > (fnPtr, a1);
   return Callback<R,T1,T2,T3,T4,T5,T6,T7,T8> (impl);
 }
+/**@}*/
+
+/**
+ * \param fnPtr function pointer
+ * \param a1 first bound argument
+ * \param a2 second bound argument 
+ * \return a bound Callback
+ * @{
+ */
+template <typename R, typename TX1, typename TX2, typename ARG1, typename ARG2>
+Callback<R> MakeBoundCallback (R (*fnPtr)(TX1,TX2), ARG1 a1, ARG2 a2) {
+  Ptr<CallbackImpl<R,empty,empty,empty,empty,empty,empty,empty,empty,empty> > impl =
+    Create<TwoBoundFunctorCallbackImpl<R (*)(TX1,TX2),R,TX1,TX2,empty,empty,empty,empty,empty,empty,empty> >(fnPtr, a1, a2);
+  return Callback<R> (impl);
+}
+template <typename R, typename TX1, typename TX2, typename ARG1, typename ARG2,
+          typename T1>
+Callback<R,T1> MakeBoundCallback (R (*fnPtr)(TX1,TX2,T1), ARG1 a1, ARG2 a2) {
+  Ptr<CallbackImpl<R,T1,empty,empty,empty,empty,empty,empty,empty,empty> > impl =
+    Create<TwoBoundFunctorCallbackImpl<R (*)(TX1,TX2,T1),R,TX1,TX2,T1,empty,empty,empty,empty,empty,empty> > (fnPtr, a1, a2);
+  return Callback<R,T1> (impl);
+}
+template <typename R, typename TX1, typename TX2, typename ARG1, typename ARG2,
+          typename T1, typename T2>
+Callback<R,T1,T2> MakeBoundCallback (R (*fnPtr)(TX1,TX2,T1,T2), ARG1 a1, ARG2 a2) {
+  Ptr<CallbackImpl<R,T1,T2,empty,empty,empty,empty,empty,empty,empty> > impl =
+    Create<TwoBoundFunctorCallbackImpl<R (*)(TX1,TX2,T1,T2),R,TX1,TX2,T1,T2,empty,empty,empty,empty,empty> > (fnPtr, a1, a2);
+  return Callback<R,T1,T2> (impl);
+}
+template <typename R, typename TX1, typename TX2, typename ARG1, typename ARG2,
+          typename T1, typename T2,typename T3>
+Callback<R,T1,T2,T3> MakeBoundCallback (R (*fnPtr)(TX1,TX2,T1,T2,T3), ARG1 a1, ARG2 a2) {
+  Ptr<CallbackImpl<R,T1,T2,T3,empty,empty,empty,empty,empty,empty> > impl =
+    Create<TwoBoundFunctorCallbackImpl<R (*)(TX1,TX2,T1,T2,T3),R,TX1,TX2,T1,T2,T3,empty,empty,empty,empty> > (fnPtr, a1, a2);
+  return Callback<R,T1,T2,T3> (impl);
+}
+template <typename R, typename TX1, typename TX2, typename ARG1, typename ARG2,
+          typename T1, typename T2,typename T3,typename T4>
+Callback<R,T1,T2,T3,T4> MakeBoundCallback (R (*fnPtr)(TX1,TX2,T1,T2,T3,T4), ARG1 a1, ARG2 a2) {
+  Ptr<CallbackImpl<R,T1,T2,T3,T4,empty,empty,empty,empty,empty> > impl =
+    Create<TwoBoundFunctorCallbackImpl<R (*)(TX1,TX2,T1,T2,T3,T4),R,TX1,TX2,T1,T2,T3,T4,empty,empty,empty> > (fnPtr, a1, a2);
+  return Callback<R,T1,T2,T3,T4> (impl);
+}
+template <typename R, typename TX1, typename TX2, typename ARG1, typename ARG2,
+          typename T1, typename T2,typename T3,typename T4,typename T5>
+Callback<R,T1,T2,T3,T4,T5> MakeBoundCallback (R (*fnPtr)(TX1,TX2,T1,T2,T3,T4,T5), ARG1 a1, ARG2 a2) {
+  Ptr<CallbackImpl<R,T1,T2,T3,T4,T5,empty,empty,empty,empty> > impl =
+    Create<TwoBoundFunctorCallbackImpl<R (*)(TX1,TX2,T1,T2,T3,T4,T5),R,TX1,TX2,T1,T2,T3,T4,T5,empty,empty> > (fnPtr, a1, a2);
+  return Callback<R,T1,T2,T3,T4,T5> (impl);
+}
+template <typename R, typename TX1, typename TX2, typename ARG1, typename ARG2,
+          typename T1, typename T2,typename T3,typename T4,typename T5, typename T6>
+Callback<R,T1,T2,T3,T4,T5,T6> MakeBoundCallback (R (*fnPtr)(TX1,TX2,T1,T2,T3,T4,T5,T6), ARG1 a1, ARG2 a2) {
+  Ptr<CallbackImpl<R,T1,T2,T3,T4,T5,T6,empty,empty,empty> > impl =
+    Create<TwoBoundFunctorCallbackImpl<R (*)(TX1,TX2,T1,T2,T3,T4,T5,T6),R,TX1,TX2,T1,T2,T3,T4,T5,T6,empty> > (fnPtr, a1, a2);
+  return Callback<R,T1,T2,T3,T4,T5,T6> (impl);
+}
+template <typename R, typename TX1, typename TX2, typename ARG1, typename ARG2,
+          typename T1, typename T2,typename T3,typename T4,typename T5, typename T6, typename T7>
+Callback<R,T1,T2,T3,T4,T5,T6,T7> MakeBoundCallback (R (*fnPtr)(TX1,TX2,T1,T2,T3,T4,T5,T6,T7), ARG1 a1, ARG2 a2) {
+  Ptr<CallbackImpl<R,T1,T2,T3,T4,T5,T6,T7,empty,empty> > impl =
+    Create<TwoBoundFunctorCallbackImpl<R (*)(TX1,TX2,T1,T2,T3,T4,T5,T6,T7),R,TX1,TX2,T1,T2,T3,T4,T5,T6,T7> > (fnPtr, a1, a2);
+  return Callback<R,T1,T2,T3,T4,T5,T6,T7> (impl);
+}
+/**@}*/
+
+/**
+ * \param a1 first bound argument
+ * \param a2 second bound argument 
+ * \param a3 third bound argument 
+ * \param fnPtr function pointer
+ * \return a bound Callback
+ * @{
+ */
+template <typename R, typename TX1, typename TX2, typename TX3, typename ARG1, typename ARG2, typename ARG3>
+Callback<R> MakeBoundCallback (R (*fnPtr)(TX1,TX2,TX3), ARG1 a1, ARG2 a2, ARG3 a3) {
+  Ptr<CallbackImpl<R,empty,empty,empty,empty,empty,empty,empty,empty,empty> > impl =
+    Create<ThreeBoundFunctorCallbackImpl<R (*)(TX1,TX2,TX3),R,TX1,TX2,TX3,empty,empty,empty,empty,empty,empty> >(fnPtr, a1, a2, a3);
+  return Callback<R> (impl);
+}
+template <typename R, typename TX1, typename TX2, typename TX3, typename ARG1, typename ARG2, typename ARG3,
+          typename T1>
+Callback<R,T1> MakeBoundCallback (R (*fnPtr)(TX1,TX2,TX3,T1), ARG1 a1, ARG2 a2, ARG3 a3) {
+  Ptr<CallbackImpl<R,T1,empty,empty,empty,empty,empty,empty,empty,empty> > impl =
+    Create<ThreeBoundFunctorCallbackImpl<R (*)(TX1,TX2,TX3,T1),R,TX1,TX2,TX3,T1,empty,empty,empty,empty,empty> > (fnPtr, a1, a2, a3);
+  return Callback<R,T1> (impl);
+}
+template <typename R, typename TX1, typename TX2, typename TX3, typename ARG1, typename ARG2, typename ARG3,
+          typename T1, typename T2>
+Callback<R,T1,T2> MakeBoundCallback (R (*fnPtr)(TX1,TX2,TX3,T1,T2), ARG1 a1, ARG2 a2, ARG3 a3) {
+  Ptr<CallbackImpl<R,T1,T2,empty,empty,empty,empty,empty,empty,empty> > impl =
+    Create<ThreeBoundFunctorCallbackImpl<R (*)(TX1,TX2,TX3,T1,T2),R,TX1,TX2,TX3,T1,T2,empty,empty,empty,empty> > (fnPtr, a1, a2, a3);
+  return Callback<R,T1,T2> (impl);
+}
+template <typename R, typename TX1, typename TX2, typename TX3, typename ARG1, typename ARG2, typename ARG3,
+          typename T1, typename T2,typename T3>
+Callback<R,T1,T2,T3> MakeBoundCallback (R (*fnPtr)(TX1,TX2,TX3,T1,T2,T3), ARG1 a1, ARG2 a2, ARG3 a3) {
+  Ptr<CallbackImpl<R,T1,T2,T3,empty,empty,empty,empty,empty,empty> > impl =
+    Create<ThreeBoundFunctorCallbackImpl<R (*)(TX1,TX2,TX3,T1,T2,T3),R,TX1,TX2,TX3,T1,T2,T3,empty,empty,empty> > (fnPtr, a1, a2, a3);
+  return Callback<R,T1,T2,T3> (impl);
+}
+template <typename R, typename TX1, typename TX2, typename TX3, typename ARG1, typename ARG2, typename ARG3,
+          typename T1, typename T2,typename T3,typename T4>
+Callback<R,T1,T2,T3,T4> MakeBoundCallback (R (*fnPtr)(TX1,TX2,TX3,T1,T2,T3,T4), ARG1 a1, ARG2 a2, ARG3 a3) {
+  Ptr<CallbackImpl<R,T1,T2,T3,T4,empty,empty,empty,empty,empty> > impl =
+    Create<ThreeBoundFunctorCallbackImpl<R (*)(TX1,TX2,TX3,T1,T2,T3,T4),R,TX1,TX2,TX3,T1,T2,T3,T4,empty,empty> > (fnPtr, a1, a2, a3);
+  return Callback<R,T1,T2,T3,T4> (impl);
+}
+template <typename R, typename TX1, typename TX2, typename TX3, typename ARG1, typename ARG2, typename ARG3,
+          typename T1, typename T2,typename T3,typename T4,typename T5>
+Callback<R,T1,T2,T3,T4,T5> MakeBoundCallback (R (*fnPtr)(TX1,TX2,TX3,T1,T2,T3,T4,T5), ARG1 a1, ARG2 a2, ARG3 a3) {
+  Ptr<CallbackImpl<R,T1,T2,T3,T4,T5,empty,empty,empty,empty> > impl =
+    Create<ThreeBoundFunctorCallbackImpl<R (*)(TX1,TX2,TX3,T1,T2,T3,T4,T5),R,TX1,TX2,TX3,T1,T2,T3,T4,T5,empty> > (fnPtr, a1, a2, a3);
+  return Callback<R,T1,T2,T3,T4,T5> (impl);
+}
+template <typename R, typename TX1, typename TX2, typename TX3, typename ARG1, typename ARG2, typename ARG3,
+          typename T1, typename T2,typename T3,typename T4,typename T5, typename T6>
+Callback<R,T1,T2,T3,T4,T5,T6> MakeBoundCallback (R (*fnPtr)(TX1,TX2,TX3,T1,T2,T3,T4,T5,T6), ARG1 a1, ARG2 a2, ARG3 a3) {
+  Ptr<CallbackImpl<R,T1,T2,T3,T4,T5,T6,empty,empty,empty> > impl =
+    Create<ThreeBoundFunctorCallbackImpl<R (*)(TX1,TX2,TX3,T1,T2,T3,T4,T5,T6),R,TX1,TX2,TX3,T1,T2,T3,T4,T5,T6> > (fnPtr, a1, a2, a3);
+  return Callback<R,T1,T2,T3,T4,T5,T6> (impl);
+}
+/**@}*/
+
+/**@}*/
+
 } // namespace ns3
 
 namespace ns3 {
 
+/**
+ * \ingroup callback
+ * AttributeValue form of a Callback
+ */
 class CallbackValue : public AttributeValue
 {
 public:
   CallbackValue ();
-  CallbackValue (const CallbackBase &base);
+  /**
+   * Copy constructor
+   * \param base Callback to copy
+   */
+  CallbackValue (const CallbackBase &base);  
   virtual ~CallbackValue ();
+  /** \param base the Callbackbase to use */
   void Set (CallbackBase base);
+  /**
+   * Give value my callback, if type compatible
+   *
+   * \param value destination callback
+   * \returns true if successful
+   */
   template <typename T>
   bool GetAccessor (T &value) const;
+  /** \return a copy of this CallBack */
   virtual Ptr<AttributeValue> Copy (void) const;
+  /**
+   * Serialize to string
+   * \param checker the checker to validate with
+   * \return serialize this pimpl
+   */
   virtual std::string SerializeToString (Ptr<const AttributeChecker> checker) const;
+  /**
+   * Deserialize from string (not implemented)
+   *
+   * \param value source string
+   * \param checker checker to validate with
+   * \return true if successful
+   */
   virtual bool DeserializeFromString (std::string value, Ptr<const AttributeChecker> checker);
 private:
-  CallbackBase m_value;
+  CallbackBase m_value;                 //!< the CallbackBase
 };
 
+/** Attribute helpers @{ */
 ATTRIBUTE_ACCESSOR_DEFINE (Callback);
 ATTRIBUTE_CHECKER_DEFINE (Callback);
+/**@}*/
 
 } // namespace ns3
 
diff -Naur ns-3.17/src/core/model/command-line.cc ns-3.18/src/core/model/command-line.cc
--- ns-3.17/src/core/model/command-line.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/command-line.cc	2013-10-26 07:07:30.035364393 -0700
@@ -18,12 +18,16 @@
  * Authors: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
 
-#include <cstdlib> // for exit
+#include <algorithm>  // for transform
+#include <cctype>     // for tolower
+#include <cstdlib>    // for exit
+#include <iomanip>    // for setw, boolalpha
 
 #include "command-line.h"
 #include "log.h"
 #include "config.h"
 #include "global-value.h"
+#include "system-path.h"
 #include "type-id.h"
 #include "string.h"
 
@@ -62,6 +66,8 @@
     {
       m_items.push_back (*i);
     }
+  m_usage = cmd.m_usage;
+  m_name  = cmd.m_name;
 }
 void
 CommandLine::Clear (void)
@@ -73,6 +79,20 @@
       delete *i;
     }
   m_items.clear ();
+  m_usage = "";
+  m_name  = "";
+}
+
+void
+CommandLine::Usage (const std::string usage)
+{
+  m_usage = usage;
+}
+
+std::string
+CommandLine::GetName () const
+{
+  return m_name;
 }
 
 CommandLine::Item::~Item ()
@@ -81,10 +101,12 @@
 }
 
 void
-CommandLine::Parse (int iargc, char *argv[]) const
+CommandLine::Parse (int iargc, char *argv[])
 {
   NS_LOG_FUNCTION (this << iargc << argv);
 
+  m_name = SystemPath::Split (argv[0]).back ();
+  
   int argc = iargc;
   for (argc--, argv++; argc > 0; argc--, argv++)
     {
@@ -125,91 +147,132 @@
 }
 
 void
-CommandLine::PrintHelp (void) const
+CommandLine::PrintHelp (std::ostream &os) const
 {
   NS_LOG_FUNCTION (this);
 
-  std::cout << "--PrintHelp: Print this help message." << std::endl;
-  std::cout << "--PrintGroups: Print the list of groups." << std::endl;
-  std::cout << "--PrintTypeIds: Print all TypeIds." << std::endl;
-  std::cout << "--PrintGroup=[group]: Print all TypeIds of group." << std::endl;
-  std::cout << "--PrintAttributes=[typeid]: Print all attributes of typeid." << std::endl;
-  std::cout << "--PrintGlobals: Print the list of globals." << std::endl;
+  os << m_name << " [Program Arguments] [General Arguments]"
+            << std::endl;
+  
+  if (m_usage.length ())
+    {
+      os << std::endl;
+      os << m_usage << std::endl;
+    }
+  
   if (!m_items.empty ())
     {
-      std::cout << "User Arguments:" << std::endl;
+      size_t width = 0;
+      for (Items::const_iterator i = m_items.begin (); i != m_items.end (); ++i)
+        {
+          width = std::max (width, (*i)->m_name.size ());
+        }
+      width += 3;
+
+      os << std::endl;
+      os << "Program Arguments:" << std::endl;
       for (Items::const_iterator i = m_items.begin (); i != m_items.end (); ++i)
         {
-          std::cout << "    --" << (*i)->m_name << ": " << (*i)->m_help << std::endl;
+          os << "    --"
+                    << std::left << std::setw (width) << ( (*i)->m_name + ":")
+                    << std::right
+                    << (*i)->m_help;
+
+          if ( (*i)->HasDefault ())
+            {
+              os << " [" << (*i)->GetDefault () << "]";
+            }
+          os << std::endl;
         }
     }
+
+  os << std::endl;
+  os
+    << "General Arguments:\n"
+    << "    --PrintGlobals:              Print the list of globals.\n"
+    << "    --PrintGroups:               Print the list of groups.\n"
+    << "    --PrintGroup=[group]:        Print all TypeIds of group.\n"
+    << "    --PrintTypeIds:              Print all TypeIds.\n"
+    << "    --PrintAttributes=[typeid]:  Print all attributes of typeid.\n"
+    << "    --PrintHelp:                 Print this help message.\n"
+    << std::endl;
 }
 
 void
-CommandLine::PrintGlobals (void) const
+CommandLine::PrintGlobals (std::ostream &os) const
 {
   NS_LOG_FUNCTION (this);
 
-  for (GlobalValue::Iterator i = GlobalValue::Begin (); i != GlobalValue::End (); ++i)
+  os << "Global values:" << std::endl;
+  
+  for (GlobalValue::Iterator i = GlobalValue::Begin ();
+       i != GlobalValue::End ();
+       ++i)
     {
-      std::cout << "    --" << (*i)->GetName () << "=[";
+      os << "    --" << (*i)->GetName () << "=[";
       Ptr<const AttributeChecker> checker = (*i)->GetChecker ();
       StringValue v;
       (*i)->GetValue (v);
-      std::cout << v.Get () << "]:  "
-                << (*i)->GetHelp () << std::endl;
+      os << v.Get () << "]" << std::endl;
+      os << "        " << (*i)->GetHelp () << std::endl;
     }
 }
 
 void
-CommandLine::PrintAttributes (std::string type) const
+CommandLine::PrintAttributes (std::ostream &os, const std::string &type) const
 {
   NS_LOG_FUNCTION (this);
 
   TypeId tid;
   if (!TypeId::LookupByNameFailSafe (type, &tid))
     {
-      NS_FATAL_ERROR ("Unknown type="<<type<<" in --PrintAttributes");
+      NS_FATAL_ERROR ("Unknown type=" << type << " in --PrintAttributes");
     }
+
+  os << "Attributes for TypeId " << tid.GetName () << std::endl;
+  
   for (uint32_t i = 0; i < tid.GetAttributeN (); ++i)
     {
-      std::cout << "    --"<<tid.GetAttributeFullName (i)<<"=[";
+      os << "    --" << tid.GetAttributeFullName (i) << "=[";
       struct TypeId::AttributeInformation info = tid.GetAttribute (i);
-      std::cout << info.initialValue->SerializeToString (info.checker) << "]:  "
-                << info.help << std::endl;
+      os << info.initialValue->SerializeToString (info.checker) << "]"
+                << std::endl;
+      os << "        " << info.help << std::endl;
     }
 }
 
 
 void
-CommandLine::PrintGroup (std::string group) const
+CommandLine::PrintGroup (std::ostream &os, const std::string &group) const
 {
   NS_LOG_FUNCTION (this);
 
+  os << "TypeIds in group " << group << ":" << std::endl;
+  
   for (uint32_t i = 0; i < TypeId::GetRegisteredN (); ++i)
     {
       TypeId tid = TypeId::GetRegistered (i);
       if (tid.GetGroupName () == group)
         {
-          std::cout << "    --PrintAttributes=" <<tid.GetName ()<<std::endl;
+          os << "    " <<tid.GetName () << std::endl;
         }
     }
 }
 
 void
-CommandLine::PrintTypeIds (void) const
+CommandLine::PrintTypeIds (std::ostream &os) const
 {
   NS_LOG_FUNCTION (this);
-
+  os << "Registered TypeIds:" << std::endl;
   for (uint32_t i = 0; i < TypeId::GetRegisteredN (); ++i)
     {
       TypeId tid = TypeId::GetRegistered (i);
-      std::cout << "    --PrintAttributes=" <<tid.GetName ()<<std::endl;
+      os << "    " << tid.GetName () << std::endl;
     }
 }
 
 void
-CommandLine::PrintGroups (void) const
+CommandLine::PrintGroups (std::ostream &os) const
 {
   NS_LOG_FUNCTION (this);
 
@@ -223,7 +286,9 @@
           continue;
         }
       bool found = false;
-      for (std::list<std::string>::const_iterator j = groups.begin (); j != groups.end (); ++j)
+      for (std::list<std::string>::const_iterator j = groups.begin ();
+           j != groups.end ();
+           ++j)
         {
           if (*j == group)
             {
@@ -236,52 +301,57 @@
           groups.push_back (group);
         }
     }
-  for (std::list<std::string>::const_iterator k = groups.begin (); k != groups.end (); ++k)
+  
+  os << "Registered TypeId groups:" << std::endl;
+  
+  for (std::list<std::string>::const_iterator k = groups.begin ();
+       k != groups.end ();
+       ++k)
     {
-      std::cout << "    --PrintGroup="<<*k<<std::endl;
+      os << "    " << *k << std::endl;
     }
 }
 
 void
-CommandLine::HandleArgument (std::string name, std::string value) const
+CommandLine::HandleArgument (const std::string &name, const std::string &value) const
 {
   NS_LOG_FUNCTION (this << name << value);
 
-  NS_LOG_DEBUG ("Handle arg name="<<name<<" value="<<value);
-  if (name == "PrintHelp")
+  NS_LOG_DEBUG ("Handle arg name=" << name << " value=" << value);
+  if (name == "PrintHelp" || name == "help")
     {
       // method below never returns.
-      PrintHelp ();
+      PrintHelp (std::cout);
       std::exit (0);
     } 
   else if (name == "PrintGroups")
     {
       // method below never returns.
-      PrintGroups ();
+      PrintGroups (std::cout);
       std::exit (0);
     }
   else if (name == "PrintTypeIds")
     {
       // method below never returns.
-      PrintTypeIds ();
+      PrintTypeIds (std::cout);
       std::exit (0);
     }
   else if (name == "PrintGlobals")
     {
       // method below never returns.
-      PrintGlobals ();
+      PrintGlobals (std::cout);
       std::exit (0);
     }
   else if (name == "PrintGroup")
     {
       // method below never returns.
-      PrintGroup (value);
+      PrintGroup (std::cout, value);
       std::exit (0);
     }
   else if (name == "PrintAttributes")
     {
       // method below never returns.
-      PrintAttributes (value);
+      PrintAttributes (std::cout, value);
       std::exit (0);
     }
   else
@@ -292,7 +362,8 @@
             {
               if (!(*i)->Parse (value))
                 {
-                  std::cerr << "Invalid argument value: "<<name<<"="<<value << std::endl;
+                  std::cerr << "Invalid argument value: "
+                            << name << "=" << value << std::endl;
                   std::exit (1);
                 }
               else
@@ -305,14 +376,15 @@
   if (!Config::SetGlobalFailSafe (name, StringValue (value))
       && !Config::SetDefaultFailSafe (name, StringValue (value)))
     {
-      std::cerr << "Invalid command-line arguments: --"<<name<<"="<<value<<std::endl;
-      PrintHelp ();
+      std::cerr << "Invalid command-line arguments: --"
+                << name << "=" << value << std::endl;
+      PrintHelp (std::cerr);
       std::exit (1);
     }
 }
 
 bool
-CommandLine::CallbackItem::Parse (std::string value)
+CommandLine::CallbackItem::Parse (const std::string value)
 {
   NS_LOG_FUNCTION (this);
   NS_LOG_DEBUG ("CommandLine::CallbackItem::Parse \"" << value << "\"");
@@ -332,4 +404,57 @@
   m_items.push_back (item);
 }
 
+
+bool
+CommandLine::Item::HasDefault () const
+{
+  return false;
+}
+
+std::string
+CommandLine::Item::GetDefault () const
+{
+  return "";
+}
+
+template <>
+std::string
+CommandLineHelper::GetDefault<bool> (const bool & val)
+{
+  std::ostringstream oss;
+  oss << std::boolalpha << val;
+  return oss.str ();
+}
+
+template <>
+bool
+CommandLineHelper::UserItemParse<bool> (const std::string value, bool & val)
+{
+  std::string src = value;
+  std::transform(src.begin(), src.end(), src.begin(), ::tolower);
+  
+  if (src.length () == 0)
+    {
+      val = ! val;
+      return true;
+    }
+  else if ( (src == "true") || (src == "t") )
+    {
+      val = true;
+      return true;
+    }
+  else if ( (src == "false") || (src == "f"))
+    {
+      val = false;
+      return true;
+    }
+  else
+    {
+      std::istringstream iss;
+      iss.str (src);
+      iss >> val;
+      return !iss.bad () && !iss.fail ();
+    }
+}
+
 } // namespace ns3
diff -Naur ns-3.17/src/core/model/command-line.h ns-3.18/src/core/model/command-line.h
--- ns-3.17/src/core/model/command-line.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/command-line.h	2013-10-26 07:07:30.023364392 -0700
@@ -29,35 +29,159 @@
 namespace ns3 {
 
 /**
- * \brief parse command-line arguments
  * \ingroup core
+ * \defgroup commandline Command Line Parsing
+ *
+ * A uniform way to specify program documentation,
+ * allowed command line arguments and help strings,
+ * and set any attribute or global value, all from
+ * the command line directly.
+ *
+ * The main entry point is CommandLine
+ */
+/**
+ * \ingroup commandline
+ * \brief Parse command-line arguments
  *
  * Instances of this class can be used to parse command-line 
- * arguments: users can register new arguments with
- * CommandLine::AddValue but the most important functionality
- * provided by this class is that it can be used to set the
- * 'initial value' of every attribute in the system with the
- * \verbatim
- *   --TypeIdName::AttributeName=value
- * \endverbatim
- * syntax and it can be used to set the value of every GlobalValue
- * in the system with the
- * \verbatim
- *   --GlobalValueName=value
- * \endverbatim
- * syntax.
+ * arguments.  Programs can register a general usage message with
+ * CommandLine::Usage, and arguments with CommandLine::AddValue.
+ * POD argument variables will be set directly; more general arguments
+ * can be processed via a Callback.
+ *
+ * CommandLine also provides handlers for these standard arguments:
+ * \code
+ *   --PrintGlobals:              Print the list of globals.
+ *   --PrintGroups:               Print the list of groups.
+ *   --PrintGroup=[group]:        Print all TypeIds of group.
+ *   --PrintTypeIds:              Print all TypeIds.
+ *   --PrintAttributes=[typeid]:  Print all attributes of typeid.
+ *   --PrintHelp:                 Print this help message.
+ * \endcode
+ * 
+ * The more common \c --help is a synonym for \c --PrintHelp; an example
+ * is given below.
+ *
+ * Finally, CommandLine processes Attribute and GlobalValue arguments.
+ *
+ * In use, arguments are given in the form
+ * \code
+ *   --arg=value --toggle
+ * \endcode
+ * Most arguments expect a value, as in the first form, \c --arg=value.
+ * Toggles, corresponding to boolean arguments, can be given in any of
+ * the forms
+ * \code
+ *   --toggle1 --toggle2=1 --toggle3=t --toggle4=true
+ * \endcode
+ * The first form changes the state of toggle1 from its default; 
+ * all the rest set the corresponding boolean variable to true.
+ * \c 0, \c f and \c false are accepted to set the variable to false.
+ *
+ * CommandLine can set the initial value of every attribute in the system
+ * with the 
+ * \c --TypeIdName::AttributeName=value syntax, for example
+ * \code
+ *   --Application::StartTime=3s
+ * \endcode
+ *
+ * CommandLine can also set the value of every GlobalValue
+ * in the system with the \c --GlobalValueName=value syntax, for example
+ * \code
+ *   --SchedulerType=HeapScheduler
+ * \endcode
+ *
+ * A simple example is in \c src/core/example/command-line-example.cc
+ * The heart of that example is this code:
+ *
+ * \code
+ *    int         intArg  = 1;
+ *    bool        boolArg = false;
+ *    std::string strArg  = "strArg default";
+ *  
+ *  CommandLine cmd;
+ *  cmd.Usage ("CommandLine example program.\n"
+ *             "\n"
+ *             "This little program demonstrates how to use CommandLine.");
+ *    cmd.AddValue ("intArg",  "an int argument",       intArg);
+ *    cmd.AddValue ("boolArg", "a bool argument",       boolArg);
+ *    cmd.AddValue ("strArg",  "a string argument",     strArg);
+ *    cmd.AddValue ("cbArg",   "a string via callback", MakeCallback (SetCbArg));
+ *  cmd.Parse (argc, argv);
+ * \endcode
+ * after which it prints the values of each variable.  (The \c SetCbArg function
+ * is not shown.)
+ *
+ * Here is the output from a few runs of that program:
+ *
+ * \code
+ *   $ ./waf --run="command-line-example"
+ *   intArg:   1
+ *   boolArg:  false
+ *   strArg:   "strArg default"
+ *   cbArg:    "cbArg default"
+ *
+ *   $ ./waf --run="command-line-example --intArg=2 --boolArg --strArg=Hello --cbArg=World"
+ *   intArg:   2
+ *   boolArg:  true
+ *   strArg:   "Hello"
+ *   cbArg:    "World"
+ *   
+ *   $ ./waf --run="command-line-example --help"
+ *   ns3-dev-command-line-example-debug [Program Arguments] [General Arguments]
+ *   
+ *   CommandLine example program.
+ *   
+ *   This little program demonstrates how to use CommandLine.
+ *   
+ *   Program Arguments:
+ *       --intArg:   an int argument [1]
+ *       --boolArg:  a bool argument [false]
+ *       --strArg:   a string argument [strArg default]
+ *       --cbArg:    a string via callback
+ *   
+ *   General Arguments:
+ *       --PrintGlobals:              Print the list of globals.
+ *       --PrintGroups:               Print the list of groups.
+ *       --PrintGroup=[group]:        Print all TypeIds of group.
+ *       --PrintTypeIds:              Print all TypeIds.
+ *       --PrintAttributes=[typeid]:  Print all attributes of typeid.
+ *       --PrintHelp:                 Print this help message.
+ * \endcode
  */
 class CommandLine
 {
 public:
+  /** Constructor */
   CommandLine ();
+  /**
+   * Copy constructor
+   *
+   * \param cmd the CommandLine to copy from
+   */
   CommandLine (const CommandLine &cmd);
+  /**
+   * Assignment
+   *
+   * \param cmd the CommandLine to assign from
+   * \return the CommandLine
+   */
   CommandLine &operator = (const CommandLine &cmd);
+  /** Destructor */
   ~CommandLine ();
 
   /**
-   * \param name the name of the user-supplied argument
-   * \param help some help text used by --PrintHelp
+   * Supply the program usage and documentation.
+   *
+   * \param usage Program usage message to write with \c --help.
+   */
+  void Usage (const std::string usage);
+  
+  /**
+   * Add a program argument, assigning to POD
+   *
+   * \param name the name of the program-supplied argument
+   * \param help the help text used by \c \-\-PrintHelp
    * \param value a reference to the variable where the
    *        value parsed will be stored (if no value
    *        is parsed, this variable is not modified).
@@ -69,16 +193,23 @@
 
 
   /**
-   * \param name the name of the user-supplied argument
-   * \param help some help text used by --PrintHelp
-   * \param callback a callback function that will be invoked to parse
-   * and collect the value.  This normally used by language bindings.
+   * Add a program argument, using a Callback to parse the value
+   *
+   * \param name the name of the program-supplied argument
+   * \param help the help text used by \c --help
+   * \param callback a Callback function that will be invoked to parse and
+   *   store the value.
+   *
+   * The callback should have the signature
+   * <tt>bool callback (const std::string value)</tt>
    */
   void AddValue (const std::string &name,
                  const std::string &help,
                  Callback<bool, std::string> callback);
 
   /**
+   * Parse the program arguments
+   *
    * \param argc the 'argc' variable: number of arguments (including the
    *        main program name as first element).
    * \param argv the 'argv' variable: a null-terminated array of strings,
@@ -86,45 +217,188 @@
    * 
    * Obviously, this method will parse the input command-line arguments and
    * will attempt to handle them all.
+   *
+   * As a side effect, this method saves the program basename, which
+   * can be retrieved by GetName().
    */
-  void Parse (int argc, char *argv[]) const;
+  void Parse (int argc, char *argv[]);
+
+  /**
+   * Get the program name
+   *
+   * \return the program name.  Only valid after calling Parse()
+   */
+  std::string GetName () const;
+
+  /**
+   * \brief Print program usage to the desired output stream
+   *
+   * Handler for \c \-\-PrintHelp and \c \-\-help:  print Usage(), argument names, and help strings
+   *
+   * Alternatively, an overloaded operator << can be used:
+   * @code
+   *       CommandLine cmd;
+   *       cmd.Parse (argc, argv);
+   *     ...
+   *
+   *       std::cerr << cmd;
+   * @endcode
+   */
+  void PrintHelp (std::ostream &os) const;
+
 private:
+
+  /**
+   * \ingroup commandline
+   * \brief The argument base class
+   */
   class Item 
   {
-public:
-    std::string m_name;
-    std::string m_help;
-    virtual ~Item ();
-    virtual bool Parse (std::string value) = 0;
+  public:
+    std::string m_name;       /**< Argument label:  \c \-\--m_name=... */
+    std::string m_help;       /**< Argument help string */
+    virtual ~Item ();         /**< Destructor */
+    /**
+     * Parse from a string.
+     *
+     * \param value the string representation
+     * \return true if parsing the value succeeded
+     */
+    virtual bool Parse (const std::string value) = 0;
+    /**
+     * \return true if this item have a default value?
+     */
+    virtual bool HasDefault () const;
+    /**
+     * \return the default value
+     */
+    virtual std::string GetDefault () const;
   };
+
+  /**
+   * \ingroup commandline
+   *\brief An argument Item assigning to POD
+   */
   template <typename T>
   class UserItem : public Item
   {
-public:
-    virtual bool Parse (std::string value);
-    T *m_valuePtr;
+  public:
+    /**
+     * Parse from a string.
+     *
+     * \param value the string representation
+     * \return true if parsing the value succeeded
+     */
+    virtual bool Parse (const std::string value);
+
+    bool HasDefault () const;
+    std::string GetDefault () const;
+      
+    T *m_valuePtr;            /**< Pointer to the POD location */
+    std::string m_default;    /**< String representation of default value */
   };
+
+  /**
+   * \ingroup commandline
+   * \brief An argument Item using a Callback to parse the input
+   */
   class CallbackItem : public Item
   {
-public:
-    virtual bool Parse (std::string value);
-    Callback<bool, std::string> m_callback;
+  public:
+    /**
+     * Parse from a string.
+     *
+     * \param value the string representation
+     * \return true if parsing the value succeeded
+     */
+    virtual bool Parse (const std::string value);
+    Callback<bool, std::string> m_callback;  /**< The Callback */
   };
 
-  void HandleArgument (std::string name, std::string value) const;
-  void PrintHelp (void) const;
-  void PrintGlobals (void) const;
-  void PrintAttributes (std::string type) const;
-  void PrintGroup (std::string group) const;
-  void PrintTypeIds (void) const;
-  void PrintGroups (void) const;
+  /**
+   * Match name against the program or general arguments,
+   * and dispatch to the appropriate handler.
+   *
+   * \param name the argument name
+   * \param value the command line value
+   */
+  void HandleArgument (const std::string &name, const std::string &value) const;
+  /** Handler for \c \-\-PrintGlobals:  print all global variables and values */
+  void PrintGlobals (std::ostream &os) const;
+  /**
+   * Handler for \c \-\-PrintAttributes:  print the attributes for a given type.
+   *
+   * \param type the TypeId whose Attributes should be displayed
+   */
+  void PrintAttributes (std::ostream &os, const std::string &type) const;
+  /**
+   * Handler for \c \-\-PrintGroup:  print all types belonging to a given group.
+   *
+   * \param group the name of the TypeId group to display
+   */
+  void PrintGroup (std::ostream &os, const std::string &group) const;
+  /** Handler for \c \-\-PrintTypeIds:  print all TypeId names. */
+  void PrintTypeIds (std::ostream &os) const;
+  /** Handler for \c \-\-PrintGroups:  print all TypeId group names */
+  void PrintGroups (std::ostream &os) const;
+  /**
+   * Copy constructor
+   *
+   * \param cmd CommandLine to copy
+   */
   void Copy (const CommandLine &cmd);
+  /** Remove all arguments, Usage(), name */
   void Clear (void);
 
-  typedef std::list<Item *> Items;
-  Items m_items;
-};
+  typedef std::list<Item *> Items;      /**< Argument list container */
+  Items m_items;                        /**< The list of arguments */
+  std::string m_usage;                  /**< The Usage string */
+  std::string m_name;                   /**< The program name */
+};  // class CommandLine
 
+
+/** \ingroup commandline
+ *  \defgroup commandlinehelper Helpers to specialize on bool
+ */
+/**
+ * \ingroup commandlinehelper
+ * \brief Helpers for CommandLine to specialize on bool
+ */
+namespace CommandLineHelper {
+
+  /**
+   * \ingroup commandlinehelper
+   * \brief Helper to specialize UserItem::Parse on bool
+   *
+   * \param value the argument name
+   * \param val the argument location
+   * \return true if parsing was successful
+   * @{
+   */
+  template <typename T>
+  bool UserItemParse (const std::string value, T & val);
+  template <>
+  bool UserItemParse<bool> (const std::string value, bool & val);
+  /**@}*/
+
+  /**
+   * \ingroup commandlinehelper
+   * \brief Helper to specialize UserItem::GetDefault on bool
+   *
+   * \param val the argument value
+   * \return the string representation of value
+   * @{
+   */
+  template <typename T>
+  std::string GetDefault (const T & val);
+  template <>
+  std::string GetDefault<bool> (const bool & val);
+  /**@}*/
+
+}  // namespace CommandLineHelper
+    
+  
+  
 } // namespace ns3
 
 namespace ns3 {
@@ -139,16 +413,53 @@
   item->m_name = name;
   item->m_help = help;
   item->m_valuePtr = &value;
+  
+  std::stringstream ss;
+  ss << value;
+  ss >> item->m_default;
+    
   m_items.push_back (item);
 }
 
+
+template <typename T>
+bool
+CommandLine::UserItem<T>::HasDefault () const
+{
+  return true;
+}
+
+template <typename T>
+std::string
+CommandLine::UserItem<T>::GetDefault () const
+{
+  return CommandLineHelper::GetDefault<T> (*m_valuePtr);
+}
+
+template <typename T>
+std::string
+CommandLineHelper::GetDefault (const T & val)
+{
+  std::ostringstream oss;
+  oss << val;
+  return oss.str ();
+}
+
+
+template <typename T>
+bool
+CommandLine::UserItem<T>::Parse (const std::string value)
+{
+  return CommandLineHelper::UserItemParse<T> (value, *m_valuePtr);
+}
+
 template <typename T>
-bool 
-CommandLine::UserItem<T>::Parse (std::string value)
+bool
+CommandLineHelper::UserItemParse (const std::string value, T & val)
 {
   std::istringstream iss;
   iss.str (value);
-  iss >> (*m_valuePtr);
+  iss >> val;
   return !iss.bad () && !iss.fail ();
 }
 
diff -Naur ns-3.17/src/core/model/default-simulator-impl.cc ns-3.18/src/core/model/default-simulator-impl.cc
--- ns-3.17/src/core/model/default-simulator-impl.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/default-simulator-impl.cc	2013-10-26 07:07:30.039364393 -0700
@@ -393,8 +393,8 @@
 Time 
 DefaultSimulatorImpl::GetMaximumSimulationTime (void) const
 {
-  // XXX: I am fairly certain other compilers use other non-standard
-  // post-fixes to indicate 64 bit constants.
+  /// \todo I am fairly certain other compilers use other non-standard
+  /// post-fixes to indicate 64 bit constants.
   return TimeStep (0x7fffffffffffffffLL);
 }
 
diff -Naur ns-3.17/src/core/model/default-simulator-impl.h ns-3.18/src/core/model/default-simulator-impl.h
--- ns-3.17/src/core/model/default-simulator-impl.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/default-simulator-impl.h	2013-10-26 07:07:30.035364393 -0700
@@ -33,6 +33,9 @@
 
 namespace ns3 {
 
+/**
+ * \ingroup simulator
+ */
 class DefaultSimulatorImpl : public SimulatorImpl
 {
 public:
diff -Naur ns-3.17/src/core/model/event-id.h ns-3.18/src/core/model/event-id.h
--- ns-3.17/src/core/model/event-id.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/event-id.h	2013-10-26 07:07:30.027364392 -0700
@@ -29,7 +29,7 @@
 class EventImpl;
 
 /**
- * \ingroup core
+ * \ingroup events
  * \brief an identifier for simulation events.
  *
  * Each EventId identifies a unique event scheduled with one
diff -Naur ns-3.17/src/core/model/event-impl.h ns-3.18/src/core/model/event-impl.h
--- ns-3.17/src/core/model/event-impl.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/event-impl.h	2013-10-26 07:07:30.031364393 -0700
@@ -26,7 +26,7 @@
 namespace ns3 {
 
 /**
- * \ingroup core
+ * \ingroup events
  * \brief a simulation event
  *
  * Each subclass of this base class represents a simulation event. The
diff -Naur ns-3.17/src/core/model/hash.cc ns-3.18/src/core/model/hash.cc
--- ns-3.17/src/core/model/hash.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/core/model/hash.cc	2013-10-26 07:07:30.047364393 -0700
@@ -0,0 +1,48 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2012 Lawrence Livermore National Laboratory
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Peter D. Barnes, Jr. <pdbarnes@llnl.gov>
+ */
+
+#include "log.h"
+#include "hash.h"
+
+
+namespace ns3 {
+
+NS_LOG_COMPONENT_DEFINE ("Hash");
+
+Hasher::Hasher ()
+{
+  m_impl = Create <Hash::Function::Murmur3> ();
+  NS_ASSERT (m_impl != 0);
+}
+
+Hasher::Hasher (Ptr<Hash::Implementation> hp)
+  : m_impl (hp)
+{
+  NS_ASSERT (m_impl != 0);
+}
+
+Hasher &
+Hasher::clear (void)
+{
+  m_impl->clear ();
+  return *this;
+}
+
+}  // namespace ns3
diff -Naur ns-3.17/src/core/model/hash-fnv.cc ns-3.18/src/core/model/hash-fnv.cc
--- ns-3.17/src/core/model/hash-fnv.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/core/model/hash-fnv.cc	2013-10-26 07:07:30.043364393 -0700
@@ -0,0 +1,764 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2012 Lawrence Livermore National Laboratory
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Peter D. Barnes, Jr. <pdbarnes@llnl.gov>
+ *
+ * This copyright notice applies strictly to the wrapper material.
+ *
+ * The FNV source code itself is in the public domain.  The FNV source
+ * code sections are marked by
+ *   // Begin <fnv-file> ---->
+ * and
+ *   // End <fnv-file>   ---->
+ * comments.
+ *
+ * Changes from the FNV distribution are marked with `//PDB'
+ */
+
+#include <sys/types.h>
+#include <stdlib.h>
+
+#include "log.h"
+#include "hash-fnv.h"
+
+
+namespace ns3 {
+
+NS_LOG_COMPONENT_DEFINE ("Hash-Fnv");
+
+namespace Hash {
+
+namespace Function {
+
+namespace Fnv1aImplementation {
+
+/*************************************************
+ **  class FnvHashImplementation
+ ************************************************/
+
+extern "C" {
+
+// Changes from FNV distribution are marked with `//PDB'
+//
+
+// Begin fnv.h ----------------------------------->
+
+/*
+ * fnv - Fowler/Noll/Vo- hash code
+ *
+ * @(#) $Revision: 5.4 $
+ * @(#) $Id: fnv.h,v 5.4 2009/07/30 22:49:13 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/fnv/RCS/fnv.h,v $
+ *
+ ***
+ *
+ * Fowler/Noll/Vo- hash
+ *
+ * The basis of this hash algorithm was taken from an idea sent
+ * as reviewer comments to the IEEE POSIX P1003.2 committee by:
+ *
+ *      Phong Vo (http://www.research.att.com/info/kpv/)
+ *      Glenn Fowler (http://www.research.att.com/~gsf/)
+ *
+ * In a subsequent ballot round:
+ *
+ *      Landon Curt Noll (http://www.isthe.com/chongo/)
+ *
+ * improved on their algorithm.  Some people tried this hash
+ * and found that it worked rather well.  In an EMail message
+ * to Landon, they named it the ``Fowler/Noll/Vo'' or FNV hash.
+ *
+ * FNV hashes are designed to be fast while maintaining a low
+ * collision rate. The FNV speed allows one to quickly hash lots
+ * of data while maintaining a reasonable collision rate.  See:
+ *
+ *      http://www.isthe.com/chongo/tech/comp/fnv/index.html
+ *
+ * for more details as well as other forms of the FNV hash.
+ *
+ ***
+ *
+ * NOTE: The FNV-0 historic hash is not recommended.  One should use
+ *	 the FNV-1 hash instead.
+ *
+ * To use the 32 bit FNV-0 historic hash, pass FNV0_32_INIT as the
+ * Fnv32_t hashval argument to fnv_32_buf() or fnv_32_str().
+ *
+ * To use the 64 bit FNV-0 historic hash, pass FNV0_64_INIT as the
+ * Fnv64_t hashval argument to fnv_64_buf() or fnv_64_str().
+ *
+ * To use the recommended 32 bit FNV-1 hash, pass FNV1_32_INIT as the
+ * Fnv32_t hashval argument to fnv_32_buf() or fnv_32_str().
+ *
+ * To use the recommended 64 bit FNV-1 hash, pass FNV1_64_INIT as the
+ * Fnv64_t hashval argument to fnv_64_buf() or fnv_64_str().
+ *
+ * To use the recommended 32 bit FNV-1a hash, pass FNV1_32A_INIT as the
+ * Fnv32_t hashval argument to fnv_32a_buf() or fnv_32a_str().
+ *
+ * To use the recommended 64 bit FNV-1a hash, pass FNV1A_64_INIT as the
+ * Fnv64_t hashval argument to fnv_64a_buf() or fnv_64a_str().
+ *
+ ***
+ *
+ * Please do not copyright this code.  This code is in the public domain.
+ *
+ * LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+ * EVENT SHALL LANDON CURT NOLL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+ * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * By:
+ *	chongo <Landon Curt Noll> /\oo/\
+ *      http://www.isthe.com/chongo/
+ *
+ * Share and Enjoy!	:-)
+ */
+
+#if !defined(__FNV_H__)
+#define __FNV_H__
+
+
+//#include <sys/types.h>  //PDB
+
+#define FNV_VERSION "5.0.2"	/* @(#) FNV Version */
+
+
+/*
+ * 32 bit FNV-0 hash type
+ */
+typedef u_int32_t Fnv32_t;
+
+
+/*
+ * 32 bit FNV-0 zero initial basis
+ *
+ * This historic hash is not recommended.  One should use
+ * the FNV-1 hash and initial basis instead.
+ *
+ * Use fully qualified type so this define works outside this scope //PDB
+ */
+#define FNV0_32_INIT ((Fnv1aImplementation::Fnv32_t)0)
+
+
+/*
+ * 32 bit FNV-1 and FNV-1a non-zero initial basis
+ *
+ * The FNV-1 initial basis is the FNV-0 hash of the following 32 octets:
+ *
+ *              chongo <Landon Curt Noll> /\../\
+ *
+ * NOTE: The \'s above are not back-slashing escape characters.
+ * They are literal ASCII  backslash 0x5c characters.
+ *
+ * NOTE: The FNV-1a initial basis is the same value as FNV-1 by definition.
+ *
+ * Use fully qualified type so this define works outside this scope //PDB
+ */
+#define FNV1_32_INIT ((Fnv1aImplementation::Fnv32_t)0x811c9dc5)
+#define FNV1_32A_INIT FNV1_32_INIT
+
+
+/*
+ * determine how 64 bit unsigned values are represented
+ */
+//#include "longlong.h"  //PDB - assume `unsigned long long' is 64 bit
+#define HAVE_64BIT_LONG_LONG  
+  
+
+
+/*
+ * 64 bit FNV-0 hash
+ */
+#if defined(HAVE_64BIT_LONG_LONG)
+typedef u_int64_t Fnv64_t;
+#else /* HAVE_64BIT_LONG_LONG */
+typedef struct {
+    u_int32_t w32[2]; /* w32[0] is low order, w32[1] is high order word */
+} Fnv64_t;
+#endif /* HAVE_64BIT_LONG_LONG */
+
+
+/*
+ * 64 bit FNV-0 zero initial basis
+ *
+ * This historic hash is not recommended.  One should use
+ * the FNV-1 hash and initial basis instead.
+ *
+ * Use fully qualified type so this define works outside this scope //PDB
+ */
+#if defined(HAVE_64BIT_LONG_LONG)
+#define FNV0_64_INIT ((Fnv1aImplementation::Fnv64_t)0)
+#else /* HAVE_64BIT_LONG_LONG */
+extern const Fnv64_t fnv0_64_init;
+#define FNV0_64_INIT (Fnv1aImplementation::fnv0_64_init)
+#endif /* HAVE_64BIT_LONG_LONG */
+
+
+/*
+ * 64 bit FNV-1 non-zero initial basis
+ *
+ * The FNV-1 initial basis is the FNV-0 hash of the following 32 octets:
+ *
+ *              chongo <Landon Curt Noll> /\../\
+ *
+ * NOTE: The \'s above are not back-slashing escape characters.
+ * They are literal ASCII  backslash 0x5c characters.
+ *
+ * NOTE: The FNV-1a initial basis is the same value as FNV-1 by definition.
+ */
+#if defined(HAVE_64BIT_LONG_LONG)
+#define FNV1_64_INIT ((Fnv1aImplementation::Fnv64_t)0xcbf29ce484222325ULL)
+#define FNV1A_64_INIT FNV1_64_INIT
+#else /* HAVE_64BIT_LONG_LONG */
+extern const fnv1_64_init;
+extern const Fnv64_t fnv1a_64_init;
+#define FNV1_64_INIT (fnv1_64_init)
+#define FNV1A_64_INIT (fnv1a_64_init)
+#endif /* HAVE_64BIT_LONG_LONG */
+
+
+/*
+ * hash types
+ */
+enum fnv_type {
+    FNV_NONE = 0,	/* invalid FNV hash type */
+    FNV0_32 = 1,	/* FNV-0 32 bit hash */
+    FNV1_32 = 2,	/* FNV-1 32 bit hash */
+    FNV1a_32 = 3,	/* FNV-1a 32 bit hash */
+    FNV0_64 = 4,	/* FNV-0 64 bit hash */
+    FNV1_64 = 5,	/* FNV-1 64 bit hash */
+    FNV1a_64 = 6,	/* FNV-1a 64 bit hash */
+};
+
+//PDB  test vector declarations deleted
+
+/*
+ * external functions  //PDB converted to forward declarations
+ */
+/* hash_32.c */
+/* extern */ Fnv32_t fnv_32_buf(void *buf, size_t len, Fnv32_t hashval);
+/* extern */ Fnv32_t fnv_32_str(char *buf, Fnv32_t hashval);
+
+/* hash_32a.c */
+/* extern */ Fnv32_t fnv_32a_buf(void *buf, size_t len, Fnv32_t hashval);
+/* extern */ Fnv32_t fnv_32a_str(char *buf, Fnv32_t hashval);
+
+/* hash_64.c */
+/* extern */ Fnv64_t fnv_64_buf(void *buf, size_t len, Fnv64_t hashval);
+/* extern */ Fnv64_t fnv_64_str(char *buf, Fnv64_t hashval);
+
+/* hash_64a.c */
+/* extern */ Fnv64_t fnv_64a_buf(void *buf, size_t len, Fnv64_t hashval);
+/* extern */ Fnv64_t fnv_64a_str(char *buf, Fnv64_t hashval);
+
+//PDB  test vector declarations deleted
+
+
+#endif /* __FNV_H__ */
+
+// End fnv.h ------------------------------->
+
+// Begin hash_32a.c ------------------------------>
+
+/*
+ * hash_32 - 32 bit Fowler/Noll/Vo FNV-1a hash code
+ *
+ * @(#) $Revision: 5.1 $
+ * @(#) $Id: hash_32a.c,v 5.1 2009/06/30 09:13:32 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/fnv/RCS/hash_32a.c,v $
+ *
+ ***
+ *
+ * Fowler/Noll/Vo hash
+ *
+ * The basis of this hash algorithm was taken from an idea sent
+ * as reviewer comments to the IEEE POSIX P1003.2 committee by:
+ *
+ *      Phong Vo (http://www.research.att.com/info/kpv/)
+ *      Glenn Fowler (http://www.research.att.com/~gsf/)
+ *
+ * In a subsequent ballot round:
+ *
+ *      Landon Curt Noll (http://www.isthe.com/chongo/)
+ *
+ * improved on their algorithm.  Some people tried this hash
+ * and found that it worked rather well.  In an EMail message
+ * to Landon, they named it the ``Fowler/Noll/Vo'' or FNV hash.
+ *
+ * FNV hashes are designed to be fast while maintaining a low
+ * collision rate. The FNV speed allows one to quickly hash lots
+ * of data while maintaining a reasonable collision rate.  See:
+ *
+ *      http://www.isthe.com/chongo/tech/comp/fnv/index.html
+ *
+ * for more details as well as other forms of the FNV hash.
+ ***
+ *
+ * To use the recommended 32 bit FNV-1a hash, pass FNV1_32A_INIT as the
+ * Fnv32_t hashval argument to fnv_32a_buf() or fnv_32a_str().
+ *
+ ***
+ *
+ * Please do not copyright this code.  This code is in the public domain.
+ *
+ * LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+ * EVENT SHALL LANDON CURT NOLL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+ * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * By:
+ *	chongo <Landon Curt Noll> /\oo/\
+ *      http://www.isthe.com/chongo/
+ *
+ * Share and Enjoy!	:-)
+ */
+
+//#include <stdlib.h>    //PDB
+//#include "fnv.h"       //PDB
+
+
+/*
+ * 32 bit magic FNV-1a prime
+ */
+#define FNV_32_PRIME ((Fnv1aImplementation::Fnv32_t)0x01000193)
+
+
+/*
+ * fnv_32a_buf - perform a 32 bit Fowler/Noll/Vo FNV-1a hash on a buffer
+ *
+ * input:
+ *	buf	- start of buffer to hash
+ *	len	- length of buffer in octets
+ *	hval	- previous hash value or 0 if first call
+ *
+ * returns:
+ *	32 bit hash as a static hash type
+ *
+ * NOTE: To use the recommended 32 bit FNV-1a hash, use FNV1_32A_INIT as the
+ * 	 hval arg on the first call to either fnv_32a_buf() or fnv_32a_str().
+ */
+Fnv32_t
+fnv_32a_buf(void *buf, size_t len, Fnv32_t hval)
+{
+    unsigned char *bp = (unsigned char *)buf;	/* start of buffer */
+    unsigned char *be = bp + len;		/* beyond end of buffer */
+
+    /*
+     * FNV-1a hash each octet in the buffer
+     */
+    while (bp < be) {
+
+	/* xor the bottom with the current octet */
+	hval ^= (Fnv32_t)*bp++;
+
+	/* multiply by the 32 bit FNV magic prime mod 2^32 */
+#if defined(NO_FNV_GCC_OPTIMIZATION)
+	hval *= FNV_32_PRIME;
+#else
+	hval += (hval<<1) + (hval<<4) + (hval<<7) + (hval<<8) + (hval<<24);
+#endif
+    }
+
+    /* return our new hash value */
+    return hval;
+}
+
+
+/*
+ * fnv_32a_str - perform a 32 bit Fowler/Noll/Vo FNV-1a hash on a string
+ *
+ * input:
+ *	str	- string to hash
+ *	hval	- previous hash value or 0 if first call
+ *
+ * returns:
+ *	32 bit hash as a static hash type
+ *
+ * NOTE: To use the recommended 32 bit FNV-1a hash, use FNV1_32A_INIT as the
+ *  	 hval arg on the first call to either fnv_32a_buf() or fnv_32a_str().
+ */
+Fnv32_t
+fnv_32a_str(char *str, Fnv32_t hval)
+{
+    unsigned char *s = (unsigned char *)str;	/* unsigned string */
+
+    /*
+     * FNV-1a hash each octet in the buffer
+     */
+    while (*s) {
+
+	/* xor the bottom with the current octet */
+	hval ^= (Fnv32_t)*s++;
+
+	/* multiply by the 32 bit FNV magic prime mod 2^32 */
+#if defined(NO_FNV_GCC_OPTIMIZATION)
+	hval *= FNV_32_PRIME;
+#else
+	hval += (hval<<1) + (hval<<4) + (hval<<7) + (hval<<8) + (hval<<24);
+#endif
+    }
+
+    /* return our new hash value */
+    return hval;
+}
+  
+// End hash_32a.c -------------------------->
+
+// Begin hash_64a.c------------------------------->
+
+/*
+ * hash_64 - 64 bit Fowler/Noll/Vo-0 FNV-1a hash code
+ *
+ * @(#) $Revision: 5.1 $
+ * @(#) $Id: hash_64a.c,v 5.1 2009/06/30 09:01:38 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/fnv/RCS/hash_64a.c,v $
+ *
+ ***
+ *
+ * Fowler/Noll/Vo hash
+ *
+ * The basis of this hash algorithm was taken from an idea sent
+ * as reviewer comments to the IEEE POSIX P1003.2 committee by:
+ *
+ *      Phong Vo (http://www.research.att.com/info/kpv/)
+ *      Glenn Fowler (http://www.research.att.com/~gsf/)
+ *
+ * In a subsequent ballot round:
+ *
+ *      Landon Curt Noll (http://www.isthe.com/chongo/)
+ *
+ * improved on their algorithm.  Some people tried this hash
+ * and found that it worked rather well.  In an EMail message
+ * to Landon, they named it the ``Fowler/Noll/Vo'' or FNV hash.
+ *
+ * FNV hashes are designed to be fast while maintaining a low
+ * collision rate. The FNV speed allows one to quickly hash lots
+ * of data while maintaining a reasonable collision rate.  See:
+ *
+ *      http://www.isthe.com/chongo/tech/comp/fnv/index.html
+ *
+ * for more details as well as other forms of the FNV hash.
+ *
+ ***
+ *
+ * To use the recommended 64 bit FNV-1a hash, pass FNV1A_64_INIT as the
+ * Fnv64_t hashval argument to fnv_64a_buf() or fnv_64a_str().
+ *
+ ***
+ *
+ * Please do not copyright this code.  This code is in the public domain.
+ *
+ * LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+ * EVENT SHALL LANDON CURT NOLL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+ * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * By:
+ *	chongo <Landon Curt Noll> /\oo/\
+ *      http://www.isthe.com/chongo/
+ *
+ * Share and Enjoy!	:-)
+ */
+
+//#include <stdlib.h>    //PDB
+//#include "fnv.h"       //PDB
+
+
+/*
+ * FNV-1a defines the initial basis to be non-zero
+ */
+#if !defined(HAVE_64BIT_LONG_LONG)
+const Fnv64_t fnv1a_64_init = { 0x84222325, 0xcbf29ce4 };
+#endif /* ! HAVE_64BIT_LONG_LONG */
+
+
+/*
+ * 64 bit magic FNV-1a prime
+ */
+#if defined(HAVE_64BIT_LONG_LONG)
+#define FNV_64_PRIME ((Fnv1aImplementation::Fnv64_t)0x100000001b3ULL)
+#else /* HAVE_64BIT_LONG_LONG */
+#define FNV_64_PRIME_LOW ((unsigned long)0x1b3)	/* lower bits of FNV prime */
+#define FNV_64_PRIME_SHIFT (8)		/* top FNV prime shift above 2^32 */
+#endif /* HAVE_64BIT_LONG_LONG */
+
+
+/*
+ * fnv_64a_buf - perform a 64 bit Fowler/Noll/Vo FNV-1a hash on a buffer
+ *
+ * input:
+ *	buf	- start of buffer to hash
+ *	len	- length of buffer in octets
+ *	hval	- previous hash value or 0 if first call
+ *
+ * returns:
+ *	64 bit hash as a static hash type
+ *
+ * NOTE: To use the recommended 64 bit FNV-1a hash, use FNV1A_64_INIT as the
+ * 	 hval arg on the first call to either fnv_64a_buf() or fnv_64a_str().
+ */
+Fnv64_t
+fnv_64a_buf(void *buf, size_t len, Fnv64_t hval)
+{
+    unsigned char *bp = (unsigned char *)buf;	/* start of buffer */
+    unsigned char *be = bp + len;		/* beyond end of buffer */
+
+#if defined(HAVE_64BIT_LONG_LONG)
+    /*
+     * FNV-1a hash each octet of the buffer
+     */
+    while (bp < be) {
+
+	/* xor the bottom with the current octet */
+	hval ^= (Fnv64_t)*bp++;
+
+	/* multiply by the 64 bit FNV magic prime mod 2^64 */
+#if defined(NO_FNV_GCC_OPTIMIZATION)
+	hval *= FNV_64_PRIME;
+#else /* NO_FNV_GCC_OPTIMIZATION */
+	hval += (hval << 1) + (hval << 4) + (hval << 5) +
+		(hval << 7) + (hval << 8) + (hval << 40);
+#endif /* NO_FNV_GCC_OPTIMIZATION */
+    }
+
+#else /* HAVE_64BIT_LONG_LONG */
+
+    unsigned long val[4];			/* hash value in base 2^16 */
+    unsigned long tmp[4];			/* tmp 64 bit value */
+
+    /*
+     * Convert Fnv64_t hval into a base 2^16 array
+     */
+    val[0] = hval.w32[0];
+    val[1] = (val[0] >> 16);
+    val[0] &= 0xffff;
+    val[2] = hval.w32[1];
+    val[3] = (val[2] >> 16);
+    val[2] &= 0xffff;
+
+    /*
+     * FNV-1a hash each octet of the buffer
+     */
+    while (bp < be) {
+
+	/* xor the bottom with the current octet */
+	val[0] ^= (unsigned long)*bp++;
+
+	/*
+	 * multiply by the 64 bit FNV magic prime mod 2^64
+	 *
+	 * Using 0x100000001b3 we have the following digits base 2^16:
+	 *
+	 *	0x0	0x100	0x0	0x1b3
+	 *
+	 * which is the same as:
+	 *
+	 *	0x0	1<<FNV_64_PRIME_SHIFT	0x0	FNV_64_PRIME_LOW
+	 */
+	/* multiply by the lowest order digit base 2^16 */
+	tmp[0] = val[0] * FNV_64_PRIME_LOW;
+	tmp[1] = val[1] * FNV_64_PRIME_LOW;
+	tmp[2] = val[2] * FNV_64_PRIME_LOW;
+	tmp[3] = val[3] * FNV_64_PRIME_LOW;
+	/* multiply by the other non-zero digit */
+	tmp[2] += val[0] << FNV_64_PRIME_SHIFT;	/* tmp[2] += val[0] * 0x100 */
+	tmp[3] += val[1] << FNV_64_PRIME_SHIFT;	/* tmp[3] += val[1] * 0x100 */
+	/* propagate carries */
+	tmp[1] += (tmp[0] >> 16);
+	val[0] = tmp[0] & 0xffff;
+	tmp[2] += (tmp[1] >> 16);
+	val[1] = tmp[1] & 0xffff;
+	val[3] = tmp[3] + (tmp[2] >> 16);
+	val[2] = tmp[2] & 0xffff;
+	/*
+	 * Doing a val[3] &= 0xffff; is not really needed since it simply
+	 * removes multiples of 2^64.  We can discard these excess bits
+	 * outside of the loop when we convert to Fnv64_t.
+	 */
+    }
+
+    /*
+     * Convert base 2^16 array back into an Fnv64_t
+     */
+    hval.w32[1] = ((val[3]<<16) | val[2]);
+    hval.w32[0] = ((val[1]<<16) | val[0]);
+
+#endif /* HAVE_64BIT_LONG_LONG */
+
+    /* return our new hash value */
+    return hval;
+}
+
+
+/*
+ * fnv_64a_str - perform a 64 bit Fowler/Noll/Vo FNV-1a hash on a buffer
+ *
+ * input:
+ *	buf	- start of buffer to hash
+ *	hval	- previous hash value or 0 if first call
+ *
+ * returns:
+ *	64 bit hash as a static hash type
+ *
+ * NOTE: To use the recommended 64 bit FNV-1a hash, use FNV1A_64_INIT as the
+ * 	 hval arg on the first call to either fnv_64a_buf() or fnv_64a_str().
+ */
+Fnv64_t
+fnv_64a_str(char *str, Fnv64_t hval)
+{
+    unsigned char *s = (unsigned char *)str;	/* unsigned string */
+
+#if defined(HAVE_64BIT_LONG_LONG)
+
+    /*
+     * FNV-1a hash each octet of the string
+     */
+    while (*s) {
+
+	/* xor the bottom with the current octet */
+	hval ^= (Fnv64_t)*s++;
+
+	/* multiply by the 64 bit FNV magic prime mod 2^64 */
+#if defined(NO_FNV_GCC_OPTIMIZATION)
+	hval *= FNV_64_PRIME;
+#else /* NO_FNV_GCC_OPTIMIZATION */
+	hval += (hval << 1) + (hval << 4) + (hval << 5) +
+		(hval << 7) + (hval << 8) + (hval << 40);
+#endif /* NO_FNV_GCC_OPTIMIZATION */
+    }
+
+#else /* !HAVE_64BIT_LONG_LONG */
+
+    unsigned long val[4];	/* hash value in base 2^16 */
+    unsigned long tmp[4];	/* tmp 64 bit value */
+
+    /*
+     * Convert Fnv64_t hval into a base 2^16 array
+     */
+    val[0] = hval.w32[0];
+    val[1] = (val[0] >> 16);
+    val[0] &= 0xffff;
+    val[2] = hval.w32[1];
+    val[3] = (val[2] >> 16);
+    val[2] &= 0xffff;
+
+    /*
+     * FNV-1a hash each octet of the string
+     */
+    while (*s) {
+
+	/* xor the bottom with the current octet */
+
+	/*
+	 * multiply by the 64 bit FNV magic prime mod 2^64
+	 *
+	 * Using 1099511628211, we have the following digits base 2^16:
+	 *
+	 *	0x0	0x100	0x0	0x1b3
+	 *
+	 * which is the same as:
+	 *
+	 *	0x0	1<<FNV_64_PRIME_SHIFT	0x0	FNV_64_PRIME_LOW
+	 */
+	/* multiply by the lowest order digit base 2^16 */
+	tmp[0] = val[0] * FNV_64_PRIME_LOW;
+	tmp[1] = val[1] * FNV_64_PRIME_LOW;
+	tmp[2] = val[2] * FNV_64_PRIME_LOW;
+	tmp[3] = val[3] * FNV_64_PRIME_LOW;
+	/* multiply by the other non-zero digit */
+	tmp[2] += val[0] << FNV_64_PRIME_SHIFT;	/* tmp[2] += val[0] * 0x100 */
+	tmp[3] += val[1] << FNV_64_PRIME_SHIFT;	/* tmp[3] += val[1] * 0x100 */
+	/* propagate carries */
+	tmp[1] += (tmp[0] >> 16);
+	val[0] = tmp[0] & 0xffff;
+	tmp[2] += (tmp[1] >> 16);
+	val[1] = tmp[1] & 0xffff;
+	val[3] = tmp[3] + (tmp[2] >> 16);
+	val[2] = tmp[2] & 0xffff;
+	/*
+	 * Doing a val[3] &= 0xffff; is not really needed since it simply
+	 * removes multiples of 2^64.  We can discard these excess bits
+	 * outside of the loop when we convert to Fnv64_t.
+	 */
+	val[0] ^= (unsigned long)(*s++);
+    }
+
+    /*
+     * Convert base 2^16 array back into an Fnv64_t
+     */
+    hval.w32[1] = ((val[3]<<16) | val[2]);
+    hval.w32[0] = ((val[1]<<16) | val[0]);
+
+#endif /* !HAVE_64BIT_LONG_LONG */
+
+    /* return our new hash value */
+    return hval;
+}
+  
+// End hash_64a.c--------------------------->
+
+}  /* extern "C" */
+
+//-----------------------------------------------------------------------------
+
+
+}  // namespace Fnv1aImplementation
+
+
+Fnv1a::Fnv1a ()
+{
+  clear ();
+}
+
+uint32_t
+Fnv1a::GetHash32  (const char * buffer, const size_t size)
+{
+  m_hash32 =
+    Fnv1aImplementation::fnv_32a_buf ((void *)buffer, size, m_hash32);
+  return m_hash32;
+}
+
+uint64_t
+Fnv1a::GetHash64  (const char * buffer, const size_t size)
+{
+  m_hash64 =
+    Fnv1aImplementation::fnv_64a_buf ((void *)buffer, size, m_hash64);
+  return m_hash64;
+}
+
+void
+Fnv1a::clear (void)
+{
+  m_hash32 = FNV1_32A_INIT;
+  m_hash64 = FNV1A_64_INIT;
+}
+
+}  // namespace Function
+
+}  // namespace Hash
+
+}  // namespace ns3
diff -Naur ns-3.17/src/core/model/hash-fnv.h ns-3.18/src/core/model/hash-fnv.h
--- ns-3.17/src/core/model/hash-fnv.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/core/model/hash-fnv.h	2013-10-26 07:07:30.031364393 -0700
@@ -0,0 +1,113 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2012 Lawrence Livermore National Laboratory
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Peter D. Barnes, Jr. <pdbarnes@llnl.gov>
+ */
+
+#ifndef HASH_FNV_H
+#define HASH_FNV_H
+
+#include "hash-function.h"
+
+namespace ns3 {
+
+namespace Hash {
+
+namespace Function {
+
+/**
+ *  \ingroup hash
+ *
+ *  \brief Fnv1a hash function implementation
+ *
+ *  This is the venerable Fowler-Noll-Vo hash, version 1A.  (See the
+ *  <a href="http://isthe.com/chongo/tech/comp/fnv/">FNV page</a>.)
+ *
+ *  The implementation here is taken directly from the published FNV 
+ *  <a href="http://isthe.com/chongo/tech/comp/fnv/#FNV-reference-source">
+ *  reference code</a>,
+ *  with minor modifications to wrap into this class.  See the
+ *  hash-fnv.cc file for details.
+ *
+ */
+class Fnv1a : public Implementation
+{
+public:
+  /**
+   * Constructor
+   */
+  Fnv1a ();
+  /**
+   * Compute 32-bit hash of a byte buffer
+   *
+   * Call clear () between calls to GetHash32() to reset the
+   * internal state and hash each buffer separately.
+   *
+   * If you don't call clear() between calls to GetHash32,
+   * you can hash successive buffers.  The final return value
+   * will be the cumulative hash across all calls.
+   *
+   * \param [in] buffer pointer to the beginning of the buffer
+   * \param [in] size length of the buffer, in bytes
+   * \return 32-bit hash of the buffer
+   */
+  uint32_t  GetHash32  (const char * buffer, const size_t size);
+  /**
+   * Compute 64-bit hash of a byte buffer.
+   *
+   * Call clear () between calls to GetHash64() to reset the
+   * internal state and hash each buffer separately.
+   *
+   * If you don't call clear() between calls to GetHash64,
+   * you can hash successive buffers.  The final return value
+   * will be the cumulative hash across all calls.
+   *
+   * \param [in] buffer pointer to the beginning of the buffer
+   * \param [in] size length of the buffer, in bytes
+   * \return 64-bit hash of the buffer
+   */
+  uint64_t  GetHash64  (const char * buffer, const size_t size);
+  /**
+   * Restore initial state
+   */
+  virtual void clear (void);
+
+private:
+  /**
+   * Seed value
+   */
+  enum seed
+  {
+    SEED = 0x8BADF00D  // Ate bad food
+  };
+  //@{
+  /**
+   * Cache last hash value, for incremental hashing.
+   */
+  uint32_t m_hash32;
+  uint64_t m_hash64;
+  //@}
+
+};  // class Fnv1a
+
+}  // namespace Function
+
+}  // namespace Hash
+
+}  // namespace ns3
+
+#endif  /* HASH_FNV_H */
diff -Naur ns-3.17/src/core/model/hash-function.cc ns-3.18/src/core/model/hash-function.cc
--- ns-3.17/src/core/model/hash-function.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/core/model/hash-function.cc	2013-10-26 07:07:30.043364393 -0700
@@ -0,0 +1,40 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2012 Lawrence Livermore National Laboratory
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Peter D. Barnes, Jr. <pdbarnes@llnl.gov>
+ */
+
+#include "log.h"
+#include "hash-function.h"
+
+
+namespace ns3 {
+
+NS_LOG_COMPONENT_DEFINE ("HashFunction");
+
+namespace Hash {
+
+uint64_t
+Implementation::GetHash64  (const char * buffer, const size_t size)
+{
+  NS_LOG_WARN ("64-bit hash requested, only 32-bit implementation available");
+  return GetHash32 (buffer, size);
+}
+
+}  // namespace Hash
+
+}  // namespace ns3
diff -Naur ns-3.17/src/core/model/hash-function.h ns-3.18/src/core/model/hash-function.h
--- ns-3.17/src/core/model/hash-function.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/core/model/hash-function.h	2013-10-26 07:07:30.031364393 -0700
@@ -0,0 +1,166 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2012 Lawrence Livermore National Laboratory
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Peter D. Barnes, Jr. <pdbarnes@llnl.gov>
+ */
+
+#ifndef HASHFUNCTION_H
+#define HASHFUNCTION_H
+
+#include <cstring>  // memcpy
+#include "simple-ref-count.h"
+
+namespace ns3 {
+
+/**
+ * \ingroup hash
+ * Hash function implementations
+ */
+namespace Hash {
+
+/**
+ *  \ingroup hash
+ *
+ *  \brief Hash function implementation base class
+ */
+class Implementation : public SimpleRefCount<Implementation>
+{
+public:
+  /**
+   * Compute 32-bit hash of a byte buffer
+   *
+   * Call clear () between calls to GetHash32() to reset the
+   * internal state and hash each buffer separately.
+   *
+   * If you don't call clear() between calls to GetHash32,
+   * you can hash successive buffers.  The final return value
+   * will be the cumulative hash across all calls.
+   *
+   * \param [in] buffer pointer to the beginning of the buffer
+   * \param [in] size length of the buffer, in bytes
+   * \return 32-bit hash of the buffer
+   */
+  virtual uint32_t  GetHash32  (const char * buffer, const size_t size) = 0;
+  /**
+   * Compute 64-bit hash of a byte buffer.
+   *
+   * Default implementation returns 32-bit hash, with a warning.
+   *
+   * Call clear () between calls to GetHash64() to reset the
+   * internal state and hash each buffer separately.
+   *
+   * If you don't call clear() between calls to GetHash64,
+   * you can hash successive buffers.  The final return value
+   * will be the cumulative hash across all calls.
+   *
+   * \param [in] buffer pointer to the beginning of the buffer
+   * \param [in] size length of the buffer, in bytes
+   * \return 64-bit hash of the buffer
+   */
+  virtual uint64_t  GetHash64  (const char * buffer, const size_t size);
+  /**
+   * Restore initial state
+   */
+  virtual void clear (void) = 0;
+  /**
+   * Constructor
+   */
+  Implementation () { };
+  /**
+   * Destructor
+   */
+  virtual ~Implementation () { };
+};  // Hashfunction
+
+  
+/*--------------------------------------
+ *  Hash function implementation
+ *  by function pointers and templates
+ */
+
+/**
+ *
+ * \ingroup hash
+ *
+ * \brief Basic hash function typedefs.
+ *
+ * See Hash32Implementation<> or Hash64Implementation<>
+ * @{
+ */
+typedef uint32_t (*Hash32Function_ptr) (const char *, const size_t);
+typedef uint64_t (*Hash64Function_ptr) (const char *, const size_t);
+/**@}*/
+
+/**
+ * \ingroup hash
+ * Hash functions
+ */
+namespace Function {
+
+/**
+ * \ingroup hash
+ *
+ * \brief Template for Hashfunctions from 32-bit hash functions
+ */
+class Hash32 : public Implementation
+{
+public:
+  Hash32 (Hash32Function_ptr hp) : m_fp (hp) { };
+  uint32_t GetHash32 (const char * buffer, const size_t size)
+  {
+    return (*m_fp) (buffer, size);
+  }
+  void clear () { };
+private:
+  Hash32Function_ptr m_fp;
+};  // Hash32
+
+/**
+ * \ingroup hash
+ *
+ * \brief Template for Hashfunctions from 64-bit hash functions
+ */
+class Hash64 : public Implementation
+{
+public:
+  Hash64 (Hash64Function_ptr hp) : m_fp (hp) { };
+  uint64_t GetHash64 (const char * buffer, const size_t size)
+  {
+    return (*m_fp) (buffer, size);
+  }
+  uint32_t GetHash32 (const char * buffer, const size_t size)
+  {
+    uint32_t hash32;
+    uint64_t hash64 = GetHash64 (buffer, size);
+
+    memcpy (&hash32, &hash64, sizeof (hash32));
+    return hash32;
+  }
+  void clear () { };
+private:
+  Hash64Function_ptr m_fp;
+};  // Hash64<Hash64Function_ptr>
+
+
+}  // namespace Function
+
+}  // namespace Hash
+
+}  // namespace ns3
+
+#endif /* HASHFUNCTION_H */
+
diff -Naur ns-3.17/src/core/model/hash.h ns-3.18/src/core/model/hash.h
--- ns-3.17/src/core/model/hash.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/core/model/hash.h	2013-10-26 07:07:30.035364393 -0700
@@ -0,0 +1,285 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2012 Lawrence Livermore National Laboratory
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Peter D. Barnes, Jr. <pdbarnes@llnl.gov>
+ */
+
+#ifndef HASH_H
+#define HASH_H
+
+#include <string>
+
+#include "assert.h"
+#include "ptr.h"
+
+#include "hash-function.h"
+#include "hash-murmur3.h"
+#include "hash-fnv.h"
+
+namespace ns3 {
+
+/**
+ * \ingroup core
+ * \defgroup hash Hash Functions
+ */
+/**
+ *  \ingroup hash
+ *
+ *  \brief Generic Hash function interface
+ *
+ *  This class provides a generic interface for computing hashes
+ *  of buffers.  Various getters return hashes of different lengths.
+ *
+ *  Call clear() between calls to the getter to reset the
+ *  internal state and hash each buffer separately.
+ *
+ *  If you don't call clear() between calls to the getter
+ *  you can hash successive buffers.  The final return value
+ *  will be the cumulative hash across all calls.
+ *
+ *  The choice of hash function can be made at construction by
+ *    \code
+ *    Hasher hasher = Hasher ( Create<Hash::Function::Fnv1a> () );
+ *    uint32_t hash = Hasher.GetHash32 (data);
+ *    \endcode
+ *
+ *  The available implementations are documented in group hash.
+ *  The default implementation is Murmur3.  FNV1a is also available.
+ *
+ *  In addition to this class interface, global functions are
+ *  defined which use the default hash implementation.
+ *
+ * \internal
+ *
+ *  Would be nice to offer longer hashes.  \c uint128_t looks doable,
+ *  except that our fallback \c int64x64_t implementation doesn't
+ *  offer \c unsigned.
+ *
+ *  Longer hashes require returning a byte buffer of some sort,
+ *  but our \ref buffer class seems a bit overkill for this case.
+ *
+ */
+class Hasher
+{
+public:
+  /**
+   * Constructor using the default implementation
+   */
+  Hasher ();
+  /**
+   * Constructor using the supplied implementation
+   *
+   * \param [in] hp Ptr<Hash::Implementation> to the desired implementation
+   */
+  Hasher (Ptr<Hash::Implementation> hp);
+  /**
+   * Compute 32-bit hash of a byte buffer.
+   *
+   * Call clear () between calls to GetHash32() to reset the
+   * internal state and hash each buffer separately.
+   *
+   * If you don't call clear() between calls to GetHash32,
+   * you can hash successive buffers.  The final return value
+   * will be the cumulative hash across all calls.
+   *
+   * \param [in] buffer pointer to the beginning of the buffer
+   * \param [in] size length of the buffer, in bytes
+   * \return 32-bit hash of the buffer
+   */
+  uint32_t  GetHash32  (const char * buffer, const size_t size);
+  /**
+   * Compute 64-bit hash of a byte buffer
+   *
+   * Call clear () between calls to GetHash64() to reset the
+   * internal state and hash each buffer separately.
+   *
+   * If you don't call clear() between calls to GetHash64,
+   * you can hash successive buffers.  The final return value
+   * will be the cumulative hash across all calls.
+   *
+   * \param [in] buffer pointer to the beginning of the buffer
+   * \param [in] size length of the buffer, in bytes
+   * \return 64-bit hash of the buffer
+   */
+  uint64_t  GetHash64  (const char * buffer, const size_t size);
+
+  /**
+   * Compute 32-bit hash of a string
+   *
+   * Call clear () between calls to GetHash32() to reset the
+   * internal state and hash each string separately.
+   *
+   * If you don't call clear() between calls to GetHash32,
+   * you can hash successive strings.  The final return value
+   * will be the cumulative hash across all calls.
+   *
+   * \param [in] s string to hash
+   * \return 32-bit hash of the string
+   */
+  uint32_t  GetHash32  (const std::string s);
+  /**
+   * Compute 64-bit hash of a string
+   *
+   * Call clear () between calls to GetHash64() to reset the
+   * internal state and hash each string separately.
+   *
+   * If you don't call clear() between calls to GetHash64,
+   * you can hash successive strings.  The final return value
+   * will be the cumulative hash across all calls.
+   *
+   * \param [in] s string to hash
+   * \return 64-bit hash of the string
+   */
+  uint64_t  GetHash64  (const std::string s);
+  /**
+   * Restore initial state
+   *
+   * \return this
+   */
+  Hasher & clear (void);
+
+private:
+  Ptr<Hash::Implementation> m_impl;    /** Hash implementation */
+};  // Hasher
+
+
+/*************************************************
+ **  Global functions declarations
+ ************************************************/
+
+/**
+ * \ingroup hash
+ *
+ * Compute 32-bit hash of a byte buffer, using the default hash function
+ *
+ * \param [in] buffer pointer to the beginning of the buffer
+ * \param [in] size length of the buffer, in bytes
+ * \return 32-bit hash of the buffer
+ */
+uint32_t Hash32 (const char * buffer, const size_t size);
+/**
+ * \ingroup hash
+ *
+ * Compute 64-bit hash of a byte buffer, using the default hash function
+ *
+ * \param [in] buffer pointer to the beginning of the buffer
+ * \param [in] size length of the buffer, in bytes
+ * \return 64-bit hash of the buffer
+ */
+uint64_t Hash64 (const char * buffer, const size_t size);
+
+/**
+ * \ingroup hash
+ *
+ * Compute 32-bit hash of a string, using the default hash function
+ *
+ * \param [in] s string to hash
+ * \return 32-bit hash of the string
+ */
+uint32_t Hash32 (const std::string s);
+/**
+ * \ingroup hash
+ *
+ * Compute 64-bit hash of a string, using the default hash function
+ *
+ * \param [in] s string to hash
+ * \return 64-bit hash of the string
+ */
+uint64_t Hash64 (const std::string s);
+
+}  // namespace ns3
+
+
+/*************************************************
+ **  Inline implementations for rvo
+ ************************************************/
+
+namespace ns3 {
+
+/*************************************************
+ class Hasher implementation, inlined for rvo
+*/
+
+inline
+uint32_t
+Hasher::GetHash32  (const char * buffer, const size_t size)
+{
+  NS_ASSERT (m_impl != 0);
+  return m_impl->GetHash32  (buffer, size);
+}
+
+inline
+uint64_t
+Hasher::GetHash64  (const char * buffer, const size_t size)
+{
+  NS_ASSERT (m_impl != 0);
+  return m_impl->GetHash64  (buffer, size);
+}
+
+inline
+uint32_t
+Hasher::GetHash32  (const std::string s)
+{
+  NS_ASSERT (m_impl != 0);
+  return m_impl->GetHash32  (s.c_str (), s.size ());
+}
+
+inline
+uint64_t
+Hasher::GetHash64  (const std::string s)
+{
+  NS_ASSERT (m_impl != 0);
+  return m_impl->GetHash64  (s.c_str (), s.size ());
+}
+
+
+/*************************************************
+  Global hash functions, inlined for rvo
+*/
+
+inline
+uint32_t
+Hash32 (const char * buffer, const size_t size)
+{
+  return Hasher ().GetHash32 (buffer, size);
+}
+
+inline
+uint64_t
+Hash64 (const char * buffer, const size_t size)
+{
+  return Hasher ().GetHash64 (buffer, size);
+}
+
+inline
+uint32_t
+Hash32 (const std::string s)
+{
+  return Hasher ().GetHash32 (s);
+}
+
+inline
+uint64_t
+Hash64 (const std::string s)
+{
+  return Hasher ().GetHash64 (s);
+}
+
+
+}  // namespace ns3
+
+#endif /* HASH_H */
diff -Naur ns-3.17/src/core/model/hash-murmur3.cc ns-3.18/src/core/model/hash-murmur3.cc
--- ns-3.17/src/core/model/hash-murmur3.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/core/model/hash-murmur3.cc	2013-10-26 07:07:30.035364393 -0700
@@ -0,0 +1,504 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2012 Lawrence Livermore National Laboratory
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Peter D. Barnes, Jr. <pdbarnes@llnl.gov>
+ *
+ * This copyright notice applies strictly to the wrapper material.
+ *
+ * The murmur3 source code itself is in the public domain.  The murmur3 source
+ * code sections are marked by
+ *   // Begin <murmur3-file> ---->
+ * and
+ *   // End <murmur3-file>   ---->
+ * comments.
+ *
+ * Changes from the murmur3 distribution are marked with `//PDB'
+ */
+
+#include "log.h"
+#include "hash-murmur3.h"
+
+#include <iomanip>
+
+/*
+ * \brief Silence erroneous strict alias warning from a gcc 4.4 bug
+ *
+ * Casting \c (void*) triggers a strict alias warning bug
+ * in gcc 4.4 (see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39390).
+ *
+ * In the murmur3 code, data is returned by
+ * \code
+ *   void Function (... , void * out)
+ *   {
+ *     ...
+ *     *(uint32_t *)out = ...
+ *   }
+ * \endcode
+ *
+ * which triggers the erroneous warning.
+ *
+ * We suppress strict-alias warnings in this compilation unit.
+ * (gcc 4.4 doesn't support the <tt>diagnostic push/pop</tt> pragmas,
+ * so we can't narrow down the suppression any further.)
+ */
+// Test for gcc 4.4.x
+#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
+#if (GCC_VERSION == 404)
+#  pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#endif
+ 
+namespace ns3 {
+
+NS_LOG_COMPONENT_DEFINE ("Hash-Murmur3");
+
+namespace Hash {
+
+namespace Function {
+
+namespace Murmur3Implementation {
+
+// Changes from Murmur3 distribution are marked with `//PDB'
+//
+
+/*************************************************
+ **  class Murmur3HashImplementation
+ ************************************************/
+
+// Adapted from http://code.google.com/p/smhasher/
+
+// Begin Murmur3.cpp ----------------------------->
+
+//
+//-----------------------------------------------------------------------------
+// MurmurHash3 was written by Austin Appleby, and is placed in the public
+// domain. The author hereby disclaims copyright to this source code.
+
+// Note - The x86 and x64 versions do _not_ produce the same results, as the
+// algorithms are optimized for their respective platforms. You can still
+// compile and run any of them on any platform, but your performance with the
+// non-native version will be less than optimal.
+
+
+inline uint32_t rotl32 ( uint32_t x, int8_t r )
+{
+  return (x << r) | (x >> (32 - r));
+}
+
+inline uint64_t rotl64 ( uint64_t x, int8_t r )
+{
+  return (x << r) | (x >> (64 - r));
+}
+
+#define BIG_CONSTANT(x) (x##LLU)
+
+//-----------------------------------------------------------------------------
+// Block read - if your platform needs to do endian-swapping or can only
+// handle aligned reads, do the conversion here
+
+inline uint32_t getblock ( const uint32_t * p, int i )
+{
+  return p[i];
+}
+
+inline uint64_t getblock ( const uint64_t * p, int i )
+{
+  return p[i];
+}
+
+//-----------------------------------------------------------------------------
+// Finalization mix - force all bits of a hash block to avalanche
+
+inline uint32_t fmix ( uint32_t h )
+{
+  h ^= h >> 16;
+  h *= 0x85ebca6b;
+  h ^= h >> 13;
+  h *= 0xc2b2ae35;
+  h ^= h >> 16;
+
+  return h;
+}
+
+//----------
+
+inline uint64_t fmix ( uint64_t k )
+{
+  k ^= k >> 33;
+  k *= BIG_CONSTANT(0xff51afd7ed558ccd);
+  k ^= k >> 33;
+  k *= BIG_CONSTANT(0xc4ceb9fe1a85ec53);
+  k ^= k >> 33;
+
+  return k;
+}
+
+//-----------------------------------------------------------------------------
+
+//PDB forward
+void MurmurHash3_x86_32_incr ( const void * key, int len,
+                               uint32_t seed, void * out );
+void MurmurHash3_x86_32_fin ( int len,
+                              uint32_t seed, void * out );
+
+//PDB - incremental hashing
+void MurmurHash3_x86_32 ( const void * key, int len,
+                          uint32_t seed, void * out )
+{
+  uint32_t h1;
+  MurmurHash3_x86_32_incr (key, len, seed, &h1);
+  MurmurHash3_x86_32_fin (len, h1, out);
+}
+
+void MurmurHash3_x86_32_incr ( const void * key, int len,
+                               uint32_t seed, void * out )
+{
+  const uint8_t * data = (const uint8_t*)key;
+  const int nblocks = len / 4;
+
+  uint32_t h1 = seed;
+
+  uint32_t c1 = 0xcc9e2d51;
+  uint32_t c2 = 0x1b873593;
+
+  //----------
+  // body
+
+  const uint32_t * blocks = (const uint32_t *)(data + nblocks*4);
+
+  for(int i = -nblocks; i; i++)
+  {
+    uint32_t k1 = getblock(blocks,i);
+
+    k1 *= c1;
+    k1 = rotl32(k1,15);
+    k1 *= c2;
+    
+    h1 ^= k1;
+    h1 = rotl32(h1,13); 
+    h1 = h1*5+0xe6546b64;
+  }
+
+  //----------
+  // tail
+
+  const uint8_t * tail = (const uint8_t*)(data + nblocks*4);
+
+  uint32_t k1 = 0;
+
+  switch(len & 3)
+  {
+  case 3: k1 ^= tail[2] << 16;
+  case 2: k1 ^= tail[1] << 8;
+  case 1: k1 ^= tail[0];
+          k1 *= c1; k1 = rotl32(k1,15); k1 *= c2; h1 ^= k1;
+  };
+
+  *(uint32_t *)out = h1;
+}
+
+//PDB - incremental hashing - finalization
+void MurmurHash3_x86_32_fin ( int len,
+                              uint32_t seed, void * out )
+{
+  uint32_t h1 = seed;
+
+  //----------
+  // finalization
+
+  h1 ^= len;
+
+  h1 = fmix(h1);
+
+  *(uint32_t *)out = h1;
+} 
+
+//-----------------------------------------------------------------------------
+
+//PDB forward
+void MurmurHash3_x86_128_incr ( const void * key, const int len,
+                                uint32_t * seeds, void * out );
+void MurmurHash3_x86_128_fin ( const int len,
+                               uint32_t * seeds, void * out );
+
+//PDB - incremental hashing
+void MurmurHash3_x86_128 ( const void * key, const int len,
+                           uint32_t seed, void * out )
+{
+  uint32_t seeds[4];
+  uint32_t h[4];
+  seeds[0] = seeds[1] = seeds[2] = seeds[3] = seed;
+  MurmurHash3_x86_128_incr (key, len, seeds, h);
+  MurmurHash3_x86_128_fin (len, h, out);
+}
+
+void MurmurHash3_x86_128_incr ( const void * key, const int len,
+                                uint32_t * seeds, void * out )
+{
+  const uint8_t * data = (const uint8_t*)key;
+  const int nblocks = len / 16;
+
+  uint32_t h1 = seeds[0];
+  uint32_t h2 = seeds[1];
+  uint32_t h3 = seeds[2];
+  uint32_t h4 = seeds[3];
+
+  uint32_t c1 = 0x239b961b; 
+  uint32_t c2 = 0xab0e9789;
+  uint32_t c3 = 0x38b34ae5; 
+  uint32_t c4 = 0xa1e38b93;
+
+  //----------
+  // body
+
+  const uint32_t * blocks = (const uint32_t *)(data + nblocks*16);
+
+  for(int i = -nblocks; i; i++)
+  {
+    uint32_t k1 = getblock(blocks,i*4+0);
+    uint32_t k2 = getblock(blocks,i*4+1);
+    uint32_t k3 = getblock(blocks,i*4+2);
+    uint32_t k4 = getblock(blocks,i*4+3);
+
+    k1 *= c1; k1  = rotl32(k1,15); k1 *= c2; h1 ^= k1;
+
+    h1 = rotl32(h1,19); h1 += h2; h1 = h1*5+0x561ccd1b;
+
+    k2 *= c2; k2  = rotl32(k2,16); k2 *= c3; h2 ^= k2;
+
+    h2 = rotl32(h2,17); h2 += h3; h2 = h2*5+0x0bcaa747;
+
+    k3 *= c3; k3  = rotl32(k3,17); k3 *= c4; h3 ^= k3;
+
+    h3 = rotl32(h3,15); h3 += h4; h3 = h3*5+0x96cd1c35;
+
+    k4 *= c4; k4  = rotl32(k4,18); k4 *= c1; h4 ^= k4;
+
+    h4 = rotl32(h4,13); h4 += h1; h4 = h4*5+0x32ac3b17;
+  }
+
+  //----------
+  // tail
+
+  const uint8_t * tail = (const uint8_t*)(data + nblocks*16);
+
+  uint32_t k1 = 0;
+  uint32_t k2 = 0;
+  uint32_t k3 = 0;
+  uint32_t k4 = 0;
+
+  switch(len & 15)
+  {
+  case 15: k4 ^= tail[14] << 16;
+  case 14: k4 ^= tail[13] << 8;
+  case 13: k4 ^= tail[12] << 0;
+           k4 *= c4; k4  = rotl32(k4,18); k4 *= c1; h4 ^= k4;
+
+  case 12: k3 ^= tail[11] << 24;
+  case 11: k3 ^= tail[10] << 16;
+  case 10: k3 ^= tail[ 9] << 8;
+  case  9: k3 ^= tail[ 8] << 0;
+           k3 *= c3; k3  = rotl32(k3,17); k3 *= c4; h3 ^= k3;
+
+  case  8: k2 ^= tail[ 7] << 24;
+  case  7: k2 ^= tail[ 6] << 16;
+  case  6: k2 ^= tail[ 5] << 8;
+  case  5: k2 ^= tail[ 4] << 0;
+           k2 *= c2; k2  = rotl32(k2,16); k2 *= c3; h2 ^= k2;
+
+  case  4: k1 ^= tail[ 3] << 24;
+  case  3: k1 ^= tail[ 2] << 16;
+  case  2: k1 ^= tail[ 1] << 8;
+  case  1: k1 ^= tail[ 0] << 0;
+           k1 *= c1; k1  = rotl32(k1,15); k1 *= c2; h1 ^= k1;
+  };
+
+  ((uint32_t *)out)[0] = h1;
+  ((uint32_t *)out)[1] = h2;
+  ((uint32_t *)out)[2] = h3;
+  ((uint32_t *)out)[3] = h4;
+}
+
+//PDB - incremental hashing - finalization
+void MurmurHash3_x86_128_fin ( const int len,
+                               uint32_t * seeds, void * out )
+{
+  //----------
+  // finalization
+
+  uint32_t h1 = seeds[0];
+  uint32_t h2 = seeds[1];
+  uint32_t h3 = seeds[2];
+  uint32_t h4 = seeds[3];
+  
+  h1 ^= len; h2 ^= len; h3 ^= len; h4 ^= len;
+
+  h1 += h2; h1 += h3; h1 += h4;
+  h2 += h1; h3 += h1; h4 += h1;
+
+  h1 = fmix(h1);
+  h2 = fmix(h2);
+  h3 = fmix(h3);
+  h4 = fmix(h4);
+
+  h1 += h2; h1 += h3; h1 += h4;
+  h2 += h1; h3 += h1; h4 += h1;
+
+  ((uint32_t *)out)[0] = h1;
+  ((uint32_t *)out)[1] = h2;
+  ((uint32_t *)out)[2] = h3;
+  ((uint32_t *)out)[3] = h4;
+}
+
+//-----------------------------------------------------------------------------
+
+void MurmurHash3_x64_128 ( const void * key, const int len,
+                           const uint32_t seed, void * out )
+{
+  const uint8_t * data = (const uint8_t*)key;
+  const int nblocks = len / 16;
+
+  uint64_t h1 = seed;
+  uint64_t h2 = seed;
+
+  uint64_t c1 = BIG_CONSTANT(0x87c37b91114253d5);
+  uint64_t c2 = BIG_CONSTANT(0x4cf5ad432745937f);
+
+  //----------
+  // body
+
+  const uint64_t * blocks = (const uint64_t *)(data);
+
+  for(int i = 0; i < nblocks; i++)
+  {
+    uint64_t k1 = getblock(blocks,i*2+0);
+    uint64_t k2 = getblock(blocks,i*2+1);
+
+    k1 *= c1; k1  = rotl64(k1,31); k1 *= c2; h1 ^= k1;
+
+    h1 = rotl64(h1,27); h1 += h2; h1 = h1*5+0x52dce729;
+
+    k2 *= c2; k2  = rotl64(k2,33); k2 *= c1; h2 ^= k2;
+
+    h2 = rotl64(h2,31); h2 += h1; h2 = h2*5+0x38495ab5;
+  }
+
+  //----------
+  // tail
+
+  const uint8_t * tail = (const uint8_t*)(data + nblocks*16);
+
+  uint64_t k1 = 0;
+  uint64_t k2 = 0;
+
+  switch(len & 15)
+  {
+  case 15: k2 ^= uint64_t(tail[14]) << 48;
+  case 14: k2 ^= uint64_t(tail[13]) << 40;
+  case 13: k2 ^= uint64_t(tail[12]) << 32;
+  case 12: k2 ^= uint64_t(tail[11]) << 24;
+  case 11: k2 ^= uint64_t(tail[10]) << 16;
+  case 10: k2 ^= uint64_t(tail[ 9]) << 8;
+  case  9: k2 ^= uint64_t(tail[ 8]) << 0;
+           k2 *= c2; k2  = rotl64(k2,33); k2 *= c1; h2 ^= k2;
+
+  case  8: k1 ^= uint64_t(tail[ 7]) << 56;
+  case  7: k1 ^= uint64_t(tail[ 6]) << 48;
+  case  6: k1 ^= uint64_t(tail[ 5]) << 40;
+  case  5: k1 ^= uint64_t(tail[ 4]) << 32;
+  case  4: k1 ^= uint64_t(tail[ 3]) << 24;
+  case  3: k1 ^= uint64_t(tail[ 2]) << 16;
+  case  2: k1 ^= uint64_t(tail[ 1]) << 8;
+  case  1: k1 ^= uint64_t(tail[ 0]) << 0;
+           k1 *= c1; k1  = rotl64(k1,31); k1 *= c2; h1 ^= k1;
+  };
+
+  //----------
+  // finalization
+
+  h1 ^= len; h2 ^= len;
+
+  h1 += h2;
+  h2 += h1;
+
+  h1 = fmix(h1);
+  h2 = fmix(h2);
+
+  h1 += h2;
+  h2 += h1;
+
+  ((uint32_t *)out)[0] = h1;
+  ((uint32_t *)out)[1] = h2;
+}
+
+
+// End Murmur3.cpp ----------------------------->
+
+#undef BIG_CONSTANT
+
+  
+//-----------------------------------------------------------------------------
+
+
+}  // namespace Murmur3Implementation
+
+
+Murmur3::Murmur3 ()
+{
+  clear ();
+}
+
+uint32_t
+Murmur3::GetHash32  (const char * buffer, const size_t size)
+{
+  using namespace Murmur3Implementation;
+
+  MurmurHash3_x86_32_incr (buffer, size, m_hash32, (void *) & m_hash32);
+  m_size32 += size;
+  uint32_t hash;
+  MurmurHash3_x86_32_fin  (m_size32, m_hash32, (void *) & hash);
+
+  return hash;
+}
+
+uint64_t
+Murmur3::GetHash64  (const char * buffer, const size_t size)
+{
+  using namespace Murmur3Implementation;
+  MurmurHash3_x86_128_incr (buffer, size,
+                            (uint32_t *)(void *)m_hash64, (void *)(m_hash64));
+  m_size64 += size;
+  uint64_t hash[2];
+  MurmurHash3_x86_128_fin (m_size64,
+                           (uint32_t*)(void *)m_hash64, (void *)hash);
+  return hash[0];
+}
+
+void
+Murmur3::clear (void)
+{
+  m_hash32 = (uint32_t)SEED;
+  m_size32 = 0;
+  m_hash64[0] = ((uint64_t)(SEED) << 32) + (uint64_t)SEED;
+  m_hash64[1] = ((uint64_t)(SEED) << 32) + (uint64_t)SEED;
+  m_size64 = 0;
+}
+
+}  // namespace Function
+
+}  // namespace Hash
+
+}  // namespace ns3
diff -Naur ns-3.17/src/core/model/hash-murmur3.h ns-3.18/src/core/model/hash-murmur3.h
--- ns-3.17/src/core/model/hash-murmur3.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/core/model/hash-murmur3.h	2013-10-26 07:07:30.027364392 -0700
@@ -0,0 +1,120 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2012 Lawrence Livermore National Laboratory
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Peter D. Barnes, Jr. <pdbarnes@llnl.gov>
+ */
+
+#ifndef HASH_MURMUR3_H
+#define HASH_MURMUR3_H
+
+#include "hash-function.h"
+
+namespace ns3 {
+
+namespace Hash {
+
+namespace Function {
+
+/**
+ *  \ingroup hash
+ *
+ *  \brief Murmur3 hash function implementation
+ *
+ *  Adapted from http://code.google.com/p/smhasher/
+ *
+ *  MurmurHash3 was written by Austin Appleby, and is placed in the public
+ *  domain. The author hereby disclaims copyright to this source code.
+
+ *  Note - The x86 and x64 versions do _not_ produce the same results, as the
+ *  algorithms are optimized for their respective platforms. You can still
+ *  compile and run any of them on any platform, but your performance with the
+ *  non-native version will be less than optimal.
+ */
+class Murmur3 : public Implementation
+{
+public:
+  /**
+   * Constructor, clears internal state
+   */
+  Murmur3 ();
+  /**
+   * Compute 32-bit hash of a byte buffer
+   *
+   * Call clear () between calls to GetHash32() to reset the
+   * internal state and hash each buffer separately.
+   *
+   * If you don't call clear() between calls to GetHash32,
+   * you can hash successive buffers.  The final return value
+   * will be the cumulative hash across all calls.
+   *
+   * \param [in] buffer pointer to the beginning of the buffer
+   * \param [in] size length of the buffer, in bytes
+   * \return 32-bit hash of the buffer
+   */
+  uint32_t  GetHash32  (const char * buffer, const size_t size);
+  /**
+   * Compute 64-bit hash of a byte buffer.
+   *
+   * Call clear () between calls to GetHash64() to reset the
+   * internal state and hash each buffer separately.
+   *
+   * If you don't call clear() between calls to GetHash64,
+   * you can hash successive buffers.  The final return value
+   * will be the cumulative hash across all calls.
+   *
+   * \param [in] buffer pointer to the beginning of the buffer
+   * \param [in] size length of the buffer, in bytes
+   * \return 64-bit hash of the buffer
+   */
+  uint64_t  GetHash64  (const char * buffer, const size_t size);
+  /**
+   * Restore initial state
+   */
+  virtual void clear (void);
+
+private:
+  /**
+   * Seed value
+   *
+   * This has to be a constant for all MPI ranks to generate
+   * the same hash from the same string.
+   */
+  enum seed
+  {
+    SEED = 0x8BADF00D  // Ate bad food
+  };
+  //@{
+  /** 
+   * Cache last hash value, and total bytes hashed (needed to finalize),
+   * for incremental hashing
+   */
+  uint32_t m_hash32;
+  uint32_t m_size32;
+  /** murmur3 produces 128-bit hash and state; we use just the first 64-bits. */
+  uint64_t m_hash64[2];  
+  uint64_t m_size64;
+  //@}
+      
+};  // class Murmur3
+
+}  // namespace Function
+
+}  // namespace Hash
+
+}  // namespace ns3
+
+#endif  /* HASH_MURMUR3_H */
diff -Naur ns-3.17/src/core/model/int64x64.cc ns-3.18/src/core/model/int64x64.cc
--- ns-3.17/src/core/model/int64x64.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/int64x64.cc	2013-10-26 07:07:30.039364393 -0700
@@ -1,6 +1,7 @@
 #include "int64x64.h"
 #include <stdint.h>
 #include <iostream>
+#include <iomanip>  // showpos
 #include <sstream>
 #include "assert.h"
 #include "log.h"
@@ -38,7 +39,25 @@
 std::ostream &operator << (std::ostream &os, const int64x64_t &value)
 {
   int64_t hi = value.GetHigh ();
-  os << ((hi<0) ? "-" : "+") << ((hi<0) ? -hi : hi) << ".";
+
+  // Save stream format flags
+  std::ios_base::fmtflags ff = os.flags ();
+
+  { /// \internal
+    /// See \bugid{1737}:  gcc libstc++ 4.2 bug
+    if (hi == 0)
+      { 
+	os << '+';
+      }
+    else
+      {
+	os << std::showpos;
+      }
+  }
+  
+  os << hi << ".";
+  os.flags (ff);  // Restore stream flags
+
   uint64_t low = value.GetLow ();
   uint8_t msd = MostSignificantDigit (~((uint64_t)0));
   do
diff -Naur ns-3.17/src/core/model/int64x64-double.h ns-3.18/src/core/model/int64x64-double.h
--- ns-3.17/src/core/model/int64x64-double.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/int64x64-double.h	2013-10-26 07:07:30.047364393 -0700
@@ -27,7 +27,7 @@
   inline int64x64_t (unsigned long long int v)
     : _v (v) {}
   inline int64x64_t (int64_t hi, uint64_t lo)
-    : _v (hi) { /* XXX */}
+    : _v (hi) { /** \todo add in lo? */}
 
   inline int64x64_t (const int64x64_t &o)
     : _v (o._v) {}
@@ -47,7 +47,7 @@
   }
   inline uint64_t GetLow (void) const
   {
-    // XXX
+    /// \todo Generate lo?
     return 0;
   }
 
diff -Naur ns-3.17/src/core/model/log.cc ns-3.18/src/core/model/log.cc
--- ns-3.17/src/core/model/log.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/log.cc	2013-10-26 07:07:30.023364392 -0700
@@ -558,8 +558,10 @@
 void LogSetTimePrinter (LogTimePrinter printer)
 {
   g_logTimePrinter = printer;
-  // This is the only place where we are more or less sure that all log variables
-  // are registered. See bug 1082 for details.
+  /** \internal
+   *  This is the only place where we are more or less sure that all log variables
+   * are registered. See \bugid{1082} for details.
+   */
   CheckEnvironmentVariables(); 
 }
 LogTimePrinter LogGetTimePrinter (void)
diff -Naur ns-3.17/src/core/model/nstime.h ns-3.18/src/core/model/nstime.h
--- ns-3.17/src/core/model/nstime.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/nstime.h	2013-10-26 07:07:30.027364392 -0700
@@ -24,9 +24,12 @@
 #include "attribute.h"
 #include "attribute-helper.h"
 #include "int64x64.h"
+#include "unused.h"
 #include <stdint.h>
+#include <limits>
 #include <cmath>
 #include <ostream>
+#include <set>
 
 namespace ns3 {
 
@@ -36,61 +39,12 @@
  */
 /**
  * \ingroup time
- * \brief keep track of time unit.
- *
- * This template class is used to keep track of the value
- * of a specific time unit: the type TimeUnit<1> is used to
- * keep track of seconds, the type TimeUnit<2> is used to keep
- * track of seconds squared, the type TimeUnit<-1> is used to
- * keep track of 1/seconds, etc.
- *
- * This base class defines all the functionality shared by all
- * these time unit objects: it defines all the classic arithmetic
- * operators +, -, *, /, and all the classic comparison operators:
- * ==, !=, <, >, <=, >=. It is thus easy to add, substract, or
- * multiply multiple TimeUnit objects. The return type of any such
- * arithmetic expression is always a TimeUnit object.
- *
- * The ns3::uint64_t, ns3::Time, ns3::TimeSquare, and ns3::TimeInvert classes
- * are aliases for the TimeUnit<0>, TimeUnit<1>, TimeUnit<2> and TimeUnit<-1>
- * types respectively.
- *
- * For example:
- * \code
- * Time<1> t1 = Seconds (10.0);
- * Time<1> t2 = Seconds (10.0);
- * Time<2> t3 = t1 * t2;
- * Time<0> t4 = t1 / t2;
- * Time<3> t5 = t3 * t1;
- * Time<-2> t6 = t1 / t5;
- * TimeSquare t7 = t3;
- * uint64_t s = t4;
- * \endcode
- *
- * If you try to assign the result of an expression which does not
- * match the type of the variable it is assigned to, you will get a
- * compiler error. For example, the following will not compile:
- * \code
- * Time<1> = Seconds (10.0) * Seconds (1.5);
- * \endcode
- *
- * You can also use the following non-member functions to manipulate
- * any of these ns3::TimeUnit object:
- *  - \ref ns3-Time-Abs ns3::Abs
- *  - \ref ns3-Time-Max ns3::Max
- *  - \ref ns3-Time-Min ns3::Min
- */
-/**
- * \ingroup time
  * \brief keep track of time values and allow control of global simulation resolution
  *
  * This class defines all the classic C++ arithmetic
  * operators +, -, *, /, and all the classic comparison operators:
  * ==, !=, <, >, <=, >=. It is thus easy to add, substract, or
- * multiply multiple Time objects.
- *
- * The ns3::uint64_t, ns3::TimeSquare, and ns3::TimeInvert classes
- * are backward-compatibility aliases for ns3::Time.
+ * multiply Time objects.
  *
  * For example:
  * \code
@@ -115,17 +69,17 @@
  * 1. It is possible to either increase or decrease the resolution and the
  * code tries really hard to make this easy.
  *
- * If your resolution is X (say, nanoseconds) and if you create Time objects 
- * with a lower resolution (say, picoseconds), don't expect that this 
- * code will return 1: PicoSeconds (1).GetPicoSeconds (). It will most 
- * likely return 0 because the Time object has only 64 bits of fractional 
+ * If your resolution is X (say, nanoseconds) and if you create Time objects
+ * with a lower resolution (say, picoseconds), don't expect that this
+ * code will return 1: PicoSeconds (1).GetPicoSeconds (). It will most
+ * likely return 0 because the Time object has only 64 bits of fractional
  * precision which means that PicoSeconds (1) is stored as a 64-bit aproximation
- * of 1/1000 in the Time object. If you later multiply it again by the exact 
+ * of 1/1000 in the Time object. If you later multiply it again by the exact
  * value 1000, the result is unlikely to be 1 exactly. It will be close to
  * 1 but not exactly 1.
- * 
+ *
  * In general, it is thus a really bad idea to try to use time objects of a
- * resolution higher than the global resolution controlled through 
+ * resolution higher than the global resolution controlled through
  * Time::SetResolution. If you do need to use picoseconds, it's thus best
  * to switch the global resolution to picoseconds to avoid nasty surprises.
  *
@@ -133,7 +87,7 @@
  * global resolution, you also implicitely decrease the range of your simulation.
  * i.e., the global simulation time is stored in a 64 bit integer whose interpretation
  * will depend on the global resolution so, 2^64 picoseconds which is the maximum
- * duration of your simulation if the global resolution is picoseconds 
+ * duration of your simulation if the global resolution is picoseconds
  * is smaller than 2^64 nanoseconds which is the maximum duration of your simulation
  * if the global resolution is nanoseconds.
  *
@@ -154,12 +108,12 @@
    */
   enum Unit
   {
-    S  = 0,
-    MS = 1,
-    US = 2,
-    NS = 3,
-    PS = 4,
-    FS = 5,
+    S  = 0,   //!< second
+    MS = 1,   //!< millisecond
+    US = 2,   //!< microsecond
+    NS = 3,   //!< nanosecond
+    PS = 4,   //!< picosecond
+    FS = 5,   //!< femtosecond
     LAST = 6
   };
 
@@ -170,42 +124,86 @@
   }
   inline Time ()
     : m_data ()
-  {}
+  {
+    if (g_markingTimes)
+      {
+	Mark (this);
+      }
+  }
   inline Time(const Time &o)
     : m_data (o.m_data)
-  {}
+  {
+    if (g_markingTimes)
+      {
+	Mark (this);
+      }
+  }
   explicit inline Time (double v)
     : m_data (lround (v))
-  {}
+  {
+    if (g_markingTimes)
+      {
+	Mark (this);
+      }
+  }
   explicit inline Time (int v)
     : m_data (v)
-  {}
+  {
+    if (g_markingTimes)
+      {
+	Mark (this);
+      }
+  }
   explicit inline Time (long int v)
     : m_data (v)
-  {}
+  {
+    if (g_markingTimes)
+      {
+	Mark (this);
+      }
+  }
   explicit inline Time (long long int v)
     : m_data (v)
-  {}
+  {
+    if (g_markingTimes)
+      {
+	Mark (this);
+      }
+  }
   explicit inline Time (unsigned int v)
     : m_data (v)
-  {}
+  {
+    if (g_markingTimes)
+      {
+	Mark (this);
+      }
+  }
   explicit inline Time (unsigned long int v)
     : m_data (v)
-  {}
+  {
+    if (g_markingTimes)
+      {
+	Mark (this);
+      }
+  }
   explicit inline Time (unsigned long long int v)
     : m_data (v)
-  {}
-
+  {
+    if (g_markingTimes)
+      {
+	Mark (this);
+      }
+  }
   /**
-   * \brief String constructor
-   * Construct Time object from common time expressions like "
-   * 1ms" or "10s".  Supported units include:
-   * - s  (seconds)
-   * - ms (milliseconds)
-   * - us (microseconds)
-   * - ns (nanoseconds)
-   * - ps (picoseconds)
-   * - fs (femtoseconds)
+   * \brief Construct Time object from common time expressions like "1ms"
+   *
+   * Supported units include:
+   * - `s`  (seconds)
+   * - `ms` (milliseconds)
+   * - `us` (microseconds)
+   * - `ns` (nanoseconds)
+   * - `ps` (picoseconds)
+   * - `fs` (femtoseconds)
    *
    * There can be no white space between the numerical portion
    * and the units.  Any otherwise malformed string causes a fatal error to
@@ -215,6 +213,32 @@
   explicit Time (const std::string & s);
 
   /**
+   * \brief Minimum representable Time
+   */
+  static Time Min ()
+  {
+    return Time (std::numeric_limits<int64_t>::min ());
+  }
+  /**
+   * \brief Maximum representable Time
+   */
+  static Time Max ()
+  {
+    return Time (std::numeric_limits<int64_t>::max ());
+  }
+
+  /**
+   *  Destructor
+   */
+  ~Time ()
+  {
+    if (g_markingTimes)
+      {
+        Clear (this);
+      }
+  }
+
+  /**
    * \return true if the time is zero, false otherwise.
    */
   inline bool IsZero (void) const
@@ -249,7 +273,9 @@
   {
     return m_data > 0;
   }
-
+  /**
+   *  \return -1,0,+1 if `this < o`, `this == o`, or `this > o`
+   */
   inline int Compare (const Time &o) const
   {
     return (m_data < o.m_data) ? -1 : (m_data == o.m_data) ? 0 : 1;
@@ -305,8 +331,7 @@
     return ToInteger (Time::FS);
   }
   /**
-   * \returns an approximation of the time stored in this
-   *          instance in the units specified in m_tsPrecision.
+   * \returns the raw time value, in the current units
    */
   inline int64_t GetTimeStep (void) const
   {
@@ -325,7 +350,7 @@
   /**
    * \param resolution the new resolution to use
    *
-   * Change the global resolution used to convert all 
+   * Change the global resolution used to convert all
    * user-provided time values in Time objects and Time objects
    * in user-expected time units.
    */
@@ -374,7 +399,7 @@
       }
     else
       {
-        v /= info->factor; 
+        v /= info->factor;
       }
     return v;
   }
@@ -405,7 +430,7 @@
     struct Information *info = PeekInformation (timeUnit);
     // DO NOT REMOVE this temporary variable. It's here
     // to work around a compiler bug in gcc 3.4
-    int64x64_t retval = from; 
+    int64x64_t retval = from;
     if (info->fromMul)
       {
         retval *= info->timeFrom;
@@ -436,30 +461,41 @@
   }
   explicit inline Time (const int64x64_t &value)
     : m_data (value.GetHigh ())
-  {}
+  {
+    if (g_markingTimes)
+      {
+	Mark (this);
+      }
+  }
   inline static Time From (const int64x64_t &value)
   {
     return Time (value);
   }
 
 private:
+  /**
+   * How to convert between other units and the current unit
+   */
   struct Information
   {
-    bool toMul;
-    bool fromMul;
-    uint64_t factor;
-    int64x64_t timeTo;
-    int64x64_t timeFrom;
+    bool toMul;                     //!< Multiply when converting To, otherwise divide
+    bool fromMul;                   //!< Multiple when converting From, otherwise divide
+    int64_t factor;                 //!< Ratio of this unit / current unit
+    int64x64_t timeTo;              //!< Multiplier to convert to this unit
+    int64x64_t timeFrom;            //!< Multiplier to convert from this unit
   };
+  /**
+   * Current time unit, and conversion info.
+   */
   struct Resolution
   {
-    struct Information info[LAST];
-    enum Time::Unit unit;
+    struct Information info[LAST];  //!<  Conversion info from current unit
+    enum Time::Unit unit;           //!<  Current time unit
   };
 
   static inline struct Resolution *PeekResolution (void)
   {
-    static struct Time::Resolution resolution = GetNsResolution ();
+    static struct Time::Resolution resolution = SetDefaultNsResolution ();
     return &resolution;
   }
   static inline struct Information *PeekInformation (enum Unit timeUnit)
@@ -467,8 +503,75 @@
     return &(PeekResolution ()->info[timeUnit]);
   }
 
-  static struct Resolution GetNsResolution (void);
-  static void SetResolution (enum Unit unit, struct Resolution *resolution);
+  static struct Resolution SetDefaultNsResolution (void);
+  static void SetResolution (enum Unit unit, struct Resolution *resolution,
+                             const bool convert = true);
+
+  /**
+   *  Record all instances of Time, so we can rescale them when
+   *  the resolution changes.
+   *
+   *  \intern
+   *
+   *  We use a std::set so we can remove the record easily when
+   *  ~Time() is called.
+   *
+   *  We don't use Ptr<Time>, because we would have to bloat every Time
+   *  instance with SimpleRefCount<Time>.
+   *
+   *  Seems like this should be std::set< Time * const >, but
+   *  [Stack Overflow](http://stackoverflow.com/questions/5526019/compile-errors-stdset-with-const-members)
+   *  says otherwise, quoting the standard:
+   *
+   *  > &sect;23.1/3 states that std::set key types must be assignable
+   *  > and copy constructable; clearly a const type will not be assignable.
+   */
+  typedef std::set< Time * > MarkedTimes;
+  /**
+   *  Record of outstanding Time objects which will need conversion
+   *  when the resolution is set.
+   *
+   *  \intern
+   *
+   *  Use a classic static variable so we can check in Time ctors
+   *  without a function call.
+   *
+   *  We'd really like to initialize this here, but we don't want to require
+   *  C++0x, so we init in time.cc.  To ensure that happens before first use,
+   *  we add a call to StaticInit (below) to every compilation unit which
+   *  includes nstime.h.
+   */
+  static MarkedTimes * g_markingTimes;
+public:
+  /**
+   *  Function to force static initialization of Time
+   */
+  static bool StaticInit ();
+private:
+
+  /* Friend the Simulator class so it can call the private function
+     ClearMarkedTimes ()
+  */
+  friend class Simulator;
+  /**
+   *  Remove all MarkedTimes.
+   *
+   *  \intern
+   *  Has to be visible to the Simulator class, hence the friending.
+   */
+  static void ClearMarkedTimes ();
+  /**
+   *  Record a Time instance with the MarkedTimes
+   */
+  static void Mark (Time * const time);
+  /**
+   *  Remove a Time instance from the MarkedTimes, called by ~Time()
+   */
+  static void Clear (Time * const time);
+  /**
+   *  Convert existing Times to the new unit.
+   */
+  static void ConvertTimes (const enum Unit unit);
 
   friend bool operator == (const Time &lhs, const Time &rhs);
   friend bool operator != (const Time &lhs, const Time &rhs);
@@ -484,8 +587,14 @@
   friend Time Max (const Time &ta, const Time &tb);
   friend Time Min (const Time &ta, const Time &tb);
 
-  int64_t m_data;
-};
+
+  int64_t m_data;                   //!< Virtual time value, in the current unit.
+
+};  // class Time
+
+
+// Force static initialization of Time
+static bool NS_UNUSED_GLOBAL (g_TimeStaticInit) = Time::StaticInit ();
 
 inline bool
 operator == (const Time &lhs, const Time &rhs)
@@ -539,6 +648,7 @@
 /**
  * \anchor ns3-Time-Abs
  * \relates ns3::TimeUnit
+ * Absolute value function for Time
  * \param time the input value
  * \returns the absolute value of the input value.
  */
@@ -558,8 +668,6 @@
   return Time ((ta.m_data < tb.m_data) ? tb : ta);
 }
 /**
- * \anchor ns3-Time-Min
- * \relates ns3::TimeUnit
  * \param ta the first value
  * \param tb the seconds value
  * \returns the min of the two input values.
@@ -570,7 +678,19 @@
 }
 
 
+/**
+ * \brief Time output streamer.
+ * 
+ * Generates output such as "3.96ns"
+ * \relates ns3::Time
+ */
 std::ostream& operator<< (std::ostream& os, const Time & time);
+/**
+ * \brief Time input streamer
+ *
+ * Uses the Time::Time (const std::string &) constructor
+ * \relates ns3::Time
+ */
 std::istream& operator>> (std::istream& is, Time & time);
 
 /**
@@ -582,6 +702,7 @@
  * Simulator::Schedule (Seconds (5.0), ...);
  * \endcode
  * \param seconds seconds value
+ * \relates ns3::Time
  */
 inline Time Seconds (double seconds)
 {
@@ -597,6 +718,7 @@
  * Simulator::Schedule (MilliSeconds (5), ...);
  * \endcode
  * \param ms milliseconds value
+ * \relates ns3::Time
  */
 inline Time MilliSeconds (uint64_t ms)
 {
@@ -611,6 +733,7 @@
  * Simulator::Schedule (MicroSeconds (5), ...);
  * \endcode
  * \param us microseconds value
+ * \relates ns3::Time
  */
 inline Time MicroSeconds (uint64_t us)
 {
@@ -625,6 +748,7 @@
  * Simulator::Schedule (NanoSeconds (5), ...);
  * \endcode
  * \param ns nanoseconds value
+ * \relates ns3::Time
  */
 inline Time NanoSeconds (uint64_t ns)
 {
@@ -639,6 +763,7 @@
  * Simulator::Schedule (PicoSeconds (5), ...);
  * \endcode
  * \param ps picoseconds value
+ * \relates ns3::Time
  */
 inline Time PicoSeconds (uint64_t ps)
 {
@@ -653,6 +778,7 @@
  * Simulator::Schedule (FemtoSeconds (5), ...);
  * \endcode
  * \param fs femtoseconds value
+ * \relates ns3::Time
  */
 inline Time FemtoSeconds (uint64_t fs)
 {
@@ -660,26 +786,50 @@
 }
 
 
+/**
+ * \see Seconds(double)
+ * \relates ns3::Time
+ */
 inline Time Seconds (int64x64_t seconds)
 {
   return Time::From (seconds, Time::S);
 }
+/**
+ * \see MilliSeconds(uint64_t)
+ * \relates ns3::Time
+ */
 inline Time MilliSeconds (int64x64_t ms)
 {
   return Time::From (ms, Time::MS);
 }
+/**
+ * \see MicroSeconds(uint64_t)
+ * \relates ns3::Time
+ */
 inline Time MicroSeconds (int64x64_t us)
 {
   return Time::From (us, Time::US);
 }
+/**
+ * \see NanoSeconds(uint64_t)
+ * \relates ns3::Time
+ */
 inline Time NanoSeconds (int64x64_t ns)
 {
   return Time::From (ns, Time::NS);
 }
+/**
+ * \see PicoSeconds(uint64_t)
+ * \relates ns3::Time
+ */
 inline Time PicoSeconds (int64x64_t ps)
 {
   return Time::From (ps, Time::PS);
 }
+/**
+ * \see FemtoSeconds(uint64_t)
+ * \relates ns3::Time
+ */
 inline Time FemtoSeconds (int64x64_t fs)
 {
   return Time::From (fs, Time::FS);
@@ -699,7 +849,37 @@
 
 ATTRIBUTE_VALUE_DEFINE (Time);
 ATTRIBUTE_ACCESSOR_DEFINE (Time);
-ATTRIBUTE_CHECKER_DEFINE (Time);
+
+/**
+ * \brief Helper to make a Time checker with bounded range.
+ * Both limits are inclusive
+ *
+ * \return the AttributeChecker
+ */
+Ptr<const AttributeChecker> MakeTimeChecker (const Time min, const Time max);
+
+/**
+ * \brief Helper to make an unbounded Time checker.
+ *
+ * \return the AttributeChecker
+ */
+inline
+Ptr<const AttributeChecker> MakeTimeChecker (void)
+{
+  return MakeTimeChecker (Time::Min (), Time::Max ());
+}
+
+/**
+ * \brief Helper to make a Time checker with a lower bound.
+ *
+ * \return the AttributeChecker
+ */
+inline
+Ptr<const AttributeChecker> MakeTimeChecker (const Time min)
+{
+  return MakeTimeChecker (min, Time::Max ());
+}
+
 
 } // namespace ns3
 
diff -Naur ns-3.17/src/core/model/object-base.h ns-3.18/src/core/model/object-base.h
--- ns-3.17/src/core/model/object-base.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/object-base.h	2013-10-26 07:07:30.027364392 -0700
@@ -55,8 +55,14 @@
 class ObjectBase
 {
 public:
+  /**
+   * Get the type ID.
+   */
   static TypeId GetTypeId (void);
 
+  /**
+   * Virtual destructor
+   */
   virtual ~ObjectBase ();
 
   /**
diff -Naur ns-3.17/src/core/model/object-factory.cc ns-3.18/src/core/model/object-factory.cc
--- ns-3.17/src/core/model/object-factory.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/object-factory.cc	2013-10-26 07:07:30.027364392 -0700
@@ -92,6 +92,7 @@
   Callback<ObjectBase *> cb = m_tid.GetConstructor ();
   ObjectBase *base = cb ();
   Object *derived = dynamic_cast<Object *> (base);
+  NS_ASSERT (derived != 0);
   derived->SetTypeId (m_tid);
   derived->Construct (m_parameters);
   Ptr<Object> object = Ptr<Object> (derived, false);
diff -Naur ns-3.17/src/core/model/object.h ns-3.18/src/core/model/object.h
--- ns-3.17/src/core/model/object.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/object.h	2013-10-26 07:07:30.031364393 -0700
@@ -63,6 +63,9 @@
 class Object : public SimpleRefCount<Object,ObjectBase,ObjectDeleter>
 {
 public:
+  /**
+   * Get the type ID.
+   */
   static TypeId GetTypeId (void);
 
   /**
@@ -90,9 +93,9 @@
     Ptr<const Object> Next (void);
 private:
     friend class Object;
-    AggregateIterator (Ptr<const Object> object);
-    Ptr<const Object> m_object;
-    uint32_t m_current;
+    AggregateIterator (Ptr<const Object> object);  //!< Constructor
+    Ptr<const Object> m_object;                    //!< Parent Object
+    uint32_t m_current;                            //!< Current position in parent's aggegrates
   };
 
   Object ();
@@ -241,8 +244,27 @@
     Object *buffer[1];
   };
 
+  /**
+   * Find an object of TypeId tid in the aggregates of this Object.
+   *
+   * \param tid the TypeId we're looking for
+   * \return the matching Object, if it is found
+   */
   Ptr<Object> DoGetObject (TypeId tid) const;
+  /**
+   * \return is reference count non zero
+   */
   bool Check (void) const;
+  /**
+   * \return Do any of our aggregates have non zero reference count?
+   *
+   * In some cases, when an event is scheduled against a subclass of
+   * Object, and if no one owns a reference directly to this object, the
+   * object is alive, has a refcount of zero and the method ran when the
+   * event expires runs against the raw pointer which means that we are
+   * manipulating an object with a refcount of zero.  So, instead we
+   * check the aggregate reference count.
+   */
   bool CheckLoose (void) const;
   /**
    * \param tid an TypeId
@@ -262,6 +284,12 @@
   */
   void Construct (const AttributeConstructionList &attributes);
 
+  /**
+   * Keep the list of aggregates in most-recently-used order
+   *
+   * \param aggregates the list of aggregated objects
+   * \param i the most recently used entry in the list
+   */
   void UpdateSortedArray (struct Aggregates *aggregates, uint32_t i) const;
   /**
    * Attempt to delete this object. This method iterates
diff -Naur ns-3.17/src/core/model/random-variable.cc ns-3.18/src/core/model/random-variable.cc
--- ns-3.17/src/core/model/random-variable.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/random-variable.cc	2013-10-26 07:07:30.027364392 -0700
@@ -46,6 +46,7 @@
 
 NS_LOG_COMPONENT_DEFINE ("RandomVariable");
 
+/** \ingroup legacyrandom */
 class RandomVariableBase
 {
 public:
@@ -163,6 +164,7 @@
 // -----------------------------------------------------------------------------
 // UniformVariableImpl
 
+/** \ingroup legacyrandom */
 class UniformVariableImpl : public RandomVariableBase
 {
 public:
@@ -291,6 +293,7 @@
 // -----------------------------------------------------------------------------
 // ConstantVariableImpl methods
 
+/** \ingroup legacyrandom */
 class ConstantVariableImpl : public RandomVariableBase
 {
 
@@ -391,6 +394,7 @@
 // SequentialVariableImpl methods
 
 
+/** \ingroup legacyrandom */
 class SequentialVariableImpl : public RandomVariableBase
 {
 
@@ -513,6 +517,7 @@
 // -----------------------------------------------------------------------------
 // ExponentialVariableImpl methods
 
+/** \ingroup legacyrandom */
 class ExponentialVariableImpl : public RandomVariableBase
 {
 public:
@@ -624,6 +629,7 @@
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // ParetoVariableImpl methods
+/** \ingroup legacyrandom */
 class ParetoVariableImpl : public RandomVariableBase
 {
 public:
@@ -813,6 +819,7 @@
 // -----------------------------------------------------------------------------
 // WeibullVariableImpl methods
 
+/** \ingroup legacyrandom */
 class WeibullVariableImpl : public RandomVariableBase
 {
 public:
@@ -948,6 +955,7 @@
 // -----------------------------------------------------------------------------
 // NormalVariableImpl methods
 
+/** \ingroup legacyrandom */
 class NormalVariableImpl : public RandomVariableBase   // Normally Distributed random var
 
 {
@@ -1103,6 +1111,7 @@
 
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
+/** \ingroup legacyrandom */
 class EmpiricalVariableImpl : public RandomVariableBase
 {
 public:
@@ -1294,6 +1303,7 @@
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // IntegerValue EmpiricalVariableImpl methods
+/** \ingroup legacyrandom */
 class IntEmpiricalVariableImpl : public EmpiricalVariableImpl
 {
 public:
@@ -1342,6 +1352,7 @@
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // DeterministicVariableImpl
+/** \ingroup legacyrandom */
 class DeterministicVariableImpl : public RandomVariableBase
 {
 
@@ -1409,6 +1420,7 @@
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // LogNormalVariableImpl
+/** \ingroup legacyrandom */
 class LogNormalVariableImpl : public RandomVariableBase
 {
 public:
@@ -1504,6 +1516,7 @@
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // GammaVariableImpl
+/** \ingroup legacyrandom */
 class GammaVariableImpl : public RandomVariableBase
 {
 public:
@@ -1637,6 +1650,7 @@
 // -----------------------------------------------------------------------------
 // ErlangVariableImpl
 
+/** \ingroup legacyrandom */
 class ErlangVariableImpl : public RandomVariableBase
 {
 public:
@@ -1700,8 +1714,8 @@
 double
 ErlangVariableImpl::GetValue (unsigned int k, double lambda)
 {
-  // XXX: Fixme: do not create a new 
-  // RNG stream every time the function is called !
+  /// \todo do not create a new 
+  /// RNG stream every time the function is called !
   NS_LOG_FUNCTION (this << k << lambda);
   ExponentialVariable exponential (lambda);
 
@@ -1741,6 +1755,7 @@
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // TriangularVariableImpl methods
+/** \ingroup legacyrandom */
 class TriangularVariableImpl : public RandomVariableBase
 {
 public:
@@ -1834,6 +1849,7 @@
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // ZipfVariableImpl
+/** \ingroup legacyrandom */
 class ZipfVariableImpl : public RandomVariableBase
 {
 public:
@@ -1926,6 +1942,7 @@
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // ZetaVariableImpl
+/** \ingroup legacyrandom */
 class ZetaVariableImpl : public RandomVariableBase
 {
 public:
@@ -2039,7 +2056,7 @@
         }
       return os;
     }
-  // XXX: support other distributions
+  /// \todo support other distributions
   os.setstate (std::ios_base::badbit);
   return os;
 }
@@ -2125,7 +2142,7 @@
   else
     {
       NS_FATAL_ERROR ("RandomVariable deserialization not implemented for " << type);
-      // XXX: support other distributions.
+      /// \todo support other distributions.
     }
   return is;
 }
diff -Naur ns-3.17/src/core/model/random-variable.h ns-3.18/src/core/model/random-variable.h
--- ns-3.17/src/core/model/random-variable.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/random-variable.h	2013-10-26 07:07:30.047364393 -0700
@@ -32,18 +32,20 @@
 #include "rng-seed-manager.h"
 
 /**
- * \ingroup core
- * \defgroup randomvariable Random Variable Distributions
- *
+ * \ingroup randomvariable
+ * \defgroup legacyrandom Legacy Random Variables
  */
 
 namespace ns3 {
 
+/**
+ * \ingroup legacyrandom
+ */
 class RandomVariableBase;
 
 /**
  * \brief The basic RNG for NS-3.
- * \ingroup randomvariable
+ * \ingroup legacyrandom
  *
  * Note: The underlying random number generation method used
  * by NS-3 is the RngStream code by Pierre L'Ecuyer at
@@ -87,7 +89,7 @@
 
 /**
  * \brief The uniform distribution RNG for NS-3.
- * \ingroup randomvariable
+ * \ingroup legacyrandom
  *
  * This class supports the creation of objects that return random numbers
  * from a fixed uniform distribution.  It also supports the generation of
@@ -146,7 +148,7 @@
 
 /**
  * \brief A random variable that returns a constant
- * \ingroup randomvariable
+ * \ingroup legacyrandom
  *
  * Class ConstantVariable defines a random number generator that
  * returns the same value every sample.
@@ -177,7 +179,7 @@
 
 /**
  * \brief Return a sequential list of values
- * \ingroup randomvariable
+ * \ingroup legacyrandom
  *
  * Class SequentialVariable defines a random number generator that
  * returns a sequential sequence.  The sequence monotonically
@@ -216,7 +218,7 @@
 
 /**
  * \brief Exponentially Distributed random var
- * \ingroup randomvariable
+ * \ingroup legacyrandom
  *
  * This class supports the creation of objects that return random numbers
  * from a fixed exponential distribution.  It also supports the generation of
@@ -269,7 +271,7 @@
 
 /**
  * \brief ParetoVariable distributed random var
- * \ingroup randomvariable
+ * \ingroup legacyrandom
  *
  * This class supports the creation of objects that return random numbers
  * from a fixed pareto distribution.  It also supports the generation of
@@ -353,7 +355,7 @@
 
 /**
  * \brief WeibullVariable distributed random var
- * \ingroup randomvariable
+ * \ingroup legacyrandom
  *
  * This class supports the creation of objects that return random numbers
  * from a fixed weibull distribution.  It also supports the generation of
@@ -408,7 +410,7 @@
 /**
  * \brief Class NormalVariable defines a random variable with a
  * normal (Gaussian) distribution.
- * \ingroup randomvariable
+ * \ingroup legacyrandom
  *
  * This class supports the creation of objects that return random numbers
  * from a fixed normal distribution.  It also supports the generation of
@@ -447,7 +449,7 @@
 
 /**
  * \brief EmpiricalVariable distribution random var
- * \ingroup randomvariable
+ * \ingroup legacyrandom
  *
  * Defines a random variable  that has a specified, empirical
  * distribution.  The distribution is specified by a
@@ -480,7 +482,7 @@
 
 /**
  * \brief Integer-based empirical distribution
- * \ingroup randomvariable
+ * \ingroup legacyrandom
  *
  * Defines an empirical distribution where all values are integers.
  * Indentical to EmpiricalVariable, except that the inverse transform
@@ -495,7 +497,7 @@
 
 /**
  * \brief a non-random variable
- * \ingroup randomvariable
+ * \ingroup legacyrandom
  *
  * Defines a random variable  that has a specified, predetermined
  * sequence.  This would be useful when trying to force
@@ -521,7 +523,7 @@
 
 /**
  * \brief Log-normal Distributed random var
- * \ingroup randomvariable
+ * \ingroup legacyrandom
  *
  * LogNormalVariable defines a random variable with log-normal
  * distribution.  If one takes the natural logarithm of random
@@ -553,7 +555,7 @@
 
 /**
  * \brief Gamma Distributed Random Variable
- * \ingroup randomvariable
+ * \ingroup legacyrandom
  *
  * GammaVariable defines a random variable with gamma distribution.
  *
@@ -602,7 +604,7 @@
 
 /**
  * \brief Erlang Distributed Random Variable
- * \ingroup randomvariable
+ * \ingroup legacyrandom
  *
  * ErlangVariable defines a random variable with Erlang distribution.
  *
@@ -655,7 +657,7 @@
 
 /**
  * \brief Zipf Distributed Random Variable
- * \ingroup randomvariable
+ * \ingroup legacyrandom
  *
  * ZipfVariable defines a discrete random variable with Zipf distribution.
  *
@@ -685,7 +687,7 @@
 
 /**
  * \brief Zeta Distributed Distributed Random Variable
- * \ingroup randomvariable
+ * \ingroup legacyrandom
  *
  * ZetaVariable defines a discrete random variable with Zeta distribution.
  *
@@ -711,7 +713,7 @@
 
 /**
  * \brief Triangularly Distributed random var
- * \ingroup randomvariable
+ * \ingroup legacyrandom
  *
  * This distribution is a triangular distribution.  The probability density
  * is in the shape of a triangle.
diff -Naur ns-3.17/src/core/model/random-variable-stream.cc ns-3.18/src/core/model/random-variable-stream.cc
--- ns-3.17/src/core/model/random-variable-stream.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/random-variable-stream.cc	2013-10-26 07:07:30.047364393 -0700
@@ -1170,8 +1170,6 @@
   return tid;
 }
 TriangularRandomVariable::TriangularRandomVariable ()
-  :
-  m_mode (0.5)
 {
   // m_mean, m_min, and m_max are initialized after constructor by
   // attributes
diff -Naur ns-3.17/src/core/model/random-variable-stream.h ns-3.18/src/core/model/random-variable-stream.h
--- ns-3.17/src/core/model/random-variable-stream.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/random-variable-stream.h	2013-10-26 07:07:30.043364393 -0700
@@ -33,6 +33,36 @@
 
 namespace ns3 {
 
+/**
+ * \ingroup core
+ * \defgroup randomvariable Random Variables
+ *
+ * \brief ns-3 random numbers are provided via instances of
+ * ns3::RandomVariableStream.
+ *
+ * - By default, ns-3 simulations use a fixed seed; if there is any
+ *   randomness in the simulation, each run of the program will yield
+ *   identical results unless the seed and/or run number is changed.
+ * - In ns-3.3 and earlier, ns-3 simulations used a random seed by default;
+ *   this marks a change in policy starting with ns-3.4.
+ * - In ns-3.14 and earlier, ns-3 simulations used a different wrapper
+ *   class called ns3::RandomVariable.  This implementation is documented
+ *   above under Legacy Random Variables. As of ns-3.15, this class has 
+ *   been replaced by ns3::RandomVariableStream; the underlying 
+ *   pseudo-random number generator has not changed.
+ * - To obtain randomness across multiple simulation runs, you must
+ *   either set the seed differently or set the run number differently.
+ *   To set a seed, call ns3::RngSeedManager::SetSeed() at the beginning
+ *   of the program; to set a run number with the same seed, call 
+ *   ns3::RngSeedManager::SetRun() at the beginning of the program.
+ * - Each RandomVariableStream used in ns-3 has a virtual random number 
+ *   generator associated with it; all random variables use either 
+ *   a fixed or random seed based on the use of the global seed. 
+ * - If you intend to perform multiple runs of the same scenario, 
+ *   with different random numbers, please be sure to read the manual 
+ *   section on how to perform independent replications.
+ */
+  
 class RngStream;
 
 /**
diff -Naur ns-3.17/src/core/model/random-variable-stream-helper.cc ns-3.18/src/core/model/random-variable-stream-helper.cc
--- ns-3.17/src/core/model/random-variable-stream-helper.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/random-variable-stream-helper.cc	1969-12-31 16:00:00.000000000 -0800
@@ -1,46 +0,0 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/*
- * Copyright (c) 2012 University of Washington
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation;
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-#include "random-variable-stream.h"
-#include "random-variable-stream-helper.h"
-#include "config.h"
-#include "pointer.h"
-#include "log.h"
-#include "assert.h"
-
-NS_LOG_COMPONENT_DEFINE ("RandomVariableStreamHelper");
-
-namespace ns3 {
-
-int64_t RandomVariableStreamHelper::AssignStreams (std::string path, int64_t stream)
-{
-  NS_LOG_FUNCTION_NOARGS ();
-  NS_ASSERT (stream >= 0);
-  Config::MatchContainer mc = Config::LookupMatches (path);
-  int64_t i = 0;
-  for (Config::MatchContainer::Iterator mci = mc.Begin (); mci != mc.End (); ++mci, ++i)
-    {
-      PointerValue ptr = mc.Get (i);
-      Ptr<RandomVariableStream> rvs = ptr.Get<RandomVariableStream> ();
-      NS_LOG_DEBUG ("RandomVariableStream found: " << rvs << "; setting stream to " << (stream + i));
-      rvs->SetStream (stream + i);
-    }
-  return i;
-}
-
-} // namespace ns3
diff -Naur ns-3.17/src/core/model/random-variable-stream-helper.h ns-3.18/src/core/model/random-variable-stream-helper.h
--- ns-3.17/src/core/model/random-variable-stream-helper.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/random-variable-stream-helper.h	1969-12-31 16:00:00.000000000 -0800
@@ -1,65 +0,0 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/*
- * Copyright (c) 2012 University of Washington
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation;
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-#ifndef RANDOM_VARIABLE_STREAM_HELPER_H
-#define RANDOM_VARIABLE_STREAM_HELPER_H
-
-#include <string>
-
-namespace ns3 {
-
-/**
- * \brief Helper class for static methods involving RandomVariableStream
- */
-class RandomVariableStreamHelper
-{
-public:
-  /**
-   * This helper method can be used to configure the stream number for
-   * one or more RNG streams.  The path passed in should correspond to
-   * an attribute path in the configuration system.  It may contain wildcards
-   * and may ultimately match zero, one, or more than one objects.
-   *
-   * The objects to match are of type PointerValue where the underlying
-   * type is of type Ptr<RandomVariableStream>.  
-   *
-   * \code
-   *    .AddAttribute ("Speed",
-   *                "A random variable used to pick the speed of a random waypoint model.",
-   *                StringValue("ns3::UniformRandomVariable[Min=0.3|Max=0.7]"),
-   *                MakePointerAccessor (&RandomWaypointMobilityModel::m_speed),
-   *                MakePointerChecker<RandomVariableStream> ())
-   *
-   * \endcode
-   *
-   * Usage would look (for node 3) like this:
-   * \code
-   * std::string path ("/$ns3::NodeListPriv/NodeList/3/$ns3::Node/$ns3::RandomWaypointMobilityModel/Speed/$ns3::UniformRandomVariable");
-   * int64_t retVal = RandomVariableStreamHelper::AssignStreams (path, 0);
-   * \endcode
-   *
-   * \return The number of streams set
-   * \param path (possibly wildcarded) path to a RandomVariableStream PointerValue
-   * \param stream stream number to set; must be non-negative
-   */
-  static int64_t AssignStreams (std::string path, int64_t stream);
-};
-
-} // namespace ns3
-
-#endif /* RANDOM_VARIABLE_STREAM_HELPER_H */
diff -Naur ns-3.17/src/core/model/realtime-simulator-impl.cc ns-3.18/src/core/model/realtime-simulator-impl.cc
--- ns-3.17/src/core/model/realtime-simulator-impl.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/realtime-simulator-impl.cc	2013-10-26 07:07:30.035364393 -0700
@@ -795,8 +795,8 @@
 Time 
 RealtimeSimulatorImpl::GetMaximumSimulationTime (void) const
 {
-  // XXX: I am fairly certain other compilers use other non-standard
-  // post-fixes to indicate 64 bit constants.
+  /// \todo I am fairly certain other compilers use other non-standard
+  /// post-fixes to indicate 64 bit constants.
   return TimeStep (0x7fffffffffffffffLL);
 }
 
diff -Naur ns-3.17/src/core/model/realtime-simulator-impl.h ns-3.18/src/core/model/realtime-simulator-impl.h
--- ns-3.17/src/core/model/realtime-simulator-impl.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/realtime-simulator-impl.h	2013-10-26 07:07:30.039364393 -0700
@@ -35,6 +35,9 @@
 
 namespace ns3 {
 
+/**
+ * \ingroup simulator
+ */
 class RealtimeSimulatorImpl : public SimulatorImpl
 {
 public:
diff -Naur ns-3.17/src/core/model/ref-count-base.h ns-3.18/src/core/model/ref-count-base.h
--- ns-3.17/src/core/model/ref-count-base.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/ref-count-base.h	2013-10-26 07:07:30.027364392 -0700
@@ -30,6 +30,7 @@
 /**
  * \brief A deprecated way to get reference-counting powers
  *
+ * \deprecated
  * Users who wish to use reference counting for a class of their own should use
  * instead the template \ref ns3::SimpleRefCount. This class is maintained
  * purely for compatibility to avoid breaking the code of users.
diff -Naur ns-3.17/src/core/model/rng-stream.h ns-3.18/src/core/model/rng-stream.h
--- ns-3.17/src/core/model/rng-stream.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/rng-stream.h	2013-10-26 07:07:30.043364393 -0700
@@ -25,7 +25,6 @@
 namespace ns3 {
 
 /**
- * \ingroup core
  * \ingroup randomvariable 
  *
  * \brief Combined Multiple-Recursive Generator MRG32k3a
diff -Naur ns-3.17/src/core/model/scheduler.h ns-3.18/src/core/model/scheduler.h
--- ns-3.17/src/core/model/scheduler.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/scheduler.h	2013-10-26 07:07:30.027364392 -0700
@@ -30,7 +30,11 @@
 
 /**
  * \ingroup core
- * \defgroup scheduler Scheduler
+ * \defgroup scheduler Scheduler and Events
+ */
+/**
+ * \ingroup scheduler
+ * \defgroup events Events
  */
 /**
  * \ingroup scheduler
@@ -55,12 +59,14 @@
 public:
   static TypeId GetTypeId (void);
 
+  /** \ingroup events */
   struct EventKey
   {
     uint64_t m_ts;
     uint32_t m_uid;
     uint32_t m_context;
   };
+  /** \ingroup events */
   struct Event
   {
     EventImpl *impl;
diff -Naur ns-3.17/src/core/model/simple-ref-count.h ns-3.18/src/core/model/simple-ref-count.h
--- ns-3.17/src/core/model/simple-ref-count.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/simple-ref-count.h	2013-10-26 07:07:30.039364393 -0700
@@ -31,6 +31,7 @@
 namespace ns3 {
 
 /**
+ * \ingroup ptr
  * \brief A template-based reference counting class
  *
  * This template can be used to give reference-counting powers
@@ -63,12 +64,21 @@
 class SimpleRefCount : public PARENT
 {
 public:
+  /**
+   * Constructor
+   */
   SimpleRefCount ()
     : m_count (1)
   {}
+  /**
+   * Copy constructor
+   */
   SimpleRefCount (const SimpleRefCount &o)
     : m_count (1)
   {}
+  /**
+   * Assignment
+   */
   SimpleRefCount &operator = (const SimpleRefCount &o)
   {
     return *this;
@@ -108,6 +118,9 @@
     return m_count;
   }
 
+  /**
+   *  Noop
+   */
   static void Cleanup (void) {}
 private:
   // Note we make this mutable so that the const methods can still
diff -Naur ns-3.17/src/core/model/simulator.cc ns-3.18/src/core/model/simulator.cc
--- ns-3.17/src/core/model/simulator.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/simulator.cc	2013-10-26 07:07:30.047364393 -0700
@@ -157,6 +157,7 @@
 Simulator::Run (void)
 {
   NS_LOG_FUNCTION_NOARGS ();
+  Time::ClearMarkedTimes ();
   GetImpl ()->Run ();
 }
 
diff -Naur ns-3.17/src/core/model/simulator.h ns-3.18/src/core/model/simulator.h
--- ns-3.17/src/core/model/simulator.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/simulator.h	2013-10-26 07:07:30.031364393 -0700
@@ -39,6 +39,10 @@
 
 /**
  * \ingroup core
+ * \defgroup simulator Simulator
+ */
+/**
+ * \ingroup simulator
  *
  * \brief Control the scheduling of simulation events. 
  *
diff -Naur ns-3.17/src/core/model/system-path.cc ns-3.18/src/core/model/system-path.cc
--- ns-3.17/src/core/model/system-path.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/system-path.cc	2013-10-26 07:07:30.039364393 -0700
@@ -110,8 +110,8 @@
   }
 #elif defined (__win32__)
   {
-    // XXX: untested. it should work if code is compiled with
-    // LPTSTR = char *
+    /// \todo untested. it should work if code is compiled with
+    /// LPTSTR = char *
     DWORD size = 1024;
     LPTSTR lpFilename = (LPTSTR) malloc (sizeof(TCHAR) * size);
     DWORD status = GetModuleFilename (0, lpFilename, size);
@@ -232,7 +232,7 @@
     }
   closedir (dp);
 #elif defined (HAVE_FIND_FIRST_FILE)
-  // XXX: untested
+  /// \todo untested
   HANDLE hFind;
   WIN32_FIND_DATA fileData;
   
@@ -308,11 +308,17 @@
     {
       std::string tmp = Join (elements.begin (), i);
 #if defined(HAVE_MKDIR_H)
-      mkdir (tmp.c_str (), S_IRWXU);
+      if (mkdir (tmp.c_str (), S_IRWXU))
+        {
+          NS_LOG_ERROR ("failed creating directory " << tmp);
+        }
 #endif
     }
 #if defined(HAVE_MKDIR_H)
-  mkdir (path.c_str (), S_IRWXU);
+      if (mkdir (path.c_str (), S_IRWXU))
+        {
+          NS_LOG_ERROR ("failed creating directory " << path);
+        }
 #endif
 
 }
diff -Naur ns-3.17/src/core/model/system-thread.h ns-3.18/src/core/model/system-thread.h
--- ns-3.17/src/core/model/system-thread.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/system-thread.h	2013-10-26 07:07:30.035364393 -0700
@@ -148,7 +148,6 @@
 
   Callback<void> m_callback;
   pthread_t m_thread;
-  void *    m_ret;
 #endif 
 };
 
diff -Naur ns-3.17/src/core/model/test.cc ns-3.18/src/core/model/test.cc
--- ns-3.17/src/core/model/test.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/test.cc	2013-10-26 07:07:30.035364393 -0700
@@ -278,7 +278,7 @@
 {
   NS_LOG_FUNCTION (this << filename);
   const TestCase *current = this;
-  while (current->m_dataDir == "" && current != 0)
+  while (current != 0 && current->m_dataDir == "")
     {
       current = current->m_parent;
     }
@@ -484,22 +484,30 @@
 TestRunnerImpl::ReplaceXmlSpecialCharacters (std::string xml) const
 {
   NS_LOG_FUNCTION (this << xml);
-  std::string specials = "<>&\"'";
-  std::string replacements[] = {"&lt;", "&gt;", "&amp;", "&#39;", "&quot;"};
+  typedef std::map <char, std::string> specials_map;
+  specials_map specials;
+  specials['<'] = "&lt;";
+  specials['>'] = "&gt;";
+  specials['&'] = "&amp;";
+  specials['"'] = "&#39;";
+  specials['\''] = "&quot;";
+
   std::string result;
-  std::size_t index, length = xml.length ();
+  std::size_t length = xml.length ();
 
   for (size_t i = 0; i < length; ++i)
     {
       char character = xml[i];
 
-      if ((index = specials.find (character)) == std::string::npos)
+      specials_map::const_iterator it = specials.find (character);
+
+      if (it == specials.end ())
         {
           result.push_back (character);
         }
       else
         {
-          result += replacements[index];
+          result += it->second;
         }
     }
   return result;
@@ -539,7 +547,7 @@
   double user = test->m_result->clock.GetElapsedUser () / MS_PER_SEC;
   double system = test->m_result->clock.GetElapsedSystem () / MS_PER_SEC;
 
-  (*os).precision (3);
+  std::streamsize oldPrecision = (*os).precision (3);
   *os << std::fixed;
 
   std::string statusString = test->IsFailed ()?"FAIL":"PASS";
@@ -595,6 +603,9 @@
             }
         }
     }
+
+  (*os).unsetf(std::ios_base::floatfield);
+  (*os).precision (oldPrecision);
 }
   
 void
@@ -652,6 +663,7 @@
   for (std::list<TestCase *>::const_iterator i = begin; i != end; ++i)
     {
       TestSuite * test= dynamic_cast<TestSuite *>(*i);
+      NS_ASSERT (test != 0);
       if (printTestType)
         {
           std::cout << label[test->GetTestType ()];
@@ -708,7 +720,7 @@
               delete *j;
 
               // Remove this test case from the test suite.
-              test->m_children.erase (j);
+              j = test->m_children.erase (j);
             }
           else
             {
diff -Naur ns-3.17/src/core/model/test.h ns-3.18/src/core/model/test.h
--- ns-3.17/src/core/model/test.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/test.h	2013-10-26 07:07:30.043364393 -0700
@@ -41,6 +41,11 @@
 // defining a robust macro.
 //
 
+/**
+ * \internal
+ *
+ * Check if we should assert on errors, and do so
+ */
 #define ASSERT_ON_FAILURE                       \
   do {                                          \
     if (MustAssertOnFailure ())                 \
@@ -49,6 +54,11 @@
       }                                         \
   } while (false)
 
+/**
+ * \internal
+ *
+ * If we shouldn't continue on errors, return
+ */
 #define CONTINUE_ON_FAILURE                                             \
   do {                                                                  \
     if (!MustContinueOnFailure ())                                      \
@@ -57,6 +67,11 @@
       }                                                                 \
   } while (false)
 
+/**
+ * \internal
+ *
+ * If we shouldn't continue on errors, return test status
+ */
 #define CONTINUE_ON_FAILURE_RETURNS_BOOL                                \
   do {                                                                  \
     if (!MustContinueOnFailure ())                                      \
@@ -839,23 +854,26 @@
    * \brief How long the test takes to execute.
    */
   enum TestDuration {
-    QUICK         = 1,  /// Fast test.
-    EXTENSIVE     = 2,  /// Medium length test.
-    TAKES_FOREVER = 3   /// Very long running test.
+    QUICK         = 1,  //!< Fast test.
+    EXTENSIVE     = 2,  //!< Medium length test.
+    TAKES_FOREVER = 3   //!< Very long running test.
   };
 
+  /**
+   *  Destructor
+   */
   virtual ~TestCase ();
 
 protected:
   /**
-   * \param name the name of the new test created
+   * \param name the name of the new TestCase created
    */
   TestCase (std::string name);
 
   /**
-   * \brief Add an individual test case to this test suite.
+   * \brief Add an individual child TestCase case to this TestCase.
    *
-   * \param testCase Pointer to the test case object to be added.
+   * \param testCase Pointer to the TestCase object to be added.
    *
    * \deprecated this method will go away in future versions of 
    * ns-3. Please use instead AddTestCase (TestCase, TestDuration)  
@@ -863,9 +881,9 @@
   void AddTestCase (TestCase *testCase) NS_DEPRECATED;
 
   /**
-   * \brief Add an individual test case to this test suite.
+   * \brief Add an individual child TestCase to this test suite.
    *
-   * \param testCase Pointer to the test case object to be added.
+   * \param testCase Pointer to the TestCase object to be added.
    * \param duration Amount of time this test takes to execute.
    */
   void AddTestCase (TestCase *testCase, enum TestDuration duration);
@@ -885,6 +903,7 @@
   void SetDataDir (std::string directory);
 
   /**
+   * \deprecated
    * This method is deprecated. IsStatusFailure replaces it.
    */
   bool GetErrorStatus (void) const NS_DEPRECATED;
@@ -904,18 +923,46 @@
   
   // The methods below are used only by test macros and should not
   // be used by normal users.
+
+  /**
+   * \internal
+   *
+   * Log the failure of this TestCase.
+   */
   void ReportTestFailure (std::string cond, std::string actual, 
                       std::string limit, std::string message, 
                       std::string file, int32_t line);
+  /**
+   * \internal
+   *
+   * \return should we assert on failure, per the TestSuite configuration
+   */
   bool MustAssertOnFailure (void) const;
+  /**
+   * \internal
+   *
+   * \return should we continue on failure, per the TestSuite configuration
+   */
   bool MustContinueOnFailure (void) const;
+  /**
+   * \internal
+   * \param filename the bare (no path) file name
+   * \return the full path to filename in the data directory
+   */
   std::string CreateDataDirFilename (std::string filename);
+  /**
+   * \internal
+   * \param filename the bare (no path) file name
+   * \return the full path to filename in the temporary directory.
+   *  If the TestRunner is invoked with "--update-data", this will be
+   *  the data directory instead.
+   */
   std::string CreateTempDirFilename (std::string filename);
 private:
   friend class TestRunnerImpl;
 
   /**
-   * \brief Implementation to do any local setup required for this test case.
+   * \brief Implementation to do any local setup required for this TestCase.
    *
    * Subclasses should override this method to perform any costly per-test setup
    * before DoRun is invoked.
@@ -923,37 +970,53 @@
   virtual void DoSetup (void);
 
   /**
-   * \brief Implementation to actually run this test case.
+   * \brief Implementation to actually run this TestCase.
    *
    * Subclasses should override this method to conduct their tests.
    */
   virtual void DoRun (void) = 0;
 
   /**
-   * \brief Implementation to do any local setup required for this test case.
+   * \brief Implementation to do any local setup required for this TestCase.
    *
    * Subclasses should override this method to perform any costly per-test teardown
    */
   virtual void DoTeardown (void);
 
   // forbid copying objects
+  /**
+   * \internal
+   * Private, to block copying
+   */
   TestCase (TestCase& tc);
+  /**
+   * \internal
+   * Private, to block copying
+   */
   TestCase& operator= (TestCase& tc);
 
   // methods called by TestRunnerImpl
+  /**
+   * \internal
+   * Actually run this TestCase
+   */
   void Run (TestRunnerImpl *runner);
+  /**
+   * \internal
+   * \return the failure status of this TestCase and all it's children
+   */
   bool IsFailed (void) const;
 
-
+  // Forward declaration is enough, since we only include a pointer here
   struct Result;
 
-  TestCase *m_parent;
-  std::vector<TestCase *> m_children;
-  std::string m_dataDir;
-  TestRunnerImpl *m_runner;
-  struct Result *m_result;
-  std::string m_name;
-  enum TestDuration m_duration;
+  TestCase *m_parent;                   //!< Pointer to my parent TestCase
+  std::vector<TestCase *> m_children;   //!< Vector of my children
+  std::string m_dataDir;                //!< My data directory
+  TestRunnerImpl *m_runner;             //!< Pointer to the TestRunner
+  struct Result *m_result;              //!< Results data
+  std::string m_name;                   //!< TestCase name
+  enum TestDuration m_duration;         //!< TestCase duration
 };
 
 /**
@@ -967,12 +1030,12 @@
    * \brief Type of test.
    */
   enum Type {
-    ALL = 0,
-    BVT = 1,    /**< This test suite implements a Build Verification Test */
-    UNIT,       /**< This test suite implements a Unit Test */
-    SYSTEM,     /**< This test suite implements a System Test */
-    EXAMPLE,    /**< This test suite implements an Example Test */
-    PERFORMANCE /**< This test suite implements a Performance Test */
+    ALL = 0,    //!<
+    BVT = 1,    //!< This test suite implements a Build Verification Test
+    UNIT,       //!< This test suite implements a Unit Test
+    SYSTEM,     //!< This test suite implements a System Test
+    EXAMPLE,    //!< This test suite implements an Example Test
+    PERFORMANCE //!< This test suite implements a Performance Test
   };
 
   /**
@@ -994,7 +1057,7 @@
   virtual void DoRun (void);
 
 
-  TestSuite::Type m_type;  
+  TestSuite::Type m_type;               //!< Type of this TestSuite
 };
 
 /**
@@ -1003,6 +1066,13 @@
 class TestRunner
 {
 public:
+  /**
+   * Run the requested suite of tests.
+   *
+   * \param list of command line arguments
+   * \param argc number of elements in argv
+   * \returns success status
+   */
   static int Run (int argc, char *argv[]);
 };
 
@@ -1013,23 +1083,53 @@
 class TestVectors
 {
 public:
+  /**
+   * Constructor
+   */
   TestVectors ();
+  /**
+   * Virtual desctructor
+   */
   virtual ~TestVectors ();
 
+  /**
+   * \param reserve the number of entries to reserve
+   */
   void Reserve (uint32_t reserve);
 
+  /**
+   * \param vector the test vector to add
+   * \returns the new test vector index
+   */
   uint32_t Add (T vector);
 
+  /**
+   * \return the number of test vectors
+   */
   uint32_t GetN (void) const;
+  /**
+   * Get the i'th test vector
+   * \param i the requested vector index
+   * \return the requested vector
+   */
   T Get (uint32_t i) const;
 
 private:
+  /**
+   * Copy constructor, private to block copying
+   */
   TestVectors (const TestVectors& tv);
+  /**
+   * Assignment, private to prevent copying
+   */
   TestVectors& operator= (const TestVectors& tv);
+  /**
+   * Comparison (unimplemented?)
+   */
   bool operator== (const TestVectors& tv) const;
 
-  typedef std::vector<T> TestVector;
-  TestVector m_vectors;
+  typedef std::vector<T> TestVector;    //!< Container type
+  TestVector m_vectors;                 //!< The list of test vectors
 };
 
 template <typename T>
diff -Naur ns-3.17/src/core/model/time.cc ns-3.18/src/core/model/time.cc
--- ns-3.17/src/core/model/time.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/time.cc	2013-10-26 07:07:30.023364392 -0700
@@ -26,13 +26,67 @@
 #include "string.h"
 #include "object.h"
 #include "config.h"
+#include "system-mutex.h"
 #include "log.h"
 #include <cmath>
+#include <iomanip>  // showpos
 #include <sstream>
 
+NS_LOG_COMPONENT_DEFINE ("Time");
+
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("Time");
+// The set of marked times
+// static
+Time::MarkedTimes * Time::g_markingTimes = 0;
+
+/**
+ * Get mutex for critical sections around modification of Time::g_markingTimes
+ *
+ * \relates Time
+ */
+SystemMutex &
+GetMarkingMutex ()
+{
+  static SystemMutex g_markingMutex;
+  return g_markingMutex;
+}
+
+
+// Function called to force static initialization
+// static
+bool Time::StaticInit ()
+{
+  static bool firstTime = true;
+
+  CriticalSection critical (GetMarkingMutex ());
+
+  if (firstTime)
+    {
+      if (! g_markingTimes)
+        {
+          static MarkedTimes markingTimes;
+          g_markingTimes = & markingTimes;
+        }
+      else
+        {
+          NS_LOG_ERROR ("firstTime but g_markingTimes != 0");
+        }
+
+      // Schedule the cleanup.
+      // We'd really like:
+      //   NS_LOG_LOGIC ("scheduling ClearMarkedTimes()");
+      //   Simulator::Schedule ( Seconds (0), & ClearMarkedTimes);
+      //   [or even better:  Simulator::AtStart ( & ClearMarkedTimes ); ]
+      // But this triggers a static initialization order error,
+      // since the Simulator static initialization may not have occurred.
+      // Instead, we call ClearMarkedTimes directly from Simulator::Run ()
+      firstTime = false;
+    }
+
+  return firstTime;
+}
+
 
 Time::Time (const std::string& s)
 {
@@ -48,67 +102,85 @@
       if (trailer == std::string ("s"))
         {
           *this = Time::FromDouble (r, Time::S);
-          return;
         }
-      if (trailer == std::string ("ms"))
+      else if (trailer == std::string ("ms"))
         {
           *this = Time::FromDouble (r, Time::MS);
-          return;
         }
-      if (trailer == std::string ("us"))
+      else if (trailer == std::string ("us"))
         {
           *this = Time::FromDouble (r, Time::US);
-          return;
         }
-      if (trailer == std::string ("ns"))
+      else if (trailer == std::string ("ns"))
         {
           *this = Time::FromDouble (r, Time::NS);
-          return;
         }
-      if (trailer == std::string ("ps"))
+      else if (trailer == std::string ("ps"))
         {
           *this = Time::FromDouble (r, Time::PS);
-          return;
         }
-      if (trailer == std::string ("fs"))
+      else if (trailer == std::string ("fs"))
         {
           *this = Time::FromDouble (r, Time::FS);
-          return;
         }
-      NS_ABORT_MSG ("Can't Parse Time " << s);
+      else
+        {
+          NS_ABORT_MSG ("Can't Parse Time " << s);
+        }
+    }
+  else
+    {
+      // they didn't provide units, assume seconds
+      std::istringstream iss;
+      iss.str (s);
+      double v;
+      iss >> v;
+      *this = Time::FromDouble (v, Time::S);
+    }
+
+  if (g_markingTimes)
+    {
+      Mark (this);
     }
-  // else
-  // they didn't provide units, assume seconds
-  std::istringstream iss;
-  iss.str (s);
-  double v;
-  iss >> v;
-  *this = Time::FromDouble (v, Time::S);
 }
 
+// static
 struct Time::Resolution
-Time::GetNsResolution (void)
+Time::SetDefaultNsResolution (void)
 {
   NS_LOG_FUNCTION_NOARGS ();
   struct Resolution resolution;
-  SetResolution (Time::NS, &resolution);
+  SetResolution (Time::NS, &resolution, false);
   return resolution;
 }
-void 
+
+// static
+void
 Time::SetResolution (enum Unit resolution)
 {
   NS_LOG_FUNCTION (resolution);
   SetResolution (resolution, PeekResolution ());
 }
-void 
-Time::SetResolution (enum Unit unit, struct Resolution *resolution)
+
+
+// static
+void
+Time::SetResolution (enum Unit unit, struct Resolution *resolution,
+                     const bool convert /* = true */)
 {
-  NS_LOG_FUNCTION (unit << resolution);
+  NS_LOG_FUNCTION (resolution);
+  if (convert)
+    {
+      // We have to convert existing Times with the old
+      // conversion values, so do it first
+      ConvertTimes (unit);
+    }
+
   int8_t power [LAST] = { 15, 12, 9, 6, 3, 0};
   for (int i = 0; i < Time::LAST; i++)
     {
       int shift = power[i] - power[(int)unit];
-      uint64_t factor = (uint64_t) std::pow (10, std::fabs (shift));
+      int64_t factor = (int64_t) std::pow (10, std::fabs (shift));
       struct Information *info = &resolution->info[i];
       info->factor = factor;
       if (shift == 0)
@@ -136,10 +208,137 @@
     }
   resolution->unit = unit;
 }
+
+
+// static
+void
+Time::ClearMarkedTimes ()
+{
+  /**
+   * \internal
+   *
+   * We're called by Simulator::Run, which knows nothing about the mutex,
+   * so we need a critical section here.
+   *
+   * It would seem natural to use this function at the end of
+   * ConvertTimes, but that function already has the mutex.
+   * Our SystemMutex throws a fatal error if we try to lock it more than
+   * once in the same thread (at least in the unix implementation),
+   * so calling this function from ConvertTimes is a bad idea.
+   *
+   * Instead, we copy this body into ConvertTimes.
+   */
+
+  CriticalSection critical (GetMarkingMutex ());
+
+  NS_LOG_FUNCTION_NOARGS ();
+  if (g_markingTimes)
+    {
+      NS_LOG_LOGIC ("clearing MarkedTimes");
+      g_markingTimes->erase (g_markingTimes->begin(), g_markingTimes->end ());
+      g_markingTimes = 0;
+    }
+}  // Time::ClearMarkedTimes
+
+
+// static
+void
+Time::Mark (Time * const time)
+{
+  CriticalSection critical (GetMarkingMutex ());
+
+  NS_LOG_FUNCTION (time);
+  NS_ASSERT (time != 0);
+
+  // Repeat the g_markingTimes test here inside the CriticalSection,
+  // since earlier test was outside and might be stale.
+  if (g_markingTimes)
+    {
+      std::pair< MarkedTimes::iterator, bool> ret;
+
+      ret = g_markingTimes->insert ( time);
+      NS_LOG_LOGIC ("\t[" << g_markingTimes->size () << "] recording " << time);
+
+      if (ret.second == false)
+        {
+          NS_LOG_WARN ("already recorded " << time << "!");
+        }
+   }
+}  // Time::Mark ()
+
+
+// static
+void
+Time::Clear (Time * const time)
+{
+  CriticalSection critical (GetMarkingMutex ());
+
+  NS_LOG_FUNCTION (time);
+  NS_ASSERT (time != 0);
+
+  if (g_markingTimes)
+    {
+      NS_ASSERT_MSG (g_markingTimes->count (time) == 1,
+                     "Time object " << time <<
+                     " registered " << g_markingTimes->count (time) <<
+                     " times (should be 1)." );
+
+      MarkedTimes::size_type num = g_markingTimes->erase (time);
+      if (num != 1)
+        {
+          NS_LOG_WARN ("unexpected result erasing " << time << "!");
+          NS_LOG_WARN ("got " << num << ", expected 1");
+        }
+      else
+        {
+          NS_LOG_LOGIC ("\t[" << g_markingTimes->size () << "] removing  " << time);
+        }
+    }
+}  // Time::Clear ()
+
+
+// static
+void
+Time::ConvertTimes (const enum Unit unit)
+{
+  CriticalSection critical (GetMarkingMutex ());
+
+  NS_LOG_FUNCTION_NOARGS();
+
+  NS_ASSERT_MSG (g_markingTimes != 0,
+                 "No MarkedTimes registry. "
+                 "Time::SetResolution () called more than once?");
+
+  for ( MarkedTimes::iterator it = g_markingTimes->begin();
+        it != g_markingTimes->end();
+        it++ )
+    {
+      Time * const tp = *it;
+      if ( ! (    (tp->m_data == std::numeric_limits<int64_t>::min ())
+               || (tp->m_data == std::numeric_limits<int64_t>::max ())
+             )
+         )
+        {
+      tp->m_data = tp->ToInteger (unit);
+    }
+    }
+
+  NS_LOG_LOGIC ("logged " << g_markingTimes->size () << " Time objects.");
+
+  // Body of ClearMarkedTimes
+  // Assert above already guarantees g_markingTimes != 0
+  NS_LOG_LOGIC ("clearing MarkedTimes");
+  g_markingTimes->erase (g_markingTimes->begin(), g_markingTimes->end ());
+  g_markingTimes = 0;
+
+}  // Time::ConvertTimes ()
+
+
+// static
 enum Time::Unit
 Time::GetResolution (void)
 {
-  NS_LOG_FUNCTION_NOARGS ();
+  // No function log b/c it interferes with operator<<
   return PeekResolution ()->unit;
 }
 
@@ -148,7 +347,8 @@
 operator<< (std::ostream& os, const Time & time)
 {
   std::string unit;
-  switch (Time::GetResolution ())
+  Time::Unit res = Time::GetResolution ();
+  switch (res)
     {
     case Time::S:
       unit = "s";
@@ -173,8 +373,21 @@
       unit = "unreachable";
       break;
     }
-  int64x64_t v = time;
-  os << v << unit;
+  int64_t v = time.ToInteger (res);
+
+  std::ios_base::fmtflags ff = os.flags ();
+  { // See bug 1737:  gcc libstc++ 4.2 bug
+    if (v == 0)
+      {
+        os << '+';
+      }
+    else
+      {
+        os << std::showpos;
+      }
+  }
+  os << v << ".0" << unit;
+  os.flags (ff);  // Restore stream flags
   return os;
 }
 std::istream& operator>> (std::istream& is, Time & time)
@@ -186,7 +399,61 @@
 }
 
 ATTRIBUTE_VALUE_IMPLEMENT (Time);
-ATTRIBUTE_CHECKER_IMPLEMENT (Time);
+
+Ptr<const AttributeChecker>
+MakeTimeChecker (const Time min, const Time max)
+{
+  NS_LOG_FUNCTION (min << max);
+
+  struct Checker : public AttributeChecker
+  {
+    Checker (const Time minValue, const Time maxValue)
+      : m_minValue (minValue),
+        m_maxValue (maxValue) {}
+    virtual bool Check (const AttributeValue &value) const {
+      NS_LOG_FUNCTION (&value);
+      const TimeValue *v = dynamic_cast<const TimeValue *> (&value);
+      if (v == 0)
+        {
+          return false;
+        }
+      return v->Get () >= m_minValue && v->Get () <= m_maxValue;
+    }
+    virtual std::string GetValueTypeName (void) const {
+      NS_LOG_FUNCTION_NOARGS ();
+      return "ns3::TimeValue";
+    }
+    virtual bool HasUnderlyingTypeInformation (void) const {
+      NS_LOG_FUNCTION_NOARGS ();
+      return true;
+    }
+    virtual std::string GetUnderlyingTypeInformation (void) const {
+      NS_LOG_FUNCTION_NOARGS ();
+      std::ostringstream oss;
+      oss << "Time" << " " << m_minValue << ":" << m_maxValue;
+      return oss.str ();
+    }
+    virtual Ptr<AttributeValue> Create (void) const {
+      NS_LOG_FUNCTION_NOARGS ();
+      return ns3::Create<TimeValue> ();
+    }
+    virtual bool Copy (const AttributeValue &source, AttributeValue &destination) const {
+      NS_LOG_FUNCTION (&source << &destination);
+      const TimeValue *src = dynamic_cast<const TimeValue *> (&source);
+      TimeValue *dst = dynamic_cast<TimeValue *> (&destination);
+      if (src == 0 || dst == 0)
+        {
+          return false;
+        }
+      *dst = *src;
+      return true;
+    }
+    Time m_minValue;
+    Time m_maxValue;
+  } *checker = new Checker (min, max);
+  return Ptr<const AttributeChecker> (checker, false);
+}
+
 
 } // namespace ns3
 
diff -Naur ns-3.17/src/core/model/type-id.cc ns-3.18/src/core/model/type-id.cc
--- ns-3.17/src/core/model/type-id.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/type-id.cc	2013-10-26 07:07:30.047364393 -0700
@@ -17,21 +17,56 @@
  *
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
+#include "log.h"  // NS_ASSERT and NS_LOG
+#include "hash.h"
 #include "type-id.h"
 #include "singleton.h"
 #include "trace-source-accessor.h"
-#include "log.h"
+
+#include <map>
 #include <vector>
 #include <sstream>
+#include <iomanip>
 
 /*********************************************************************
  *         Helper code
  *********************************************************************/
 
-NS_LOG_COMPONENT_DEFINE ("TypeID");
+namespace ns3 {
+
+NS_LOG_COMPONENT_DEFINE ("TypeId");
 
-namespace {
+// IidManager needs to be in ns3 namespace for NS_ASSERT and NS_LOG
+// to find g_log
 
+/**
+ * \brief TypeId information manager
+ *
+ * Information records are stored in a vector.  Name and hash lookup
+ * are performed by maps to the vector index.
+ *
+ * \internal
+ * <b>Hash Chaining</b>
+ *
+ * We require all types to produce distinct hashes. What if we encounter
+ * two types that produce the same hash value?  As we move to a
+ * federated distribution model (the App store), it becomes increasingly
+ * likely that the core ns3 team *won't* discover this in test builds.
+ * Therefore, we need to handle this case explicitly.
+ *
+ * Note, we expect this to be *extremely* rare.  As of this writing we
+ * have ~400 < 2^9 types, so the probability of getting a collision
+ * when we introduce a new type is ~2^9/2^31 = 2^-22, assuming we
+ * reserve 31 bits for the hash, and one bit for chaining.  Even with
+ * double the number of types the probability of having a collision
+ * is only 2 x 10^-4.  The probability for a three-fold collision is
+ * 1 x 10^-10.
+ *
+ * Therefore, we'll handle one collision explicitly by reserving
+ * the high order bit of the hash value, and assert on higher level
+ * collisions.  The three-fold collision probability should be an
+ * acceptablly small error rate.
+ */
 class IidManager
 {
 public:
@@ -39,13 +74,15 @@
   uint16_t AllocateUid (std::string name);
   void SetParent (uint16_t uid, uint16_t parent);
   void SetGroupName (uint16_t uid, std::string groupName);
-  void AddConstructor (uint16_t uid, ns3::Callback<ns3::ObjectBase *> callback);
+  void AddConstructor (uint16_t uid, Callback<ObjectBase *> callback);
   void HideFromDocumentation (uint16_t uid);
   uint16_t GetUid (std::string name) const;
+  uint16_t GetUid (TypeId::hash_t hash) const;
   std::string GetName (uint16_t uid) const;
+  TypeId::hash_t GetHash (uint16_t uid) const;
   uint16_t GetParent (uint16_t uid) const;
   std::string GetGroupName (uint16_t uid) const;
-  ns3::Callback<ns3::ObjectBase *> GetConstructor (uint16_t uid) const;
+  Callback<ObjectBase *> GetConstructor (uint16_t uid) const;
   bool HasConstructor (uint16_t uid) const;
   uint32_t GetRegisteredN (void) const;
   uint16_t GetRegistered (uint32_t i) const;
@@ -53,41 +90,54 @@
                      std::string name,
                      std::string help, 
                      uint32_t flags,
-                     ns3::Ptr<const ns3::AttributeValue> initialValue,
-                     ns3::Ptr<const ns3::AttributeAccessor> spec,
-                     ns3::Ptr<const ns3::AttributeChecker> checker);
+                     Ptr<const AttributeValue> initialValue,
+                     Ptr<const AttributeAccessor> spec,
+                     Ptr<const AttributeChecker> checker);
   void SetAttributeInitialValue(uint16_t uid,
                                 uint32_t i,
-                                ns3::Ptr<const ns3::AttributeValue> initialValue);
+                                Ptr<const AttributeValue> initialValue);
   uint32_t GetAttributeN (uint16_t uid) const;
-  struct ns3::TypeId::AttributeInformation GetAttribute(uint16_t uid, uint32_t i) const;
+  struct TypeId::AttributeInformation GetAttribute(uint16_t uid, uint32_t i) const;
   void AddTraceSource (uint16_t uid,
                        std::string name, 
                        std::string help,
-                       ns3::Ptr<const ns3::TraceSourceAccessor> accessor);
+                       Ptr<const TraceSourceAccessor> accessor);
   uint32_t GetTraceSourceN (uint16_t uid) const;
-  struct ns3::TypeId::TraceSourceInformation GetTraceSource(uint16_t uid, uint32_t i) const;
+  struct TypeId::TraceSourceInformation GetTraceSource(uint16_t uid, uint32_t i) const;
   bool MustHideFromDocumentation (uint16_t uid) const;
 
 private:
   bool HasTraceSource (uint16_t uid, std::string name);
   bool HasAttribute (uint16_t uid, std::string name);
+  static TypeId::hash_t Hasher (const std::string name);
 
   struct IidInformation {
     std::string name;
+    TypeId::hash_t hash;
     uint16_t parent;
     std::string groupName;
     bool hasConstructor;
-    ns3::Callback<ns3::ObjectBase *> constructor;
+    Callback<ObjectBase *> constructor;
     bool mustHideFromDocumentation;
-    std::vector<struct ns3::TypeId::AttributeInformation> attributes;
-    std::vector<struct ns3::TypeId::TraceSourceInformation> traceSources;
+    std::vector<struct TypeId::AttributeInformation> attributes;
+    std::vector<struct TypeId::TraceSourceInformation> traceSources;
   };
   typedef std::vector<struct IidInformation>::const_iterator Iterator;
 
   struct IidManager::IidInformation *LookupInformation (uint16_t uid) const;
 
   std::vector<struct IidInformation> m_information;
+
+  typedef std::map<std::string, uint16_t> namemap_t;
+  namemap_t m_namemap;
+
+  typedef std::map<TypeId::hash_t, uint16_t> hashmap_t;
+  hashmap_t m_hashmap;
+
+  
+  // To handle the first collision, we reserve the high bit as a
+  // chain flag:
+  enum { HashChainFlag = 0x80000000};
 };
 
 IidManager::IidManager ()
@@ -95,22 +145,70 @@
   NS_LOG_FUNCTION (this);
 }
 
+  //static
+TypeId::hash_t
+IidManager::Hasher (const std::string name)
+{
+  static ns3::Hasher hasher ( Create<Hash::Function::Murmur3> () );
+  return hasher.clear ().GetHash32 (name);
+}
+  
 uint16_t
 IidManager::AllocateUid (std::string name)
 {
   NS_LOG_FUNCTION (this << name);
-  uint16_t j = 1;
-  for (Iterator i = m_information.begin (); i != m_information.end (); i++)
-    {
-      if (i->name == name)
-        {
-          NS_FATAL_ERROR ("Trying to allocate twice the same uid: " << name);
-          return 0;
-        }
-      j++;
-    }
-  struct IidInformation information;
+  // Type names are definitive: equal names are equal types
+  NS_ASSERT_MSG (m_namemap.count (name) == 0,
+                 "Trying to allocate twice the same uid: " << name);
+  
+  TypeId::hash_t hash = Hasher (name) & (~HashChainFlag);
+  if (m_hashmap.count (hash) == 1) {
+    NS_LOG_ERROR ("Hash chaining TypeId for '" << name << "'.  "
+                 << "This is not a bug, but is extremely unlikely.  "
+                 << "Please contact the ns3 developers.");
+    // ns3 developer contacted about this message:
+    // You have four options (in order of difficulty):
+    //   1. Let it ride, and play the odds that a third collision
+    //        never appears.
+    //   2. Change the name of the new (or old) tag, even trivially, to
+    //        remove the collision.
+    //   3. Switch to 64-bit hashes.
+    //   4. Implement 2-bit (or higher) chaining.
+    //
+    //  Oh, by the way, I owe you a beer, since I bet Mathieu that
+    //  this would never happen..  -- Peter Barnes, LLNL
+
+    NS_ASSERT_MSG (m_hashmap.count (hash | HashChainFlag) == 0,
+                   "Triplicate hash detected while chaining TypeId for '"
+                   << name
+                   << "'. Please contact the ns3 developers for assistance.");
+    // ns3 developer contacted about this message:
+    // You have three options: #2-4 above.
+    //
+    // Oh, by the way, I have no idea how this crazy hashing idea got
+    // into ns3.  -- Peter Barnes, LLNL
+    
+    // Alphabetize the two types, so it's deterministic
+    struct IidInformation * hinfo = LookupInformation (GetUid (hash));
+    if (name > hinfo->name)
+      { // new type gets chained
+        NS_LOG_LOGIC ("New TypeId '" << name << "' getting chained.");
+        hash = hash | HashChainFlag;
+      }
+    else
+      { // chain old type
+        NS_LOG_LOGIC ("Old TypeId '" << hinfo->name << "' getting chained.");
+        uint32_t oldUid = GetUid (hinfo->hash);
+        m_hashmap.erase (m_hashmap.find (hinfo->hash));
+        hinfo->hash = hash | HashChainFlag;
+        m_hashmap.insert (std::make_pair (hinfo->hash, oldUid));
+        // leave new hash unchained
+      }
+  }
+
+ struct IidInformation information;
   information.name = name;
+  information.hash = hash;
   information.parent = 0;
   information.groupName = "";
   information.hasConstructor = false;
@@ -118,6 +216,10 @@
   m_information.push_back (information);
   uint32_t uid = m_information.size ();
   NS_ASSERT (uid <= 0xffff);
+
+  // Add to both maps:
+  m_namemap.insert (std::make_pair (name, uid));
+  m_hashmap.insert (std::make_pair (hash, uid));
   return uid;
 }
 
@@ -153,7 +255,7 @@
 }
 
 void 
-IidManager::AddConstructor (uint16_t uid, ns3::Callback<ns3::ObjectBase *> callback)
+IidManager::AddConstructor (uint16_t uid, Callback<ObjectBase *> callback)
 {
   NS_LOG_FUNCTION (this << uid << &callback);
   struct IidInformation *information = LookupInformation (uid);
@@ -169,17 +271,28 @@
 IidManager::GetUid (std::string name) const
 {
   NS_LOG_FUNCTION (this << name);
-  uint32_t j = 1;
-  for (Iterator i = m_information.begin (); i != m_information.end (); i++)
+  namemap_t::const_iterator it = m_namemap.find (name);
+  if (it != m_namemap.end ())
     {
-      if (i->name == name)
-        {
-          NS_ASSERT (j <= 0xffff);
-          return j;
-        }
-      j++;
+      return it->second;
+    }
+  else
+    {
+      return 0;
+    }
+}
+uint16_t 
+IidManager::GetUid (TypeId::hash_t hash) const
+{
+  hashmap_t::const_iterator it = m_hashmap.find (hash);
+  if (it != m_hashmap.end ())
+    {
+    return it->second;
+    }
+  else
+    { // hash not found 
+      return 0;
     }
-  return 0;
 }
 std::string 
 IidManager::GetName (uint16_t uid) const
@@ -188,6 +301,13 @@
   struct IidInformation *information = LookupInformation (uid);
   return information->name;
 }
+TypeId::hash_t
+IidManager::GetHash (uint16_t uid) const
+{
+  NS_LOG_FUNCTION (this << uid);
+  struct IidInformation *information = LookupInformation (uid);
+  return information->hash;
+}
 uint16_t 
 IidManager::GetParent (uint16_t uid) const
 {
@@ -203,7 +323,7 @@
   return information->groupName;
 }
 
-ns3::Callback<ns3::ObjectBase *> 
+Callback<ObjectBase *> 
 IidManager::GetConstructor (uint16_t uid) const
 {
   NS_LOG_FUNCTION (this << uid);
@@ -244,7 +364,7 @@
   struct IidInformation *information  = LookupInformation (uid);
   while (true)
     {
-      for (std::vector<struct ns3::TypeId::AttributeInformation>::const_iterator i = information->attributes.begin ();
+      for (std::vector<struct TypeId::AttributeInformation>::const_iterator i = information->attributes.begin ();
            i != information->attributes.end (); ++i)
         {
           if (i->name == name)
@@ -269,9 +389,9 @@
                           std::string name,
                           std::string help, 
                           uint32_t flags,
-                          ns3::Ptr<const ns3::AttributeValue> initialValue,
-                          ns3::Ptr<const ns3::AttributeAccessor> accessor,
-                          ns3::Ptr<const ns3::AttributeChecker> checker)
+                          Ptr<const AttributeValue> initialValue,
+                          Ptr<const AttributeAccessor> accessor,
+                          Ptr<const AttributeChecker> checker)
 {
   NS_LOG_FUNCTION (this << uid << name << help << flags << initialValue << accessor << checker);
   struct IidInformation *information = LookupInformation (uid);
@@ -280,7 +400,7 @@
       NS_FATAL_ERROR ("Attribute \"" << name << "\" already registered on tid=\"" << 
                       information->name << "\"");
     }
-  struct ns3::TypeId::AttributeInformation info;
+  struct TypeId::AttributeInformation info;
   info.name = name;
   info.help = help;
   info.flags = flags;
@@ -293,7 +413,7 @@
 void 
 IidManager::SetAttributeInitialValue(uint16_t uid,
                                      uint32_t i,
-                                     ns3::Ptr<const ns3::AttributeValue> initialValue)
+                                     Ptr<const AttributeValue> initialValue)
 {
   NS_LOG_FUNCTION (this << uid << i << initialValue);
   struct IidInformation *information = LookupInformation (uid);
@@ -310,7 +430,7 @@
   struct IidInformation *information = LookupInformation (uid);
   return information->attributes.size ();
 }
-struct ns3::TypeId::AttributeInformation 
+struct TypeId::AttributeInformation 
 IidManager::GetAttribute(uint16_t uid, uint32_t i) const
 {
   NS_LOG_FUNCTION (this << uid << i);
@@ -327,7 +447,7 @@
   struct IidInformation *information  = LookupInformation (uid);
   while (true)
     {
-      for (std::vector<struct ns3::TypeId::TraceSourceInformation>::const_iterator i = information->traceSources.begin ();
+      for (std::vector<struct TypeId::TraceSourceInformation>::const_iterator i = information->traceSources.begin ();
            i != information->traceSources.end (); ++i)
         {
           if (i->name == name)
@@ -351,7 +471,7 @@
 IidManager::AddTraceSource (uint16_t uid,
                             std::string name, 
                             std::string help,
-                            ns3::Ptr<const ns3::TraceSourceAccessor> accessor)
+                            Ptr<const TraceSourceAccessor> accessor)
 {
   NS_LOG_FUNCTION (this << uid << name << help << accessor);
   struct IidInformation *information  = LookupInformation (uid);
@@ -360,7 +480,7 @@
       NS_FATAL_ERROR ("Trace source \"" << name << "\" already registered on tid=\"" << 
                       information->name << "\"");
     }
-  struct ns3::TypeId::TraceSourceInformation source;
+  struct TypeId::TraceSourceInformation source;
   source.name = name;
   source.help = help;
   source.accessor = accessor;
@@ -373,7 +493,7 @@
   struct IidInformation *information = LookupInformation (uid);
   return information->traceSources.size ();
 }
-struct ns3::TypeId::TraceSourceInformation 
+struct TypeId::TraceSourceInformation 
 IidManager::GetTraceSource(uint16_t uid, uint32_t i) const
 {
   NS_LOG_FUNCTION (this << uid << i);
@@ -389,7 +509,7 @@
   return information->mustHideFromDocumentation;
 }
 
-} // anonymous namespace
+} // namespace ns3
 
 namespace ns3 {
 
@@ -431,6 +551,25 @@
   *tid = TypeId (uid);
   return true;
 }
+TypeId
+TypeId::LookupByHash (hash_t hash)
+{
+  uint16_t uid = Singleton<IidManager>::Get ()->GetUid (hash);
+  NS_ASSERT_MSG (uid != 0, "Assert in TypeId::LookupByHash: 0x"
+                 << std::hex << hash << std::dec << " not found");
+  return TypeId (uid);
+}
+bool
+TypeId::LookupByHashFailSafe (hash_t hash, TypeId *tid)
+{
+  uint16_t uid = Singleton<IidManager>::Get ()->GetUid (hash);
+  if (uid == 0)
+    {
+      return false;
+    }
+  *tid = TypeId (uid);
+  return true;
+}
 
 uint32_t 
 TypeId::GetRegisteredN (void)
@@ -522,6 +661,13 @@
   return name;
 }
 
+TypeId::hash_t
+TypeId::GetHash (void) const
+{
+  hash_t hash = Singleton<IidManager>::Get ()->GetHash (m_tid);
+  return hash;
+}
+
 bool 
 TypeId::HasConstructor (void) const
 {
diff -Naur ns-3.17/src/core/model/type-id.h ns-3.18/src/core/model/type-id.h
--- ns-3.17/src/core/model/type-id.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/type-id.h	2013-10-26 07:07:30.031364393 -0700
@@ -25,6 +25,7 @@
 #include "trace-source-accessor.h"
 #include "attribute-helper.h"
 #include "callback.h"
+#include "hash.h"
 #include <string>
 #include <stdint.h>
 
@@ -40,6 +41,10 @@
  *  - the base class of the subclass
  *  - the set of accessible constructors in the subclass
  *  - the set of 'attributes' accessible in the subclass
+ *
+ * \internal
+ *  See the discussion in IidManager about hash chaining of TypeId's.
+ *
  */
 class TypeId
 {
@@ -57,18 +62,23 @@
     std::string name;
     std::string help;
     uint32_t flags;
-    ns3::Ptr<const ns3::AttributeValue> originalInitialValue;
-    ns3::Ptr<const ns3::AttributeValue> initialValue;
-    ns3::Ptr<const ns3::AttributeAccessor> accessor;
-    ns3::Ptr<const ns3::AttributeChecker> checker;
+    Ptr<const AttributeValue> originalInitialValue;
+    Ptr<const AttributeValue> initialValue;
+    Ptr<const AttributeAccessor> accessor;
+    Ptr<const AttributeChecker> checker;
   };
   struct TraceSourceInformation {
     std::string name;
     std::string help;
-    ns3::Ptr<const ns3::TraceSourceAccessor> accessor;
+    Ptr<const TraceSourceAccessor> accessor;
   };
 
   /**
+   * Type of hash values
+   */
+  typedef uint32_t hash_t;
+
+  /**
    * \param name the name of the requested TypeId
    * \returns the unique id associated with the requested
    *          name. 
@@ -84,6 +94,21 @@
    * \returns true if the requested name was found, false otherwise.
    */
   static bool LookupByNameFailSafe (std::string name, TypeId *tid);
+  /**
+   * \param hash the hash to lookup
+   * \returns the unique id associated with the requested hash.
+   *
+   * This method cannot fail: it will crash if the input 
+   * hash does not match an existing TypeId.
+   */
+  static TypeId LookupByHash (hash_t hash);
+  /**
+   * \param hash the hash of the requested TypeId
+   * \param tid a pointer to the TypeId instance where the 
+   *        result of this function should be stored.
+   * \returns true if the requested hash was found, false otherwise.
+   */
+  static bool LookupByHashFailSafe (hash_t hash, TypeId *tid);
 
   /**
    * \returns the number of TypeId instances registered.
@@ -138,6 +163,11 @@
   std::string GetName (void) const;
 
   /**
+   * \returns the hash of this interface.
+   */
+  hash_t GetHash (void) const;
+
+  /**
    * \returns true if this TypeId has a constructor
    */
   bool HasConstructor (void) const;
diff -Naur ns-3.17/src/core/model/type-traits.h ns-3.18/src/core/model/type-traits.h
--- ns-3.17/src/core/model/type-traits.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/type-traits.h	2013-10-26 07:07:30.031364393 -0700
@@ -1,294 +1,296 @@
 #ifndef TYPE_TRAITS_H
 #define TYPE_TRAITS_H
 
+/** Type trait reference values */
 template <typename T>
 struct TypeTraits
 {
 private:
-  struct NullType {};
-  template <typename U> struct UnConst
+  struct NullType {};                             //!< Null value type traits
+  template <typename U> struct UnConst            //!< Non-const type
   {
-    typedef U Result;
+    typedef U Result;                             //!< Non-const result type
   };
-  template <typename U> struct UnConst<const U>
+  template <typename U> struct UnConst<const U>   //!< Non-const template type traits
   {
-    typedef U Result;
+    typedef U Result;                             //!< Non-const result type
   };
-  template <typename U> struct ReferenceTraits
+  template <typename U> struct ReferenceTraits    //!< Non-reference type traits
   {
-    enum { IsReference = 0};
-    typedef U ReferencedType;
+    enum { IsReference = 0                        /**< Non-reference value */ };
+    typedef U ReferencedType;                     //!< Non-referenced result type
   };
-  template <typename U> struct ReferenceTraits<U&>
+  template <typename U> struct ReferenceTraits<U&>//!< Reference type traits
   {
-    enum { IsReference = 1};
-    typedef U ReferencedType;
+    enum { IsReference = 1                        /**< Reference value */ };
+    typedef U ReferencedType;                     //!< Referenced result type
   };
-  template <typename U> struct PointerTraits
+  template <typename U> struct PointerTraits      //!< Non-pointer type traits
   {
-    enum { IsPointer = 0};
-    typedef U PointeeType;
+    enum { IsPointer = 0};                        //!< Non-pointer value
+    typedef U PointeeType;                        //!< Non-pointer result type
   };
-  template <typename U> struct PointerTraits<U *>
+  template <typename U> struct PointerTraits<U *> //!< Pointer type traits
   {
-    enum { IsPointer = 1};
-    typedef U PointeeType;
+    enum { IsPointer = 1};                        //!< Pointer value
+    typedef U PointeeType;                        //!< Pointer result type
   };
-  template <typename U> struct FunctionPtrTraits
+  template <typename U> struct FunctionPtrTraits  //!< Non-function pointer type traits
   {
-    enum { IsFunctionPointer = 0};
+    enum { IsFunctionPointer = 0};                //!< Non-function pointer value
+    typedef NullType ReturnType;                  //!< Non-function pointer result type
   };
   template <typename U> 
-  struct FunctionPtrTraits <U (*)(void)>
+  struct FunctionPtrTraits <U (*)(void)>          //!< Function pointer type traits
   {
-    enum { IsFunctionPointer = 1};
-    enum { nArgs = 0};
-    typedef U ReturnType;
+    enum { IsFunctionPointer = 1};                //!< Function pointer value
+    enum { nArgs = 0};                            //!< Number of arguments
+    typedef U ReturnType;                         //!< Return type
   };
   template <typename U, typename V1> 
-  struct FunctionPtrTraits <U (*)(V1)>
-  {
-    enum { IsFunctionPointer = 1};
-    enum { nArgs = 1};
-    typedef U ReturnType;
-    typedef V1 Arg1Type;
+  struct FunctionPtrTraits <U (*)(V1)>            //!< Function pointer type traits
+  {						                                   
+    enum { IsFunctionPointer = 1};                //!< Function pointer value	   
+    enum { nArgs = 1};				  //!< Number of arguments	   
+    typedef U ReturnType;			  //!< Return type
+    typedef V1 Arg1Type;                          //!< First argument type
   };
   template <typename U, typename V1, typename V2> 
-  struct FunctionPtrTraits <U (*)(V1,V2)>
-  {
-    enum { IsFunctionPointer = 1};
-    enum { nArgs = 2};
-    typedef U ReturnType;
-    typedef V1 Arg1Type;
-    typedef V2 Arg2Type;
+  struct FunctionPtrTraits <U (*)(V1,V2)>         //!< Function pointer type traits
+  {						                                   
+    enum { IsFunctionPointer = 1};		  //!< Function pointer value	   
+    enum { nArgs = 2};				  //!< Number of arguments	   
+    typedef U ReturnType;			  //!< Return type
+    typedef V1 Arg1Type;			  //!< First argument type	   
+    typedef V2 Arg2Type;                          //!< Second argument type
   };
   template <typename U, typename V1, typename V2,
             typename V3> 
-  struct FunctionPtrTraits <U (*)(V1,V2,V3)>
-  {
-    enum { IsFunctionPointer = 1};
-    enum { nArgs = 3};
-    typedef U ReturnType;
-    typedef V1 Arg1Type;
-    typedef V2 Arg2Type;
-    typedef V3 Arg3Type;
+  struct FunctionPtrTraits <U (*)(V1,V2,V3)>      //!< Function pointer type traits
+  {						                                   
+    enum { IsFunctionPointer = 1};		  //!< Function pointer value	   
+    enum { nArgs = 3};				  //!< Number of arguments	   
+    typedef U ReturnType;			  //!< Return type
+    typedef V1 Arg1Type;			  //!< First argument type	   
+    typedef V2 Arg2Type;			  //!< Second argument type	   
+    typedef V3 Arg3Type;                          //!< Third argument type
   };
   template <typename U, typename V1, typename V2,
             typename V3, typename V4> 
-  struct FunctionPtrTraits <U (*)(V1,V2,V3,V4)>
-  {
-    enum { IsFunctionPointer = 1};
-    enum { nArgs = 4};
-    typedef U ReturnType;
-    typedef V1 Arg1Type;
-    typedef V2 Arg2Type;
-    typedef V3 Arg3Type;
-    typedef V4 Arg4Type;
+  struct FunctionPtrTraits <U (*)(V1,V2,V3,V4)>   //!< Function pointer type traits
+  {						                                   
+    enum { IsFunctionPointer = 1};		  //!< Function pointer value	   
+    enum { nArgs = 4};				  //!< Number of arguments	   
+    typedef U ReturnType;			  //!< Return type
+    typedef V1 Arg1Type;			  //!< First argument type	   
+    typedef V2 Arg2Type;			  //!< Second argument type	   
+    typedef V3 Arg3Type;			  //!< Third argument type	   
+    typedef V4 Arg4Type;                          //!< Fourth argument type
   };
   template <typename U, typename V1, typename V2,
             typename V3, typename V4,
             typename V5> 
-  struct FunctionPtrTraits <U (*)(V1,V2,V3,V4,V5)>
-  {
-    enum { IsFunctionPointer = 1};
-    enum { nArgs = 5};
-    typedef U ReturnType;
-    typedef V1 Arg1Type;
-    typedef V2 Arg2Type;
-    typedef V3 Arg3Type;
-    typedef V4 Arg4Type;
-    typedef V5 Arg5Type;
+  struct FunctionPtrTraits <U (*)(V1,V2,V3,V4,V5)>//!< Function pointer type traits
+  {						                                   
+    enum { IsFunctionPointer = 1};		  //!< Function pointer value	   
+    enum { nArgs = 5};				  //!< Number of arguments	   
+    typedef U ReturnType;			  //!< Return type
+    typedef V1 Arg1Type;			  //!< First argument type	   
+    typedef V2 Arg2Type;			  //!< Second argument type	   
+    typedef V3 Arg3Type;			  //!< Third argument type	   
+    typedef V4 Arg4Type;			  //!< Fourth argument type	   
+    typedef V5 Arg5Type;                          //!< Fifth argument type
   };
   template <typename U, typename V1, typename V2,
             typename V3, typename V4,
             typename V5, typename V6> 
-  struct FunctionPtrTraits <U (*)(V1,V2,V3,V4,V5,V6)>
-  {
-    enum { IsFunctionPointer = 1};
-    enum { nArgs = 6};
-    typedef U ReturnType;
-    typedef V1 Arg1Type;
-    typedef V2 Arg2Type;
-    typedef V3 Arg3Type;
-    typedef V4 Arg4Type;
-    typedef V5 Arg5Type;
-    typedef V6 Arg6Type;
+  struct FunctionPtrTraits <U (*)(V1,V2,V3,V4,V5,V6)>  //!< Function pointer type traits
+  {						                                        
+    enum { IsFunctionPointer = 1};		       //!< Function pointer value	   
+    enum { nArgs = 6};				       //!< Number of arguments	   
+    typedef U ReturnType;			       //!< Return type
+    typedef V1 Arg1Type;			       //!< First argument type	   
+    typedef V2 Arg2Type;			       //!< Second argument type	   
+    typedef V3 Arg3Type;			       //!< Third argument type	   
+    typedef V4 Arg4Type;			       //!< Fourth argument type	   
+    typedef V5 Arg5Type;			       //!< Fifth argument type	   
+    typedef V6 Arg6Type;                               //!< Sixth argument type
   };
-  template <typename U> struct PtrToMemberTraits
+  template <typename U> struct PtrToMemberTraits  //!< Pointer to member type traits
   {
-    enum { IsPointerToMember = 0};
+    enum { IsPointerToMember = 0};                //!< Non-pointer to member value
   };
   template <typename U, typename V> 
-  struct PtrToMemberTraits <U (V::*) (void)>
+  struct PtrToMemberTraits <U (V::*) (void)>      //!< Pointer to member type traits
   {
-    enum { IsPointerToMember = 1};
-    enum { nArgs = 0};
-    typedef U ReturnType;
+    enum { IsPointerToMember = 1};                //!< Pointer to member value
+    enum { nArgs = 0};                            //!< Number of arguments
+    typedef U ReturnType;                         //!< Return type
   };
   template <typename U, typename V> 
-  struct PtrToMemberTraits <U (V::*) (void) const>
-  {
-    enum { IsPointerToMember = 1};
-    enum { nArgs = 0};
-    typedef U ReturnType;
+  struct PtrToMemberTraits <U (V::*) (void) const>//!< Pointer to const member type traits
+  {						                                    
+    enum { IsPointerToMember = 1};		  //!< Pointer to member value	    
+    enum { nArgs = 0};				  //!< Number of arguments	    
+    typedef U ReturnType;			  //!< Return type		    
   };
   template <typename U, typename V,typename W1> 
-  struct PtrToMemberTraits <U (V::*) (W1)>
-  {
-    enum { IsPointerToMember = 1};
-    enum { nArgs = 1};
-    typedef U ReturnType;
-    typedef W1 Arg1Type;
+  struct PtrToMemberTraits <U (V::*) (W1)>        //!< Pointer to member type traits
+  {						                                    
+    enum { IsPointerToMember = 1};		  //!< Pointer to member value	    
+    enum { nArgs = 1};				  //!< Number of arguments	    
+    typedef U ReturnType;			  //!< Return type		    
+    typedef W1 Arg1Type;                          //!< First argument type
   };
   template <typename U, typename V,typename W1> 
-  struct PtrToMemberTraits <U (V::*) (W1) const>
-  {
-    enum { IsPointerToMember = 1};
-    enum { nArgs = 1};
-    typedef U ReturnType;
-    typedef W1 Arg1Type;
+  struct PtrToMemberTraits <U (V::*) (W1) const>  //!< Pointer to const member type traits
+  {						                                    	  
+    enum { IsPointerToMember = 1};		  //!< Pointer to member value	    	  
+    enum { nArgs = 1};				  //!< Number of arguments	    	  
+    typedef U ReturnType;			  //!< Return type		    	  
+    typedef W1 Arg1Type;                          //!< First argument type
   };
   template <typename U, typename V,typename W1, typename W2> 
-  struct PtrToMemberTraits <U (V::*) (W1,W2)>
-  {
-    enum { IsPointerToMember = 1};
-    enum { nArgs = 2};
-    typedef U ReturnType;
-    typedef W1 Arg1Type;
-    typedef W2 Arg2Type;
+  struct PtrToMemberTraits <U (V::*) (W1,W2)>     //!< Pointer to member type traits
+  {						                                    
+    enum { IsPointerToMember = 1};		  //!< Pointer to member value	    
+    enum { nArgs = 2};				  //!< Number of arguments	    
+    typedef U ReturnType;			  //!< Return type		    
+    typedef W1 Arg1Type;			  //!< First argument type	    
+    typedef W2 Arg2Type;			  //!< Second argument type	    
   };
   template <typename U, typename V,typename W1, typename W2> 
-  struct PtrToMemberTraits <U (V::*) (W1,W2) const>
-  {
-    enum { IsPointerToMember = 1};
-    enum { nArgs = 2};
-    typedef U ReturnType;
-    typedef W1 Arg1Type;
-    typedef W2 Arg2Type;
+  struct PtrToMemberTraits <U (V::*) (W1,W2) const>  //!< Pointer to const member type traits
+  {						                                       	  
+    enum { IsPointerToMember = 1};		     //!< Pointer to member value	    	  
+    enum { nArgs = 2};				     //!< Number of arguments	    	  
+    typedef U ReturnType;			     //!< Return type		    	  
+    typedef W1 Arg1Type;			     //!< First argument type		  
+    typedef W2 Arg2Type;			     //!< Second argument type		  
   };
   template <typename U, typename V,
             typename W1, typename W2,
             typename W3> 
-  struct PtrToMemberTraits <U (V::*) (W1,W2,W3)>
-  {
-    enum { IsPointerToMember = 1};
-    enum { nArgs = 3};
-    typedef U ReturnType;
-    typedef W1 Arg1Type;
-    typedef W2 Arg2Type;
-    typedef W3 Arg3Type;
+  struct PtrToMemberTraits <U (V::*) (W1,W2,W3)>  //!< Pointer to member type traits
+  {						                                    
+    enum { IsPointerToMember = 1};		  //!< Pointer to member value	    
+    enum { nArgs = 3};				  //!< Number of arguments	    
+    typedef U ReturnType;			  //!< Return type		    
+    typedef W1 Arg1Type;			  //!< First argument type	    
+    typedef W2 Arg2Type;			  //!< Second argument type	    
+    typedef W3 Arg3Type;			  //!< Third argument type	    
   };
   template <typename U, typename V,
             typename W1, typename W2,
             typename W3> 
-  struct PtrToMemberTraits <U (V::*) (W1,W2,W3) const>
-  {
-    enum { IsPointerToMember = 1};
-    enum { nArgs = 3};
-    typedef U ReturnType;
-    typedef W1 Arg1Type;
-    typedef W2 Arg2Type;
-    typedef W3 Arg3Type;
+  struct PtrToMemberTraits <U (V::*) (W1,W2,W3) const>  //!< Pointer to const member type traits
+  {							                                  	     
+    enum { IsPointerToMember = 1};			//!< Pointer to member value	     
+    enum { nArgs = 3};					//!< Number of arguments	    	     
+    typedef U ReturnType;				//!< Return type		    	     
+    typedef W1 Arg1Type;				//!< First argument type		     
+    typedef W2 Arg2Type;				//!< Second argument type		     
+    typedef W3 Arg3Type;				//!< Third argument type		     
   };
   template <typename U, typename V,
             typename W1, typename W2,
             typename W3, typename W4> 
-  struct PtrToMemberTraits <U (V::*) (W1,W2,W3,W4)>
-  {
-    enum { IsPointerToMember = 1};
-    enum { nArgs = 4};
-    typedef U ReturnType;
-    typedef W1 Arg1Type;
-    typedef W2 Arg2Type;
-    typedef W3 Arg3Type;
-    typedef W4 Arg4Type;
+  struct PtrToMemberTraits <U (V::*) (W1,W2,W3,W4)>  //!< Pointer to member type traits
+  {						                                       
+    enum { IsPointerToMember = 1};		     //!< Pointer to member value	    
+    enum { nArgs = 4};				     //!< Number of arguments	    
+    typedef U ReturnType;			     //!< Return type		    
+    typedef W1 Arg1Type;			     //!< First argument type	    
+    typedef W2 Arg2Type;			     //!< Second argument type	    
+    typedef W3 Arg3Type;			     //!< Third argument type	    
+    typedef W4 Arg4Type;			     //!< Fourth argument type	    
   };
   template <typename U, typename V,
             typename W1, typename W2,
             typename W3, typename W4> 
-  struct PtrToMemberTraits <U (V::*) (W1,W2,W3,W4) const>
-  {
-    enum { IsPointerToMember = 1};
-    enum { nArgs = 4};
-    typedef U ReturnType;
-    typedef W1 Arg1Type;
-    typedef W2 Arg2Type;
-    typedef W3 Arg3Type;
-    typedef W4 Arg4Type;
+  struct PtrToMemberTraits <U (V::*) (W1,W2,W3,W4) const>  //!< Pointer to const member type traits
+  {							                                     	
+    enum { IsPointerToMember = 1};			   //!< Pointer to member value	     	
+    enum { nArgs = 4};					   //!< Number of arguments	    	
+    typedef U ReturnType;				   //!< Return type		    	
+    typedef W1 Arg1Type;				   //!< First argument type		
+    typedef W2 Arg2Type;				   //!< Second argument type		
+    typedef W3 Arg3Type;				   //!< Third argument type		
+    typedef W4 Arg4Type;				   //!< Fourth argument type		
   };
   template <typename U, typename V,
             typename W1, typename W2,
             typename W3, typename W4,
             typename W5> 
-  struct PtrToMemberTraits <U (V::*) (W1,W2,W3,W4,W5)>
-  {
-    enum { IsPointerToMember = 1};
-    enum { nArgs = 5};
-    typedef U ReturnType;
-    typedef W1 Arg1Type;
-    typedef W2 Arg2Type;
-    typedef W3 Arg3Type;
-    typedef W4 Arg4Type;
-    typedef W5 Arg5Type;
+  struct PtrToMemberTraits <U (V::*) (W1,W2,W3,W4,W5)>  //!< Pointer to member type traits
+  {							                                  
+    enum { IsPointerToMember = 1};			//!< Pointer to member value      
+    enum { nArgs = 5};					//!< Number of arguments	       
+    typedef U ReturnType;				//!< Return type		       
+    typedef W1 Arg1Type;				//!< First argument type	       
+    typedef W2 Arg2Type;				//!< Second argument type	       
+    typedef W3 Arg3Type;				//!< Third argument type	       
+    typedef W4 Arg4Type;				//!< Fourth argument type	       
+    typedef W5 Arg5Type;				//!< Fifth argument type	       
   };
   template <typename U, typename V,
             typename W1, typename W2,
             typename W3, typename W4,
             typename W5> 
-  struct PtrToMemberTraits <U (V::*) (W1,W2,W3,W4,W5) const>
-  {
-    enum { IsPointerToMember = 1};
-    enum { nArgs = 5};
-    typedef U ReturnType;
-    typedef W1 Arg1Type;
-    typedef W2 Arg2Type;
-    typedef W3 Arg3Type;
-    typedef W4 Arg4Type;
-    typedef W5 Arg5Type;
+  struct PtrToMemberTraits <U (V::*) (W1,W2,W3,W4,W5) const>  //!< Pointer to const member type traits
+  {							                                        	   
+    enum { IsPointerToMember = 1};			      //!< Pointer to member value	     	   
+    enum { nArgs = 5};					      //!< Number of arguments	    	   
+    typedef U ReturnType;				      //!< Return type		    	   
+    typedef W1 Arg1Type;				      //!< First argument type		   
+    typedef W2 Arg2Type;				      //!< Second argument type		   
+    typedef W3 Arg3Type;				      //!< Third argument type		   
+    typedef W4 Arg4Type;				      //!< Fourth argument type		   
+    typedef W5 Arg5Type;				      //!< Fifth argument type		   
   };
   template <typename U, typename V,
             typename W1, typename W2,
             typename W3, typename W4,
             typename W5, typename W6> 
-  struct PtrToMemberTraits <U (V::*) (W1,W2,W3,W4,W5,W6)>
-  {
-    enum { IsPointerToMember = 1};
-    enum { nArgs = 6};
-    typedef U ReturnType;
-    typedef W1 Arg1Type;
-    typedef W2 Arg2Type;
-    typedef W3 Arg3Type;
-    typedef W4 Arg4Type;
-    typedef W5 Arg5Type;
-    typedef W6 Arg6Type;
+  struct PtrToMemberTraits <U (V::*) (W1,W2,W3,W4,W5,W6)>  //!< Pointer to member type traits
+  {							                                     
+    enum { IsPointerToMember = 1};			   //!< Pointer to member value      
+    enum { nArgs = 6};					   //!< Number of arguments	  
+    typedef U ReturnType;				   //!< Return type		  
+    typedef W1 Arg1Type;				   //!< First argument type	  
+    typedef W2 Arg2Type;				   //!< Second argument type	  
+    typedef W3 Arg3Type;				   //!< Third argument type	  
+    typedef W4 Arg4Type;				   //!< Fourth argument type	  
+    typedef W5 Arg5Type;				   //!< Fifth argument type	  
+    typedef W6 Arg6Type;				   //!< Sixth argument type	  
   };
   template <typename U, typename V,
             typename W1, typename W2,
             typename W3, typename W4,
             typename W5, typename W6> 
-  struct PtrToMemberTraits <U (V::*) (W1,W2,W3,W4,W5,W6) const>
-  {
-    enum { IsPointerToMember = 1};
-    enum { nArgs = 6};
-    typedef U ReturnType;
-    typedef W1 Arg1Type;
-    typedef W2 Arg2Type;
-    typedef W3 Arg3Type;
-    typedef W4 Arg4Type;
-    typedef W5 Arg5Type;
-    typedef W6 Arg6Type;
+  struct PtrToMemberTraits <U (V::*) (W1,W2,W3,W4,W5,W6) const>  //!< Pointer to const member type traits
+  {								                                         
+    enum { IsPointerToMember = 1};				 //!< Pointer to member value	      
+    enum { nArgs = 6};						 //!< Number of arguments	    	      
+    typedef U ReturnType;					 //!< Return type		    	      
+    typedef W1 Arg1Type;					 //!< First argument type		      
+    typedef W2 Arg2Type;					 //!< Second argument type		      
+    typedef W3 Arg3Type;					 //!< Third argument type		      
+    typedef W4 Arg4Type;					 //!< Fourth argument type		      
+    typedef W5 Arg5Type;					 //!< Fifth argument type		      
+    typedef W6 Arg6Type;					 //!< Sixth argument type		      
   };
 
 public:
-  typedef typename UnConst<T>::Result NonConstType;
-  typedef typename ReferenceTraits<T>::ReferencedType ReferencedType;
-  typedef typename PointerTraits<T>::PointeeType PointeeType;
-  enum { IsPointerToMember = PtrToMemberTraits<T>::IsPointerToMember};
-  enum { IsPointer = PointerTraits<T>::IsPointer};
-  enum { IsReference = ReferenceTraits<T>::IsReference};
-  enum { IsFunctionPointer = FunctionPtrTraits<T>::IsFunctionPointer};
-  typedef PtrToMemberTraits<T> PointerToMemberTraits;
-  typedef FunctionPtrTraits<T> FunctionPointerTraits;
+  typedef typename UnConst<T>::Result NonConstType;                    //!< Non-const type
+  typedef typename ReferenceTraits<T>::ReferencedType ReferencedType;  //!< Referenced type
+  typedef typename PointerTraits<T>::PointeeType PointeeType;          //!< Pointee type
+  enum { IsPointerToMember = PtrToMemberTraits<T>::IsPointerToMember}; //!< Pointer to member predicate
+  enum { IsPointer = PointerTraits<T>::IsPointer};                     //!< Pointer predicate
+  enum { IsReference = ReferenceTraits<T>::IsReference};               //!< Reference predicate
+  enum { IsFunctionPointer = FunctionPtrTraits<T>::IsFunctionPointer}; //!< Function pointer predicate
+  typedef PtrToMemberTraits<T> PointerToMemberTraits;                  //!< Pointer to member traits type
+  typedef FunctionPtrTraits<T> FunctionPointerTraits;                  //!< Function pointer traits
 };
 
 
diff -Naur ns-3.17/src/core/model/unused.h ns-3.18/src/core/model/unused.h
--- ns-3.17/src/core/model/unused.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/unused.h	2013-10-26 07:07:30.027364392 -0700
@@ -5,4 +5,14 @@
 # define NS_UNUSED(x) ((void)(x))
 #endif
 
+#ifndef NS_UNUSED_GLOBAL
+#if defined(__GNUC__)
+# define NS_UNUSED_GLOBAL(x) x __attribute__((unused))
+#elif defined(__LCLINT__)
+# define NS_UNUSED_GLOBAL(x) /*@unused@*/ x
+#else
+# define NS_UNUSED_GLOBAL(x) x
+#endif
+#endif
+
 #endif /* UNUSED_H */
diff -Naur ns-3.17/src/core/model/wall-clock-synchronizer.cc ns-3.18/src/core/model/wall-clock-synchronizer.cc
--- ns-3.17/src/core/model/wall-clock-synchronizer.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/model/wall-clock-synchronizer.cc	2013-10-26 07:07:30.027364392 -0700
@@ -203,7 +203,7 @@
 // I'm not really sure about this number -- a boss of mine once said, "pick
 // a number and it'll be wrong."  But this works for now.
 //
-// XXX BUGBUG Hardcoded tunable parameter below.
+// \todo Hardcoded tunable parameter below.
 //
   if (numberJiffies > 3)
     {
diff -Naur ns-3.17/src/core/test/attribute-test-suite.cc ns-3.18/src/core/test/attribute-test-suite.cc
--- ns-3.17/src/core/test/attribute-test-suite.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/test/attribute-test-suite.cc	2013-10-26 07:07:30.055364394 -0700
@@ -33,6 +33,7 @@
 #include "ns3/trace-source-accessor.h"
 #include "ns3/pointer.h"
 #include "ns3/object-factory.h"
+#include "ns3/nstime.h"
 
 using namespace ns3;
 
@@ -190,6 +191,10 @@
                      CallbackValue (),
                      MakeCallbackAccessor (&AttributeObjectTest::m_cbValue),
                      MakeCallbackChecker ())
+      .AddAttribute ("TestTimeWithBounds", "help text",
+                     TimeValue (Seconds (-2)),
+                     MakeTimeAccessor (&AttributeObjectTest::m_timeWithBounds),
+                     MakeTimeChecker (Seconds (-5), Seconds (10)))
     ;
 
     return tid;
@@ -243,6 +248,7 @@
   TracedValue<enum Test_e> m_enumSrc;
   TracedValue<double> m_doubleSrc;
   TracedValue<bool> m_boolSrc;
+  Time m_timeWithBounds;
 };
 
 NS_OBJECT_ENSURE_REGISTERED (AttributeObjectTest);
@@ -643,6 +649,73 @@
   NS_TEST_ASSERT_MSG_EQ (ok, true, "Error in SetAttributeFailSafe() but value changes");
 }
 
+template <> void
+AttributeTestCase<TimeValue>::DoRun (void)
+{
+  Ptr<AttributeObjectTest> p;
+  bool ok;
+
+  p = CreateObject<AttributeObjectTest> ();
+  NS_TEST_ASSERT_MSG_NE (p, 0, "Unable to CreateObject");
+
+  //
+  // Set value
+  //
+  ok = p->SetAttributeFailSafe ("TestTimeWithBounds", TimeValue (Seconds (5)));
+  NS_TEST_ASSERT_MSG_EQ (ok, true, "Could not SetAttributeFailSafe() via TimeValue to 5s");
+
+  ok = CheckGetCodePaths (p, "TestTimeWithBounds", "+5000000000.0ns", TimeValue (Seconds (5)));
+  NS_TEST_ASSERT_MSG_EQ (ok, true, "Attribute not set properly by SetAttributeFailSafe() (5s) via TimeValue");
+
+  ok = p->SetAttributeFailSafe ("TestTimeWithBounds", StringValue ("3s"));
+  NS_TEST_ASSERT_MSG_EQ (ok, true, "Could not SetAttributeFailSafe() via TimeValue to 5s");
+
+  ok = CheckGetCodePaths (p, "TestTimeWithBounds", "+3000000000.0ns", TimeValue (Seconds (3)));
+  NS_TEST_ASSERT_MSG_EQ (ok, true, "Attribute not set properly by SetAttributeFailSafe() (3s) via StringValue");
+
+  
+  //
+  // Attributes can have limits other than the intrinsic limits of the
+  // underlying data types.  These limits are specified in the Object.
+  //
+
+  //
+  // Set the Attribute at the positive limit
+  //
+  ok = p->SetAttributeFailSafe ("TestTimeWithBounds", TimeValue (Seconds (10)));
+  NS_TEST_ASSERT_MSG_EQ (ok, true, "Could not SetAttributeFailSafe() via TimeValue to 10");
+
+  ok = CheckGetCodePaths (p, "TestTimeWithBounds", "+10000000000.0ns", TimeValue (Seconds (10)));
+  NS_TEST_ASSERT_MSG_EQ (ok, true, "Attribute not set properly by SetAttributeFailSafe() (positive limit) via StringValue");
+
+  //
+  // Set the Attribute past the positive limit.
+  //
+  ok = p->SetAttributeFailSafe ("TestTimeWithBounds", TimeValue (Seconds (11)));
+  NS_TEST_ASSERT_MSG_EQ (ok, false, "Unexpectedly could SetAttributeFailSafe() via TimeValue to 11");
+
+  ok = CheckGetCodePaths (p, "TestTimeWithBounds", "+10000000000.0ns", TimeValue (Seconds (10)));
+  NS_TEST_ASSERT_MSG_EQ (ok, true, "Error in SetAttributeFailSafe() but value changes");
+
+  //
+  // Set the Attribute at the negative limit.
+  //
+  ok = p->SetAttributeFailSafe ("TestTimeWithBounds", TimeValue (Seconds (-5)));
+  NS_TEST_ASSERT_MSG_EQ (ok, true, "Could not SetAttributeFailSafe() via TimeValue to -5");
+
+  ok = CheckGetCodePaths (p, "TestTimeWithBounds", "-5000000000.0ns", TimeValue (Seconds (-5)));
+  NS_TEST_ASSERT_MSG_EQ (ok, true, "Attribute not set properly by SetAttributeFailSafe() (negative limit) via StringValue");
+
+  //
+  // Set the Attribute past the negative limit.
+  //
+  ok = p->SetAttributeFailSafe ("TestTimeWithBounds", TimeValue (Seconds (-6)));
+  NS_TEST_ASSERT_MSG_EQ (ok, false, "Unexpectedly could SetAttributeFailSafe() via TimeValue to -6");
+
+  ok = CheckGetCodePaths (p, "TestTimeWithBounds", "-5000000000.0ns", TimeValue (Seconds (-5)));
+  NS_TEST_ASSERT_MSG_EQ (ok, true, "Error in SetAttributeFailSafe() but value changes");
+}
+
 // ===========================================================================
 // Test the Attributes of type RandomVariableStream.
 // ===========================================================================
@@ -1279,14 +1352,15 @@
   AddTestCase (new AttributeTestCase<UintegerValue> ("Check Attributes of type UintegerValue"), TestCase::QUICK);
   AddTestCase (new AttributeTestCase<DoubleValue> ("Check Attributes of type DoubleValue"), TestCase::QUICK);
   AddTestCase (new AttributeTestCase<EnumValue> ("Check Attributes of type EnumValue"), TestCase::QUICK);
+  AddTestCase (new AttributeTestCase<TimeValue> ("Check Attributes of type TimeValue"), TestCase::QUICK);
   AddTestCase (new RandomVariableStreamAttributeTestCase ("Check Attributes of type RandomVariableStream"), TestCase::QUICK);
   AddTestCase (new ObjectVectorAttributeTestCase ("Check Attributes of type ObjectVectorValue"), TestCase::QUICK);
   AddTestCase (new ObjectMapAttributeTestCase ("Check Attributes of type ObjectMapValue"), TestCase::QUICK);
+  AddTestCase (new PointerAttributeTestCase ("Check Attributes of type PointerValue"), TestCase::QUICK);
+  AddTestCase (new CallbackValueTestCase ("Check Attributes of type CallbackValue"), TestCase::QUICK);
   AddTestCase (new IntegerTraceSourceAttributeTestCase ("Ensure TracedValue<uint8_t> can be set like IntegerValue"), TestCase::QUICK);
   AddTestCase (new IntegerTraceSourceTestCase ("Ensure TracedValue<uint8_t> also works as trace source"), TestCase::QUICK);
   AddTestCase (new TracedCallbackTestCase ("Ensure TracedCallback<double, int, float> works as trace source"), TestCase::QUICK);
-  AddTestCase (new PointerAttributeTestCase ("Check Attributes of type PointerValue"), TestCase::QUICK);
-  AddTestCase (new CallbackValueTestCase ("Check Attributes of type CallbackValue"), TestCase::QUICK);
 }
 
 static AttributesTestSuite attributesTestSuite;
diff -Naur ns-3.17/src/core/test/callback-test-suite.cc ns-3.18/src/core/test/callback-test-suite.cc
--- ns-3.17/src/core/test/callback-test-suite.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/test/callback-test-suite.cc	2013-10-26 07:07:30.059364393 -0700
@@ -300,6 +300,24 @@
 static bool *gMakeBoundCallbackTest2;
 static bool *gMakeBoundCallbackTest3a;
 static int gMakeBoundCallbackTest3b;
+static int gMakeBoundCallbackTest4a;
+static int gMakeBoundCallbackTest4b;
+static int gMakeBoundCallbackTest5a;
+static int gMakeBoundCallbackTest5b;
+static int gMakeBoundCallbackTest5c;
+static int gMakeBoundCallbackTest6a;
+static int gMakeBoundCallbackTest6b;
+static int gMakeBoundCallbackTest6c;
+static int gMakeBoundCallbackTest7a;
+static int gMakeBoundCallbackTest7b;
+static int gMakeBoundCallbackTest7c;
+static int gMakeBoundCallbackTest8a;
+static int gMakeBoundCallbackTest8b;
+static int gMakeBoundCallbackTest8c;
+static int gMakeBoundCallbackTest9a;
+static int gMakeBoundCallbackTest9b;
+static int gMakeBoundCallbackTest9c;
+static int gMakeBoundCallbackTest9d;
 
 void 
 MakeBoundCallbackTarget1 (int a)
@@ -321,6 +339,57 @@
   return 1234;
 }
 
+void
+MakeBoundCallbackTarget4 (int a, int b)
+{
+  gMakeBoundCallbackTest4a = a;
+  gMakeBoundCallbackTest4b = b;
+}
+
+int
+MakeBoundCallbackTarget5 (int a, int b)
+{
+  gMakeBoundCallbackTest5a = a;
+  gMakeBoundCallbackTest5b = b;
+  return 1234;
+}
+
+int
+MakeBoundCallbackTarget6 (int a, int b, int c)
+{
+  gMakeBoundCallbackTest6a = a;
+  gMakeBoundCallbackTest6b = b;
+  gMakeBoundCallbackTest6c = c;
+  return 1234;
+}
+
+void
+MakeBoundCallbackTarget7 (int a, int b, int c)
+{
+  gMakeBoundCallbackTest7a = a;
+  gMakeBoundCallbackTest7b = b;
+  gMakeBoundCallbackTest7c = c;
+}
+
+int
+MakeBoundCallbackTarget8 (int a, int b, int c)
+{
+  gMakeBoundCallbackTest8a = a;
+  gMakeBoundCallbackTest8b = b;
+  gMakeBoundCallbackTest8c = c;
+  return 1234;
+}
+
+int
+MakeBoundCallbackTarget9 (int a, int b, int c, int d)
+{
+  gMakeBoundCallbackTest9a = a;
+  gMakeBoundCallbackTest9b = b;
+  gMakeBoundCallbackTest9c = c;
+  gMakeBoundCallbackTest9d = d;
+  return 1234;
+}
+
 MakeBoundCallbackTestCase::MakeBoundCallbackTestCase ()
   : TestCase ("Check MakeBoundCallback() mechanism")
 {
@@ -333,6 +402,24 @@
   gMakeBoundCallbackTest2 = 0;
   gMakeBoundCallbackTest3a = 0;
   gMakeBoundCallbackTest3b = 0;
+  gMakeBoundCallbackTest4a = 0;
+  gMakeBoundCallbackTest4b = 0;
+  gMakeBoundCallbackTest5a = 0;
+  gMakeBoundCallbackTest5b = 0;
+  gMakeBoundCallbackTest5c = 0;
+  gMakeBoundCallbackTest6a = 0;
+  gMakeBoundCallbackTest6b = 0;
+  gMakeBoundCallbackTest6c = 0;
+  gMakeBoundCallbackTest7a = 0;
+  gMakeBoundCallbackTest7b = 0;
+  gMakeBoundCallbackTest7c = 0;
+  gMakeBoundCallbackTest8a = 0;
+  gMakeBoundCallbackTest8b = 0;
+  gMakeBoundCallbackTest8c = 0;
+  gMakeBoundCallbackTest9a = 0;
+  gMakeBoundCallbackTest9b = 0;
+  gMakeBoundCallbackTest9c = 0;
+  gMakeBoundCallbackTest9d = 0;
 }
 
 void
@@ -376,6 +463,51 @@
   NS_TEST_ASSERT_MSG_EQ (result, 1234, "Return value of callback not correct");
   NS_TEST_ASSERT_MSG_EQ (gMakeBoundCallbackTest3a, &a, "Callback did not fire or binding not correct");
   NS_TEST_ASSERT_MSG_EQ (gMakeBoundCallbackTest3b, 2468, "Callback did not fire or argument not correct");
+
+  //
+  // Test the TwoBound variant
+  //
+  Callback<void> target4 = MakeBoundCallback (&MakeBoundCallbackTarget4, 3456, 5678);
+  target4 ();
+  NS_TEST_ASSERT_MSG_EQ (gMakeBoundCallbackTest4a, 3456, "Callback did not fire or binding not correct");
+  NS_TEST_ASSERT_MSG_EQ (gMakeBoundCallbackTest4b, 5678, "Callback did not fire or binding not correct");
+
+  Callback<int> target5 = MakeBoundCallback (&MakeBoundCallbackTarget5, 3456, 5678);
+  int resultTwoA = target5 ();
+  NS_TEST_ASSERT_MSG_EQ (resultTwoA, 1234, "Return value of callback not correct");
+  NS_TEST_ASSERT_MSG_EQ (gMakeBoundCallbackTest5a, 3456, "Callback did not fire or binding not correct");
+  NS_TEST_ASSERT_MSG_EQ (gMakeBoundCallbackTest5b, 5678, "Callback did not fire or binding not correct");
+
+  Callback<int, int> target6 = MakeBoundCallback (&MakeBoundCallbackTarget6, 3456, 5678);
+  int resultTwoB = target6 (6789);
+  NS_TEST_ASSERT_MSG_EQ (resultTwoB, 1234, "Return value of callback not correct");
+  NS_TEST_ASSERT_MSG_EQ (gMakeBoundCallbackTest6a, 3456, "Callback did not fire or binding not correct");
+  NS_TEST_ASSERT_MSG_EQ (gMakeBoundCallbackTest6b, 5678, "Callback did not fire or binding not correct");
+  NS_TEST_ASSERT_MSG_EQ (gMakeBoundCallbackTest6c, 6789, "Callback did not fire or argument not correct");
+
+  //
+  // Test the ThreeBound variant
+  //
+  Callback<void> target7 = MakeBoundCallback (&MakeBoundCallbackTarget7, 2345, 3456, 4567);
+  target7 ();
+  NS_TEST_ASSERT_MSG_EQ (gMakeBoundCallbackTest7a, 2345, "Callback did not fire or binding not correct");
+  NS_TEST_ASSERT_MSG_EQ (gMakeBoundCallbackTest7b, 3456, "Callback did not fire or binding not correct");
+  NS_TEST_ASSERT_MSG_EQ (gMakeBoundCallbackTest7c, 4567, "Callback did not fire or binding not correct");
+
+  Callback<int> target8 = MakeBoundCallback (&MakeBoundCallbackTarget8, 2345, 3456, 4567);
+  int resultThreeA = target8 ();
+  NS_TEST_ASSERT_MSG_EQ (resultThreeA, 1234, "Return value of callback not correct");
+  NS_TEST_ASSERT_MSG_EQ (gMakeBoundCallbackTest8a, 2345, "Callback did not fire or binding not correct");
+  NS_TEST_ASSERT_MSG_EQ (gMakeBoundCallbackTest8b, 3456, "Callback did not fire or binding not correct");
+  NS_TEST_ASSERT_MSG_EQ (gMakeBoundCallbackTest8c, 4567, "Callback did not fire or binding not correct");
+
+  Callback<int, int> target9 = MakeBoundCallback (&MakeBoundCallbackTarget9, 2345, 3456, 4567);
+  int resultThreeB = target9 (5678);
+  NS_TEST_ASSERT_MSG_EQ (resultThreeB, 1234, "Return value of callback not correct");
+  NS_TEST_ASSERT_MSG_EQ (gMakeBoundCallbackTest9a, 2345, "Callback did not fire or binding not correct");
+  NS_TEST_ASSERT_MSG_EQ (gMakeBoundCallbackTest9b, 3456, "Callback did not fire or binding not correct");
+  NS_TEST_ASSERT_MSG_EQ (gMakeBoundCallbackTest9c, 4567, "Callback did not fire or binding not correct");
+  NS_TEST_ASSERT_MSG_EQ (gMakeBoundCallbackTest9d, 5678, "Callback did not fire or binding not correct");
 }
 
 // ===========================================================================
diff -Naur ns-3.17/src/core/test/command-line-test-suite.cc ns-3.18/src/core/test/command-line-test-suite.cc
--- ns-3.17/src/core/test/command-line-test-suite.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/test/command-line-test-suite.cc	2013-10-26 07:07:30.055364394 -0700
@@ -29,16 +29,28 @@
 
 using namespace ns3;
 
-// ===========================================================================
-// A test base class that drives Command Line parsing
-// ===========================================================================
+/*************************************************************************//**
+ * A test base class that drives Command Line parsing
+ ****************************************************************************/
 class CommandLineTestCaseBase : public TestCase
 {
 public:
+  /**
+   * Constructor
+   *
+   * \param description purpose of this TestCase
+   */
   CommandLineTestCaseBase (std::string description);
+  /** Destructor */
   virtual ~CommandLineTestCaseBase () {}
 
-  void Parse (const CommandLine &cmd, int n, ...);
+  /**
+   * Excercise the CommandLine with the provided arguments
+   *
+   * \param cmd the configured CommandLine
+   * \param n the number of arguments
+   */
+  void Parse (CommandLine &cmd, int n, ...);
 };
 
 CommandLineTestCaseBase::CommandLineTestCaseBase (std::string description)
@@ -47,7 +59,7 @@
 }
 
 void
-CommandLineTestCaseBase::Parse (const CommandLine &cmd, int n, ...)
+CommandLineTestCaseBase::Parse (CommandLine &cmd, int n, ...)
 {
   char **args = new char* [n+1];
   args[0] = (char *) "Test";
@@ -60,22 +72,23 @@
       args[i+1] = arg;
       i++;
     }
+  va_end (ap);
   int argc = n + 1;
   cmd.Parse (argc, args);
   delete [] args;
 }
 
-// ===========================================================================
-// Test boolean Command Line processing
-// ===========================================================================
+/*************************************************************************//**
+ * Test boolean Command Line processing
+ ****************************************************************************/
 class CommandLineBooleanTestCase : public CommandLineTestCaseBase
 {
 public:
-  CommandLineBooleanTestCase ();
-  virtual ~CommandLineBooleanTestCase () {}
+  CommandLineBooleanTestCase ();             /**< Constructor */
+  virtual ~CommandLineBooleanTestCase () {}  /**< Destructor */
 
 private:
-  virtual void DoRun (void);
+  virtual void DoRun (void);                 /**< Run the test */
 
 };
 
@@ -89,27 +102,41 @@
 {
   CommandLine cmd;
   bool myBool = true;
+  bool myDefaultFalseBool = false;
 
   cmd.AddValue ("my-bool", "help", myBool);
+  cmd.AddValue ("my-false-bool", "help", myDefaultFalseBool);
 
   Parse (cmd, 1, "--my-bool=0");
   NS_TEST_ASSERT_MSG_EQ (myBool, false, "Command parser did not correctly set a boolean value to false");
 
   Parse (cmd, 1, "--my-bool=1");
-  NS_TEST_ASSERT_MSG_EQ (myBool, true, "Command parser did not correctly set a boolean value to true");
+  NS_TEST_ASSERT_MSG_EQ (myBool, true, "Command parser did not correctly set a boolean value to true, given integer argument");
+
+  Parse (cmd, 1, "--my-bool");
+  NS_TEST_ASSERT_MSG_EQ (myBool, false, "Command parser did not correctly toggle a default true boolean value to false, given no argument");
+
+  Parse (cmd, 1, "--my-false-bool");
+  NS_TEST_ASSERT_MSG_EQ (myDefaultFalseBool, true, "Command parser did not correctly toggle a default false boolean value to true, given no argument");
+
+  Parse (cmd, 1, "--my-bool=t");
+  NS_TEST_ASSERT_MSG_EQ (myBool, true, "Command parser did not correctly set a boolean value to true, given 't' argument");
+
+  Parse (cmd, 1, "--my-bool=true");
+  NS_TEST_ASSERT_MSG_EQ (myBool, true, "Command parser did not correctly set a boolean value to true, given \"true\" argument");
 }
 
-// ===========================================================================
-// Test int Command Line processing
-// ===========================================================================
+/*************************************************************************//**
+ * Test int Command Line processing
+ ****************************************************************************/
 class CommandLineIntTestCase : public CommandLineTestCaseBase
 {
 public:
-  CommandLineIntTestCase ();
-  virtual ~CommandLineIntTestCase () {}
-
-private:
-  virtual void DoRun (void);
+  CommandLineIntTestCase ();                 /**< Constructor */ 
+  virtual ~CommandLineIntTestCase () {}      /**< Destructor */  
+                                                                 
+private:                                                         
+  virtual void DoRun (void);                 /**< Run the test */
 
 };
 
@@ -137,17 +164,17 @@
   NS_TEST_ASSERT_MSG_EQ (myInt32, +2, "Command parser did not correctly set an integer value to +2");
 }
 
-// ===========================================================================
-// Test unsigned int Command Line processing
-// ===========================================================================
+/*************************************************************************//**
+ * Test unsigned int Command Line processing
+ ****************************************************************************/
 class CommandLineUnsignedIntTestCase : public CommandLineTestCaseBase
 {
 public:
-  CommandLineUnsignedIntTestCase ();
-  virtual ~CommandLineUnsignedIntTestCase () {}
-
-private:
-  virtual void DoRun (void);
+  CommandLineUnsignedIntTestCase ();              /**< Constructor */ 
+  virtual ~CommandLineUnsignedIntTestCase () {}   /**< Destructor */  
+                                                                      
+private:                                                              
+  virtual void DoRun (void);                      /**< Run the test */
 
 };
 
@@ -172,17 +199,17 @@
   NS_TEST_ASSERT_MSG_EQ (myUint32, 9, "Command parser did not correctly set an unsigned integer value to 9");
 }
 
-// ===========================================================================
-// Test string Command Line processing
-// ===========================================================================
+/*************************************************************************//**
+ * Test string Command Line processing
+ ****************************************************************************/
 class CommandLineStringTestCase : public CommandLineTestCaseBase
 {
 public:
-  CommandLineStringTestCase ();
-  virtual ~CommandLineStringTestCase () {}
-
-private:
-  virtual void DoRun (void);
+  CommandLineStringTestCase ();              /**< Constructor */ 
+  virtual ~CommandLineStringTestCase () {}   /**< Destructor */  
+                                                                 
+private:                                                         
+  virtual void DoRun (void);                 /**< Run the test */
 
 };
 
@@ -207,13 +234,13 @@
   NS_TEST_ASSERT_MSG_EQ (myStr, "XX", "Command parser did not correctly set an string value to \"XX\"");
 }
 
-// ===========================================================================
-// The Test Suite that glues all of the Test Cases together.
-// ===========================================================================
+/*************************************************************************//**
+ * The Test Suite that glues all of the Test Cases together.
+ ****************************************************************************/
 class CommandLineTestSuite : public TestSuite
 {
 public:
-  CommandLineTestSuite ();
+  CommandLineTestSuite ();                   /**< Constructor */
 };
 
 CommandLineTestSuite::CommandLineTestSuite ()
@@ -225,4 +252,4 @@
   AddTestCase (new CommandLineStringTestCase, TestCase::QUICK);
 }
 
-static CommandLineTestSuite CommandLineTestSuite;
+static CommandLineTestSuite CommandLineTestSuite; /**< Test instance */
diff -Naur ns-3.17/src/core/test/event-garbage-collector-test-suite.cc ns-3.18/src/core/test/event-garbage-collector-test-suite.cc
--- ns-3.17/src/core/test/event-garbage-collector-test-suite.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/core/test/event-garbage-collector-test-suite.cc	2013-10-26 07:07:30.063364393 -0700
@@ -0,0 +1,89 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2007 INESC Porto
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Gustavo J. A. M. Carneiro  <gjc@inescporto.pt>
+ */
+
+#include "ns3/test.h"
+#include "ns3/event-garbage-collector.h"
+
+namespace ns3 {
+
+class EventGarbageCollectorTestCase : public TestCase
+{
+  int m_counter;
+  EventGarbageCollector *m_events;
+
+  void EventGarbageCollectorCallback ();
+
+public:
+
+  EventGarbageCollectorTestCase ();
+  virtual ~EventGarbageCollectorTestCase ();
+  virtual void DoRun (void);
+};
+
+EventGarbageCollectorTestCase::EventGarbageCollectorTestCase ()
+  : TestCase ("EventGarbageCollector"), m_counter (0), m_events (0)
+{
+}
+
+EventGarbageCollectorTestCase::~EventGarbageCollectorTestCase ()
+{
+}
+
+void
+EventGarbageCollectorTestCase::EventGarbageCollectorCallback ()
+{
+  m_counter++;
+  if (m_counter == 50)
+    {
+      // this should cause the remaining (50) events to be cancelled
+      delete m_events;
+      m_events = 0;
+    }
+}
+
+void EventGarbageCollectorTestCase::DoRun (void)
+{
+  m_events = new EventGarbageCollector ();
+
+  for (int n = 0; n < 100; n++)
+    {
+      m_events->Track (Simulator::Schedule
+                         (Simulator::Now (),
+                         &EventGarbageCollectorTestCase::EventGarbageCollectorCallback,
+                         this));
+    }
+  Simulator::Run ();
+  NS_TEST_EXPECT_MSG_EQ (m_events, 0, "");
+  NS_TEST_EXPECT_MSG_EQ (m_counter, 50, "");
+  Simulator::Destroy ();
+}
+
+static class EventGarbageCollectorTestSuite : public TestSuite
+{
+public:
+  EventGarbageCollectorTestSuite ()
+    : TestSuite ("event-garbage-collector", UNIT) 
+  {
+    AddTestCase (new EventGarbageCollectorTestCase (), TestCase::QUICK);
+  }
+} g_eventGarbageCollectorTests;
+
+}
+
diff -Naur ns-3.17/src/core/test/hash-test-suite.cc ns-3.18/src/core/test/hash-test-suite.cc
--- ns-3.17/src/core/test/hash-test-suite.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/core/test/hash-test-suite.cc	2013-10-26 07:07:30.063364393 -0700
@@ -0,0 +1,401 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2012 Lawrence Livermore National Laboratory
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Peter D. Barnes, Jr. <pdbarnes@llnl.gov>
+ */
+
+#include <iomanip>
+#include <string>
+
+#include "ns3/test.h"
+#include "ns3/hash.h"
+
+namespace ns3 {
+
+/**
+ * Base class for hash tests
+ */
+class HashTestCase : public TestCase
+{
+public:
+  HashTestCase (const std::string name);
+  virtual ~HashTestCase ();
+protected:
+  void Check ( const std::string hashName, const uint32_t hash);
+  void Check ( const std::string hashName, const uint64_t hash);
+  std::string key;
+  uint32_t hash32Reference;
+  uint64_t hash64Reference;
+private:
+  void Check ( const std::string hashName, const int bits, const uint64_t hash);
+  virtual void DoRun (void);
+};  // class HashTestCase
+
+HashTestCase::HashTestCase (const std:: string name)
+  : TestCase (name),
+    key ("The quick brown fox jumped over the lazy dogs.")
+{
+}
+
+HashTestCase::~HashTestCase ()
+{
+}
+
+void
+HashTestCase::Check ( const std::string hashName, const uint32_t hash)
+{
+  Check (hashName, 32, hash);
+}
+
+void
+HashTestCase::Check ( const std::string hashName, const uint64_t hash)
+{
+  Check (hashName, 64, hash);
+}
+
+void
+HashTestCase::Check ( std::string hashName, int bits, uint64_t hash)
+{
+  int w;
+  std::string type;
+  uint64_t hashRef;
+
+  if (bits == 32)
+    {
+      w = 8;
+      type = "Hash32";
+      hashRef = hash32Reference;
+    }
+  else
+    {
+      w = 16;
+      type = "Hash64";
+      hashRef = hash64Reference;
+    }
+
+  std::cout << GetName () << "checking "
+            << hashName << " "
+            << bits     << "-bit result...";
+  NS_TEST_EXPECT_MSG_EQ (hash, hashRef,
+                         hashName << " " << type
+                         << " produced "  << std::hex << std::setw (w) << hash
+                         << ", expected " << std::hex << std::setw (w) << hashRef
+                         << std::dec
+                         );
+  std::cout << std::hex << std::setw (w) << hash << ", ok"
+            << std::dec << std::endl;
+}
+
+void
+HashTestCase::DoRun (void)
+{
+}
+
+
+//----------------------------
+//
+// Test default hash on fixed string
+
+class DefaultHashTestCase : public HashTestCase
+{
+public:
+  DefaultHashTestCase ();
+  virtual ~DefaultHashTestCase ();
+private:
+  virtual void DoRun (void);
+};
+
+DefaultHashTestCase::DefaultHashTestCase ()
+  : HashTestCase ("DefaultHash: ")
+{
+}
+
+DefaultHashTestCase::~DefaultHashTestCase ()
+{
+}
+
+void
+DefaultHashTestCase::DoRun (void)
+{
+  std::cout << GetName () << "checking with key: \""
+            << key << "\"" << std::endl;
+
+  hash32Reference = 0x463d70e2;  // murmur3(key)
+  Check ( "default", Hash32 (key));
+
+  hash64Reference = 0xa750412079d53e04;
+  Check ( "default", Hash64 (key));
+}
+
+//----------------------------
+//
+// Test FNV hash on fixed string
+
+class Fnv1aTestCase : public HashTestCase
+{
+public:
+  Fnv1aTestCase ();
+  virtual ~Fnv1aTestCase ();
+private:
+  virtual void DoRun (void);
+};
+
+Fnv1aTestCase::Fnv1aTestCase ()
+  : HashTestCase ("Fnv1a: ")
+{
+}
+
+Fnv1aTestCase::~Fnv1aTestCase ()
+{
+}
+
+void
+Fnv1aTestCase::DoRun (void)
+{
+  Hasher hasher = Hasher ( Create<Hash::Function::Fnv1a> () );
+  hash32Reference = 0xa3fc0d6d;  // Fnv1a(key)
+  Check ("FNV1a", hasher.clear ().GetHash32 (key));
+
+  hash64Reference = 0x88f6cdbe0a31098d;
+  Check ( "FNV1a", hasher.clear ().GetHash64 (key));
+}
+
+
+//----------------------------
+//
+// Test Murmur3 hash on fixed string
+
+class Murmur3TestCase : public HashTestCase
+{
+public:
+  Murmur3TestCase ();
+  virtual ~Murmur3TestCase ();
+private:
+  virtual void DoRun (void);
+};
+
+Murmur3TestCase::Murmur3TestCase ()
+  : HashTestCase ("Murmur3: ")
+{
+}
+
+Murmur3TestCase::~Murmur3TestCase ()
+{
+}
+
+void
+Murmur3TestCase::DoRun (void)
+{
+  Hasher hasher = Hasher ( Create<Hash::Function::Murmur3> () );
+  hash32Reference = 0x463d70e2;  // Murmur3(key)
+  Check ( "murmur3", hasher.clear ().GetHash32 (key));
+
+  hash64Reference = 0xa750412079d53e04;
+  Check ( "murmur3", hasher.clear ().GetHash64 (key));
+}
+
+
+//----------------------------
+//
+// Test Hash32Function_ptr/Hash64Function_ptr
+//
+// Simple hash function based on the GNU sum program
+// 16-bit checksum algorithm.  See
+// http://svnweb.freebsd.org/base/stable/9/usr.bin/cksum/sum1.c?view=markup
+//
+uint16_t
+gnu_sum (const char * buffer, const size_t size)
+{
+  const char * p = buffer;
+  const char * const pend = p + size;
+
+  uint16_t checksum = 0;     /* The checksum mod 2^16. */
+
+  while (p != pend)
+    {
+      checksum = (checksum >> 1) + ((checksum & 1) << 15);  // barrel shift
+      checksum += *p++;
+    }
+  return checksum;
+}
+
+// Hash32FunctionPtr
+uint32_t
+gnu_sum32 (const char * buffer, const size_t size)
+{
+  uint32_t h = gnu_sum (buffer, size);
+  return (uint32_t)( (h << 16) + h);
+}
+
+// Hash64FunctionPtr
+uint64_t
+gnu_sum64 (const char * buffer, const size_t size)
+{
+  uint64_t h = gnu_sum32 (buffer, size);
+  return (uint64_t)( (h << 32) + h);
+}
+
+/**
+ * Test 32-bit function pointer
+ */
+class Hash32FunctionPtrTestCase : public HashTestCase
+{
+public:
+  Hash32FunctionPtrTestCase ();
+  virtual ~Hash32FunctionPtrTestCase ();
+private:
+  virtual void DoRun (void);
+};
+
+Hash32FunctionPtrTestCase::Hash32FunctionPtrTestCase ()
+  : HashTestCase ("Hash32FunctionPtr: ")
+{
+}
+
+Hash32FunctionPtrTestCase::~Hash32FunctionPtrTestCase ()
+{
+}
+
+void
+Hash32FunctionPtrTestCase::DoRun (void)
+{
+  Hasher hasher = Hasher ( Create<Hash::Function::Hash32> (&gnu_sum32) );
+  hash32Reference = 0x41264126;  // Hash32FunctionPtr(key)
+  Check ( "gnu_sum32", hasher.clear ().GetHash32 (key));
+}
+
+/**
+ * Test 64-bit function pointer
+ */
+class Hash64FunctionPtrTestCase : public HashTestCase
+{
+public:
+  Hash64FunctionPtrTestCase ();
+  virtual ~Hash64FunctionPtrTestCase ();
+private:
+  virtual void DoRun (void);
+};
+
+Hash64FunctionPtrTestCase::Hash64FunctionPtrTestCase ()
+  : HashTestCase ("Hash64FunctionPtr: ")
+{
+}
+
+Hash64FunctionPtrTestCase::~Hash64FunctionPtrTestCase ()
+{
+}
+
+void
+Hash64FunctionPtrTestCase::DoRun (void)
+{
+  Hasher hasher = Hasher ( Create<Hash::Function::Hash64> (&gnu_sum64) );
+  hash64Reference = 0x4126412641264126;  // Hash64FunctionPtr(key)
+  Check ( "gnu_sum64", hasher.clear ().GetHash64 (key));
+}
+
+/**
+ * Test incremental hashing
+ */  
+class IncrementalTestCase : public HashTestCase
+{
+public:
+  IncrementalTestCase ();
+  virtual ~IncrementalTestCase ();
+private:
+  virtual void DoRun (void);
+  void DoHash (const std::string name, Hasher hasher);
+  // Test strings
+  std::string key1;
+  std::string key2;
+  std::string key12;
+};
+
+IncrementalTestCase::IncrementalTestCase ()
+  : HashTestCase ("Incremental: ")
+{
+}
+
+IncrementalTestCase::~IncrementalTestCase ()
+{
+}
+
+void
+IncrementalTestCase::DoHash (const std::string name, Hasher hasher)
+{
+  hash32Reference = hasher.clear ().GetHash32 (key12);
+  hasher.clear ().GetHash32 (key1);
+  Check ( name, hasher.GetHash32 (key2));
+
+  hash64Reference = hasher.clear ().GetHash64 (key12);
+  hasher.clear ().GetHash64 (key1);
+  Check ( name, hasher.GetHash64 (key2));
+}
+
+void
+IncrementalTestCase::DoRun (void)
+{
+  key1 = "The quick brown ";
+  key2 = "Incremental.";
+  key12  = key1 + key2;
+
+  std::cout << GetName () << "checking with key: "
+            << "\"" << key1  << "\"[" << key1.size ()  << "] + "
+            << "\"" << key2  << "\"[" << key2.size ()  << "]" << std::endl;
+  std::cout << GetName () << "equivalent to:     "
+            << "\"" << key12 << "\"[" << key12.size () << "]" << std::endl;
+
+  DoHash ( "default", Hasher ( ) );
+  DoHash ( "murmur3", Hasher ( Create<Hash::Function::Murmur3> () ) );
+  DoHash ( "FNV1a",   Hasher ( Create<Hash::Function::Fnv1a> () ) );
+}
+
+
+/**
+ * Hash functions test suite
+ */
+class HashTestSuite : public TestSuite
+{
+public:
+  HashTestSuite ();
+};
+
+HashTestSuite::HashTestSuite ()
+  : TestSuite ("hash", UNIT)
+{
+// The below tests fail for static optimized builds in gcc-4.4.3 (64-bit)
+// This is likely due to a compiler bug (see also the strict alias
+// warning issue mentioned in hash-murmur3.cc).  It does not impact
+// most users of the code, so we silence the test failure while we
+// continue to use gcc-4.4.3 (python bindings) for other purposes
+//
+// This code can be removed once gcc-4.4.3 is no longer supported
+//
+// Test for gcc 4.4.x
+#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
+#if (GCC_VERSION != 404)
+  AddTestCase (new DefaultHashTestCase, QUICK);
+  AddTestCase (new Murmur3TestCase, QUICK);
+  AddTestCase (new Fnv1aTestCase, QUICK);
+  AddTestCase (new IncrementalTestCase, QUICK);
+#endif
+  AddTestCase (new Hash32FunctionPtrTestCase, QUICK);
+  AddTestCase (new Hash64FunctionPtrTestCase, QUICK);
+}
+
+static HashTestSuite g_hashTestSuite;
+
+}  // namespace ns3
diff -Naur ns-3.17/src/core/test/int64x64-test-suite.cc ns-3.18/src/core/test/int64x64-test-suite.cc
--- ns-3.17/src/core/test/int64x64-test-suite.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/test/int64x64-test-suite.cc	2013-10-26 07:07:30.059364393 -0700
@@ -170,6 +170,9 @@
   CHECK_EXPECTED (V (2000000000) / V (3) * V (3), 1999999999);
 }
 
+/**
+ * See \bugid{455}
+ */
 class Int64x64Bug455TestCase : public TestCase
 {
 public:
@@ -201,6 +204,9 @@
   NS_TEST_ASSERT_MSG_EQ (a.GetDouble (), -2.5, "only second operand negative");
 }
 
+/**
+ * See \bugid{863}
+ */
 class Int64x64Bug863TestCase : public TestCase
 {
 public:
diff -Naur ns-3.17/src/core/test/object-test-suite.cc ns-3.18/src/core/test/object-test-suite.cc
--- ns-3.17/src/core/test/object-test-suite.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/test/object-test-suite.cc	2013-10-26 07:07:30.059364393 -0700
@@ -29,7 +29,7 @@
 {
 public:
   static ns3::TypeId GetTypeId (void) {
-    static ns3::TypeId tid = ns3::TypeId ("BaseA")
+    static ns3::TypeId tid = ns3::TypeId ("ObjectTest:BaseA")
       .SetParent (Object::GetTypeId ())
       .HideFromDocumentation ()
       .AddConstructor<BaseA> ();
@@ -44,7 +44,7 @@
 {
 public:
   static ns3::TypeId GetTypeId (void) {
-    static ns3::TypeId tid = ns3::TypeId ("DerivedA")
+    static ns3::TypeId tid = ns3::TypeId ("ObjectTest:DerivedA")
       .SetParent (BaseA::GetTypeId ())
       .HideFromDocumentation ()
       .AddConstructor<DerivedA> ();
@@ -61,7 +61,7 @@
 {
 public:
   static ns3::TypeId GetTypeId (void) {
-    static ns3::TypeId tid = ns3::TypeId ("BaseB")
+    static ns3::TypeId tid = ns3::TypeId ("ObjectTest:BaseB")
       .SetParent (Object::GetTypeId ())
       .HideFromDocumentation ()
       .AddConstructor<BaseB> ();
@@ -76,7 +76,7 @@
 {
 public:
   static ns3::TypeId GetTypeId (void) {
-    static ns3::TypeId tid = ns3::TypeId ("DerivedB")
+    static ns3::TypeId tid = ns3::TypeId ("ObjectTest:DerivedB")
       .SetParent (BaseB::GetTypeId ())
       .HideFromDocumentation ()
       .AddConstructor<DerivedB> ();
diff -Naur ns-3.17/src/core/test/ptr-test-suite.cc ns-3.18/src/core/test/ptr-test-suite.cc
--- ns-3.17/src/core/test/ptr-test-suite.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/test/ptr-test-suite.cc	2013-10-26 07:07:30.059364393 -0700
@@ -125,7 +125,7 @@
   {
     Ptr<NoCount> p = Create<NoCount> (this);
   }
-  NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 1, "XXX");
+  NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 1, "001");
 
   m_nDestroyed = 0;
   {
@@ -133,7 +133,7 @@
     p = Create<NoCount> (this);
     p = p;
   }
-  NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 1, "XXX");
+  NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 1, "002");
 
   m_nDestroyed = 0;
   {
@@ -141,7 +141,7 @@
     p1 = Create<NoCount> (this);
     Ptr<NoCount> p2 = p1;
   }
-  NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 1, "XXX");
+  NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 1, "003");
 
   m_nDestroyed = 0;
   {
@@ -150,7 +150,7 @@
     Ptr<NoCount> p2;
     p2 = p1;
   }
-  NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 1, "XXX");
+  NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 1, "004");
 
   m_nDestroyed = 0;
   {
@@ -159,7 +159,7 @@
     Ptr<NoCount> p2 = Create<NoCount> (this);
     p2 = p1;
   }
-  NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 2, "XXX");
+  NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 2, "005");
 
   m_nDestroyed = 0;
   {
@@ -169,7 +169,7 @@
     p2 = Create<NoCount> (this);
     p2 = p1;
   }
-  NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 2, "XXX");
+  NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 2, "006");
 
   m_nDestroyed = 0;
   {
@@ -177,7 +177,7 @@
     p1 = Create<NoCount> (this);
     p1 = Create<NoCount> (this);
   }
-  NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 2, "XXX");
+  NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 2, "007");
 
   m_nDestroyed = 0;
   {
@@ -188,9 +188,9 @@
       p2 = Create<NoCount> (this);
       p2 = p1;
     }
-    NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 1, "XXX");
+    NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 1, "008");
   }
-  NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 2, "XXX");
+  NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 2, "009");
 
   m_nDestroyed = 0;
   {
@@ -201,9 +201,9 @@
       p2 = Create<NoCount> (this);
       p2 = CallTest (p1);
     }
-    NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 1, "XXX");
+    NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 1, "010");
   }
-  NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 2, "XXX");
+  NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 2, "011");
 
   {
     Ptr<NoCount> p1;
@@ -241,7 +241,7 @@
       raw = GetPointer (p);
       p = 0;
     }
-    NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 0, "XXX");
+    NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 0, "012");
     delete raw;
   }
 
@@ -253,7 +253,7 @@
     v1->Nothing ();
     v2->Nothing ();
   }
-  NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 1, "XXX");
+  NS_TEST_EXPECT_MSG_EQ (m_nDestroyed, 1, "013");
 
   {
     Ptr<Base> p0 = Create<NoCount> (this);
diff -Naur ns-3.17/src/core/test/random-variable-stream-test-suite.cc ns-3.18/src/core/test/random-variable-stream-test-suite.cc
--- ns-3.17/src/core/test/random-variable-stream-test-suite.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/test/random-variable-stream-test-suite.cc	2013-10-26 07:07:30.059364393 -0700
@@ -1597,10 +1597,10 @@
 
   // Test that values have approximately the right mean value.
   //
-  // XXX This test fails sometimes if the required tolerance is less
-  // than 3%, which may be because there is a bug in the
-  // implementation or that the mean of this distribution is more
-  // senstive to its parameters than the others are.
+  /// \todo This test fails sometimes if the required tolerance is less
+  /// than 3%, which may be because there is a bug in the
+  /// implementation or that the mean of this distribution is more
+  /// senstive to its parameters than the others are.
   double TOLERANCE = expectedMean * 3e-2;
   NS_TEST_ASSERT_MSG_EQ_TOL (valueMean, expectedMean, TOLERANCE, "Wrong mean value."); 
 }
@@ -1740,10 +1740,10 @@
 
   // Test that values have approximately the right mean value.
   //
-  // XXX This test fails sometimes if the required tolerance is less
-  // than 3%, which may be because there is a bug in the
-  // implementation or that the mean of this distribution is more
-  // senstive to its parameters than the others are.
+  /// \todo This test fails sometimes if the required tolerance is less
+  /// than 3%, which may be because there is a bug in the
+  /// implementation or that the mean of this distribution is more
+  /// senstive to its parameters than the others are.
   double TOLERANCE = expectedMean * 3e-2;
   NS_TEST_ASSERT_MSG_EQ_TOL (valueMean, expectedMean, TOLERANCE, "Wrong mean value."); 
 }
@@ -2798,16 +2798,16 @@
   AddTestCase (new RandomVariableStreamWeibullTestCase, TestCase::QUICK);
   AddTestCase (new RandomVariableStreamWeibullAntitheticTestCase, TestCase::QUICK);
   AddTestCase (new RandomVariableStreamLogNormalTestCase, TestCase::QUICK);
-  // XXX This test is currently disabled because it fails sometimes.
-  // A possible reason for the failure is that the antithetic code is
-  // not implemented properly for this log-normal case.
+  /// \todo This test is currently disabled because it fails sometimes.
+  /// A possible reason for the failure is that the antithetic code is
+  /// not implemented properly for this log-normal case.
   /*
   AddTestCase (new RandomVariableStreamLogNormalAntitheticTestCase, TestCase::QUICK);
   */
   AddTestCase (new RandomVariableStreamGammaTestCase, TestCase::QUICK);
-  // XXX This test is currently disabled because it fails sometimes.
-  // A possible reason for the failure is that the antithetic code is
-  // not implemented properly for this gamma case.
+  /// \todo This test is currently disabled because it fails sometimes.
+  /// A possible reason for the failure is that the antithetic code is
+  /// not implemented properly for this gamma case.
   /*
   AddTestCase (new RandomVariableStreamGammaAntitheticTestCase, TestCase::QUICK);
   */
diff -Naur ns-3.17/src/core/test/time-test-suite.cc ns-3.18/src/core/test/time-test-suite.cc
--- ns-3.17/src/core/test/time-test-suite.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/test/time-test-suite.cc	2013-10-26 07:07:30.059364393 -0700
@@ -27,31 +27,26 @@
 class TimeSimpleTestCase : public TestCase
 {
 public:
-  TimeSimpleTestCase (enum Time::Unit resolution);
+  TimeSimpleTestCase ();
 private:
   virtual void DoSetup (void);
   virtual void DoRun (void);
   virtual void DoTeardown (void);
-  enum Time::Unit m_originalResolution;
-  enum Time::Unit m_resolution;
 };
 
-TimeSimpleTestCase::TimeSimpleTestCase (enum Time::Unit resolution)
-  : TestCase ("Sanity check of common time operations"),
-    m_resolution (resolution)
+TimeSimpleTestCase::TimeSimpleTestCase ()
+  : TestCase ("Sanity check of common time operations")
 {
 }
 
 void
 TimeSimpleTestCase::DoSetup (void)
 {
-  m_originalResolution = Time::GetResolution ();
 }
 
 void
 TimeSimpleTestCase::DoRun (void)
 {
-  Time::SetResolution (m_resolution);
   NS_TEST_ASSERT_MSG_EQ_TOL (Seconds (1.0).GetSeconds (), 1.0, TimeStep (1).GetSeconds (), 
                              "is 1 really 1 ?");
   NS_TEST_ASSERT_MSG_EQ_TOL (Seconds (10.0).GetSeconds (), 10.0, TimeStep (1).GetSeconds (), 
@@ -70,12 +65,18 @@
   NS_TEST_ASSERT_MSG_EQ (FemtoSeconds (1).GetFemtoSeconds (), 1, 
                          "is 1fs really 1fs ?");
 #endif
+
+  Time ten = NanoSeconds (10);
+  int64_t tenValue = ten.GetInteger ();
+  Time::SetResolution (Time::PS);
+  int64_t tenKValue = ten.GetInteger ();
+  NS_TEST_ASSERT_MSG_EQ (tenValue * 1000, tenKValue,
+                         "change resolution to PS");
 }
 
 void 
 TimeSimpleTestCase::DoTeardown (void)
 {
-  Time::SetResolution (m_originalResolution);
 }
 
 class TimesWithSignsTestCase : public TestCase
@@ -139,7 +140,7 @@
   TimeTestSuite ()
     : TestSuite ("time", UNIT)
   {
-    AddTestCase (new TimeSimpleTestCase (Time::US), TestCase::QUICK);
+    AddTestCase (new TimeSimpleTestCase (), TestCase::QUICK);
     AddTestCase (new TimesWithSignsTestCase (), TestCase::QUICK);
   }
 } g_timeTestSuite;
diff -Naur ns-3.17/src/core/test/type-id-test-suite.cc ns-3.18/src/core/test/type-id-test-suite.cc
--- ns-3.17/src/core/test/type-id-test-suite.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/core/test/type-id-test-suite.cc	2013-10-26 07:07:30.059364393 -0700
@@ -0,0 +1,321 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2012 Lawrence Livermore National Laboratory
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Peter D. Barnes, Jr. <pdbarnes@llnl.gov>
+ */
+
+#include <iostream>
+#include <iomanip>
+#include <ctime>
+
+#include "ns3/type-id.h"
+#include "ns3/test.h"
+#include "ns3/log.h"
+
+using namespace std;
+
+namespace ns3 {
+
+
+const std::string suite("type-id: ");
+  
+//----------------------------
+//
+// Test for uniqueness of all TypeIds
+
+class UniqueTypeIdTestCase : public TestCase
+{
+public:
+  UniqueTypeIdTestCase ();
+  virtual ~UniqueTypeIdTestCase ();
+private:
+  virtual void DoRun (void);
+  enum { HashChainFlag = 0x80000000};
+};
+
+UniqueTypeIdTestCase::UniqueTypeIdTestCase ()
+  : TestCase ("Check uniqueness of all TypeIds")
+{
+}
+
+UniqueTypeIdTestCase::~UniqueTypeIdTestCase ()
+{
+}
+
+void
+UniqueTypeIdTestCase::DoRun (void)
+{
+  cout << suite << endl;
+  cout << suite << GetName () << endl;
+  
+  // Use same custom hasher as TypeId
+  ns3::Hasher hasher = ns3::Hasher ( Create<Hash::Function::Murmur3> () );
+  
+  uint32_t nids = TypeId::GetRegisteredN ();
+
+  cout << suite << "UniqueTypeIdTestCase: nids: " << nids << endl;
+  cout << suite << "TypeId list:" << endl;
+  cout << suite << "TypeId  Chain  hash          Name" << endl;
+  
+  for (uint32_t i = 0; i < nids; ++i)
+    {
+      const TypeId tid = TypeId::GetRegistered (i);
+      cout << suite << "" << std::setw(6) << tid.GetUid ();
+      if (tid.GetHash () & HashChainFlag)
+        {
+          cout << "  chain";
+        }
+      else
+        {
+          cout << "       ";
+        }
+      cout << "  0x"     << std::setfill ('0') << std::hex << std::setw (8)
+           << tid.GetHash () << std::dec << std::setfill (' ')
+           << "    "     << tid.GetName ()
+           << endl;
+
+      NS_TEST_ASSERT_MSG_EQ (tid.GetUid (),
+                             TypeId::LookupByName (tid.GetName ()).GetUid (),
+                             "LookupByName returned different TypeId for "
+                             << tid.GetName ());
+
+      // Mask off HashChainFlag in this test, since tid might have been chained
+      NS_TEST_ASSERT_MSG_EQ ((tid.GetHash () & (~HashChainFlag)),
+                             (hasher.clear ().GetHash32 (tid.GetName ()) & (~HashChainFlag)),
+                             "TypeId .hash and Hash32 (.name) unequal for "
+                             << tid.GetName ());
+
+      NS_TEST_ASSERT_MSG_EQ (tid.GetUid (),
+                             TypeId::LookupByHash (tid.GetHash ()).GetUid (),
+                             "LookupByHash returned different TypeId for "
+                             << tid.GetName ());
+      
+    }
+
+  cout << suite << "<-- end TypeId list -->" << endl;
+}
+
+
+//----------------------------
+//
+// Collision test
+
+class CollisionTestCase : public TestCase
+{
+public:
+  CollisionTestCase ();
+  virtual ~CollisionTestCase ();
+private:
+  virtual void DoRun (void);
+  enum { HashChainFlag = 0x80000000};
+};
+
+CollisionTestCase::CollisionTestCase ()
+  : TestCase ("Check behavour when type names collide")
+{
+}
+
+CollisionTestCase::~CollisionTestCase ()
+{
+}
+
+void
+CollisionTestCase::DoRun (void)
+{
+  cout << suite << endl;
+  cout << suite << GetName () << endl;
+  
+  // Register two types whose hashes collide, in alphabetical order
+  // Murmur3 collision from /usr/share/dict/web2
+  string t1Name = "daemon";
+  string t2Name = "unerring";
+  cout << suite << "creating colliding types "
+       << "'" << t1Name << "', '" << t2Name << "'"
+       << " in alphabetical order:"
+       << endl;
+  TypeId t1 (t1Name.c_str ());
+  TypeId t2 (t2Name.c_str ());
+
+  // Check that they are alphabetical: t1 name < t2 name
+  NS_TEST_ASSERT_MSG_EQ ( (t1.GetHash () & HashChainFlag), 0,
+                         "First and lesser TypeId has HashChainFlag set");
+  cout << suite << "collision: first,lesser  not chained: OK" << endl;
+
+  NS_TEST_ASSERT_MSG_NE ( (t2.GetHash () & HashChainFlag), 0,
+                         "Second and greater TypeId does not have HashChainFlag set");
+  cout << suite << "collision: second,greater    chained: OK" << endl;
+
+
+  // Register colliding types in reverse alphabetical order
+  // Murmur3 collision from /usr/share/dict/web2
+  string t3Name = "trigonon";
+  string t4Name = "seriation";
+  cout << suite << "creating colliding types "
+       << "'" << t3Name << "', '" << t4Name << "'"
+       << " in reverse alphabetical order:"
+       << endl;
+  TypeId t3 (t3Name.c_str ());
+  TypeId t4 (t4Name.c_str ());
+
+  // Check that they are alphabetical: t3 name > t4 name
+  NS_TEST_ASSERT_MSG_NE ( (t3.GetHash () & HashChainFlag), 0,
+                          "First and greater TypeId does not have HashChainFlag set");
+  cout << suite << "collision: first,greater     chained: OK" << endl;
+
+  NS_TEST_ASSERT_MSG_EQ ( (t4.GetHash () & HashChainFlag), 0,
+                          "Second and lesser TypeId has HashChainFlag set");
+  cout << suite << "collision: second,lesser not chained: OK" << endl;
+
+  /** TODO Extra credit:  register three types whose hashes collide
+   *
+   *  None found in /usr/share/dict/web2
+   */
+  
+}
+  
+  
+//----------------------------
+//
+// Performance test
+
+class LookupTimeTestCase : public TestCase
+{
+public:
+  LookupTimeTestCase ();
+  virtual ~LookupTimeTestCase ();
+private:
+  void DoRun (void);
+  void DoSetup (void);
+  void Report (const std::string how, const uint32_t delta) const ;
+
+  enum { REPETITIONS = 100000 };
+};
+
+LookupTimeTestCase::LookupTimeTestCase ()
+  : TestCase ("Measure average lookup time")
+{
+}
+
+LookupTimeTestCase::~LookupTimeTestCase ()
+{
+}
+
+void
+LookupTimeTestCase::DoRun (void)
+{
+  cout << suite << endl;
+  cout << suite << GetName () << endl;
+  
+  uint32_t nids = TypeId::GetRegisteredN ();
+
+  int start = clock ();
+  for (uint32_t j = 0; j < REPETITIONS; ++j)
+    {
+      for (uint32_t i = 0; i < nids; ++i)
+        {
+          const TypeId tid = TypeId::GetRegistered (i);
+          const TypeId sid = TypeId::LookupByName (tid.GetName ());
+        }
+  }
+  int stop = clock ();
+  Report ("name", stop - start);
+
+  start = clock ();
+  for (uint32_t j = 0; j < REPETITIONS; ++j)
+    {
+      for (uint32_t i = 0; i < nids; ++i)
+        {
+          const TypeId tid = TypeId::GetRegistered (i);
+          const TypeId sid = TypeId::LookupByHash (tid.GetHash ());
+        }
+  }
+  stop = clock ();
+  Report ("hash", stop - start);
+  
+}
+
+void
+LookupTimeTestCase::DoSetup (void)
+{
+  uint32_t nids = TypeId::GetRegisteredN ();
+  
+  cout << suite << "Lookup time: reps: " << REPETITIONS
+       << ", num TypeId's: " << nids
+       << endl;
+
+}
+
+void
+LookupTimeTestCase::Report (const std::string how,
+                            const uint32_t    delta) const
+{
+  double nids = TypeId::GetRegisteredN ();
+  double reps = nids * REPETITIONS;
+  
+  double per = 1E6 * double(delta) / (reps * double(CLOCKS_PER_SEC));
+  
+  cout << suite << "Lookup time: by " << how << ": "
+       << "ticks: " << delta
+       << "\tper: "   << per
+       << " microsec/lookup"
+       << endl;					
+}
+
+
+//----------------------------
+//
+// TypeId test suites
+
+class TypeIdTestSuite : public TestSuite
+{
+public:
+  TypeIdTestSuite ();
+};
+  
+TypeIdTestSuite::TypeIdTestSuite ()
+  : TestSuite ("type-id", UNIT)
+{
+  // Turn on logging, so we see the result of collisions
+  LogComponentEnable ("TypeId", ns3::LogLevel(LOG_ERROR|LOG_PREFIX_FUNC));
+  
+  // If the CollisionTestCase is performed before the
+  // UniqueIdTestCase, the artificial collisions added by
+  // CollisionTestCase will show up in the list of TypeIds
+  // as chained.
+  AddTestCase (new UniqueTypeIdTestCase, QUICK);
+  AddTestCase (new CollisionTestCase, QUICK);
+}
+
+static TypeIdTestSuite g_TypeIdTestSuite;  
+  
+
+class TypeIdPerformanceSuite : public TestSuite
+{
+public:
+  TypeIdPerformanceSuite ();
+};
+  
+TypeIdPerformanceSuite::TypeIdPerformanceSuite ()
+  : TestSuite ("type-id-perf", PERFORMANCE)
+{
+  AddTestCase (new LookupTimeTestCase, QUICK);
+}
+
+static TypeIdPerformanceSuite g_TypeIdPerformanceSuite;  
+  
+
+}  // namespace ns3
diff -Naur ns-3.17/src/core/wscript ns-3.18/src/core/wscript
--- ns-3.17/src/core/wscript	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/core/wscript	2013-10-26 07:07:30.019364393 -0700
@@ -147,6 +147,12 @@
         'model/vector.cc',
         'model/fatal-impl.cc',
         'model/system-path.cc',
+        'helper/random-variable-stream-helper.cc',
+        'helper/event-garbage-collector.cc',
+        'model/hash-function.cc',
+        'model/hash-murmur3.cc',
+        'model/hash-fnv.cc',
+        'model/hash.cc',
         ]
 
     core_test = bld.create_ns3_module_test_library('core')
@@ -161,6 +167,7 @@
         'test/object-test-suite.cc',
         'test/ptr-test-suite.cc',
         'test/random-variable-test-suite.cc',
+        'test/event-garbage-collector-test-suite.cc',
         'test/many-uniform-random-variables-one-get-value-call-test-suite.cc',
         'test/one-uniform-random-variable-many-get-value-calls-test-suite.cc',
         'test/sample-test-suite.cc',
@@ -170,6 +177,8 @@
         'test/traced-callback-test-suite.cc',
         'test/type-traits-test-suite.cc',
         'test/watchdog-test-suite.cc',
+        'test/hash-test-suite.cc',
+        'test/type-id-test-suite.cc',
         ]
 
     headers = bld(features='ns3header')
@@ -246,6 +255,12 @@
         'model/system-path.h',
         'model/unused.h',
         'model/math.h',
+        'helper/event-garbage-collector.h',
+        'helper/random-variable-stream-helper.h',
+        'model/hash-function.h',
+        'model/hash-murmur3.h',
+        'model/hash-fnv.h',
+        'model/hash.h',
         ]
 
     if sys.platform == 'win32':
diff -Naur ns-3.17/src/csma/bindings/modulegen__gcc_ILP32.py ns-3.18/src/csma/bindings/modulegen__gcc_ILP32.py
--- ns-3.17/src/csma/bindings/modulegen__gcc_ILP32.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/csma/bindings/modulegen__gcc_ILP32.py	2013-10-26 07:07:29.691364384 -0700
@@ -58,6 +58,8 @@
     module.add_class('DataRate', import_from_module='ns.network')
     ## event-id.h (module 'core'): ns3::EventId [class]
     module.add_class('EventId', import_from_module='ns.core')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
     ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
     module.add_class('Ipv4Address', import_from_module='ns.network')
     ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
@@ -100,6 +102,8 @@
     module.add_class('PacketTagList', import_from_module='ns.network')
     ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct]
     module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration]
+    module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network')
     ## pcap-file.h (module 'network'): ns3::PcapFile [class]
     module.add_class('PcapFile', import_from_module='ns.network')
     ## trace-helper.h (module 'network'): ns3::PcapHelper [class]
@@ -158,6 +162,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::NixVector', 'ns3::empty', 'ns3::DefaultDeleter<ns3::NixVector>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> > [class]
@@ -274,8 +280,6 @@
     module.add_enum('ErrorUnit', ['ERROR_UNIT_BIT', 'ERROR_UNIT_BYTE', 'ERROR_UNIT_PACKET'], outer_class=root_module['ns3::RateErrorModel'], import_from_module='ns.network')
     ## error-model.h (module 'network'): ns3::ReceiveListErrorModel [class]
     module.add_class('ReceiveListErrorModel', import_from_module='ns.network', parent=root_module['ns3::ErrorModel'])
-    ## nstime.h (module 'core'): ns3::TimeChecker [class]
-    module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
     module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
@@ -299,11 +303,47 @@
     nested_module = module.add_cpp_namespace('FatalImpl')
     register_types_ns3_FatalImpl(nested_module)
     
+    
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
 
 def register_types_ns3_FatalImpl(module):
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_methods(root_module):
     register_Ns3Address_methods(root_module, root_module['ns3::Address'])
     register_Ns3AsciiTraceHelper_methods(root_module, root_module['ns3::AsciiTraceHelper'])
@@ -322,6 +362,7 @@
     register_Ns3CsmaDeviceRec_methods(root_module, root_module['ns3::CsmaDeviceRec'])
     register_Ns3DataRate_methods(root_module, root_module['ns3::DataRate'])
     register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3Ipv4Address_methods(root_module, root_module['ns3::Ipv4Address'])
     register_Ns3Ipv4Mask_methods(root_module, root_module['ns3::Ipv4Mask'])
     register_Ns3Ipv6Address_methods(root_module, root_module['ns3::Ipv6Address'])
@@ -365,6 +406,7 @@
     register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
     register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
     register_Ns3SimpleRefCount__Ns3OutputStreamWrapper_Ns3Empty_Ns3DefaultDeleter__lt__ns3OutputStreamWrapper__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> >'])
     register_Ns3SimpleRefCount__Ns3Packet_Ns3Empty_Ns3DefaultDeleter__lt__ns3Packet__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
@@ -419,7 +461,6 @@
     register_Ns3ParetoRandomVariable_methods(root_module, root_module['ns3::ParetoRandomVariable'])
     register_Ns3RateErrorModel_methods(root_module, root_module['ns3::RateErrorModel'])
     register_Ns3ReceiveListErrorModel_methods(root_module, root_module['ns3::ReceiveListErrorModel'])
-    register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
     register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
@@ -427,6 +468,11 @@
     register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue'])
     register_Ns3BurstErrorModel_methods(root_module, root_module['ns3::BurstErrorModel'])
     register_Ns3CsmaNetDevice_methods(root_module, root_module['ns3::CsmaNetDevice'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     return
 
 def register_Ns3Address_methods(root_module, cls):
@@ -1155,6 +1201,35 @@
                    is_const=True)
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3Ipv4Address_methods(root_module, cls):
     cls.add_binary_comparison_operator('<')
     cls.add_binary_comparison_operator('!=')
@@ -1420,6 +1495,11 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
     cls.add_method('IsEqual', 
                    'bool', 
@@ -1459,16 +1539,36 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
     cls.add_method('MakeAutoconfiguredAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
     cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'mac')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
     cls.add_method('MakeIpv4MappedAddress', 
                    'ns3::Ipv6Address', 
@@ -2017,6 +2117,10 @@
     cls.add_method('RemoveAll', 
                    'void', 
                    [])
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function]
+    cls.add_method('Replace', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     return
 
 def register_Ns3PacketTagListTagData_methods(root_module, cls):
@@ -2412,6 +2516,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -2471,6 +2580,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -3158,6 +3277,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -3340,11 +3471,26 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
     cls.add_method('SetResolution', 
                    'void', 
                    [param('ns3::Time::Unit', 'resolution')], 
                    is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
     cls.add_method('To', 
                    'ns3::int64x64_t', 
@@ -4997,6 +5143,10 @@
     cls.add_method('RemoveTrailer', 
                    'uint32_t', 
                    [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('ReplacePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
     cls.add_method('Serialize', 
                    'uint32_t', 
@@ -5145,13 +5295,6 @@
                    visibility='private', is_virtual=True)
     return
 
-def register_Ns3TimeChecker_methods(root_module, cls):
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor]
-    cls.add_constructor([])
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')])
-    return
-
 def register_Ns3TimeValue_methods(root_module, cls):
     ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
     cls.add_constructor([])
@@ -5505,14 +5648,127 @@
                    visibility='protected')
     return
 
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_functions(root_module):
     module = root_module
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     return
 
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def main():
     out = FileCodeSink(sys.stdout)
     root_module = module_init()
diff -Naur ns-3.17/src/csma/bindings/modulegen__gcc_LP64.py ns-3.18/src/csma/bindings/modulegen__gcc_LP64.py
--- ns-3.17/src/csma/bindings/modulegen__gcc_LP64.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/csma/bindings/modulegen__gcc_LP64.py	2013-10-26 07:07:29.687364384 -0700
@@ -58,6 +58,8 @@
     module.add_class('DataRate', import_from_module='ns.network')
     ## event-id.h (module 'core'): ns3::EventId [class]
     module.add_class('EventId', import_from_module='ns.core')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
     ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
     module.add_class('Ipv4Address', import_from_module='ns.network')
     ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
@@ -100,6 +102,8 @@
     module.add_class('PacketTagList', import_from_module='ns.network')
     ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct]
     module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration]
+    module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network')
     ## pcap-file.h (module 'network'): ns3::PcapFile [class]
     module.add_class('PcapFile', import_from_module='ns.network')
     ## trace-helper.h (module 'network'): ns3::PcapHelper [class]
@@ -158,6 +162,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::NixVector', 'ns3::empty', 'ns3::DefaultDeleter<ns3::NixVector>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> > [class]
@@ -274,8 +280,6 @@
     module.add_enum('ErrorUnit', ['ERROR_UNIT_BIT', 'ERROR_UNIT_BYTE', 'ERROR_UNIT_PACKET'], outer_class=root_module['ns3::RateErrorModel'], import_from_module='ns.network')
     ## error-model.h (module 'network'): ns3::ReceiveListErrorModel [class]
     module.add_class('ReceiveListErrorModel', import_from_module='ns.network', parent=root_module['ns3::ErrorModel'])
-    ## nstime.h (module 'core'): ns3::TimeChecker [class]
-    module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
     module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
@@ -299,11 +303,47 @@
     nested_module = module.add_cpp_namespace('FatalImpl')
     register_types_ns3_FatalImpl(nested_module)
     
+    
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
 
 def register_types_ns3_FatalImpl(module):
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_methods(root_module):
     register_Ns3Address_methods(root_module, root_module['ns3::Address'])
     register_Ns3AsciiTraceHelper_methods(root_module, root_module['ns3::AsciiTraceHelper'])
@@ -322,6 +362,7 @@
     register_Ns3CsmaDeviceRec_methods(root_module, root_module['ns3::CsmaDeviceRec'])
     register_Ns3DataRate_methods(root_module, root_module['ns3::DataRate'])
     register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3Ipv4Address_methods(root_module, root_module['ns3::Ipv4Address'])
     register_Ns3Ipv4Mask_methods(root_module, root_module['ns3::Ipv4Mask'])
     register_Ns3Ipv6Address_methods(root_module, root_module['ns3::Ipv6Address'])
@@ -365,6 +406,7 @@
     register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
     register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
     register_Ns3SimpleRefCount__Ns3OutputStreamWrapper_Ns3Empty_Ns3DefaultDeleter__lt__ns3OutputStreamWrapper__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> >'])
     register_Ns3SimpleRefCount__Ns3Packet_Ns3Empty_Ns3DefaultDeleter__lt__ns3Packet__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
@@ -419,7 +461,6 @@
     register_Ns3ParetoRandomVariable_methods(root_module, root_module['ns3::ParetoRandomVariable'])
     register_Ns3RateErrorModel_methods(root_module, root_module['ns3::RateErrorModel'])
     register_Ns3ReceiveListErrorModel_methods(root_module, root_module['ns3::ReceiveListErrorModel'])
-    register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
     register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
@@ -427,6 +468,11 @@
     register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue'])
     register_Ns3BurstErrorModel_methods(root_module, root_module['ns3::BurstErrorModel'])
     register_Ns3CsmaNetDevice_methods(root_module, root_module['ns3::CsmaNetDevice'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     return
 
 def register_Ns3Address_methods(root_module, cls):
@@ -1155,6 +1201,35 @@
                    is_const=True)
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3Ipv4Address_methods(root_module, cls):
     cls.add_binary_comparison_operator('<')
     cls.add_binary_comparison_operator('!=')
@@ -1420,6 +1495,11 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
     cls.add_method('IsEqual', 
                    'bool', 
@@ -1459,16 +1539,36 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
     cls.add_method('MakeAutoconfiguredAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
     cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'mac')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
     cls.add_method('MakeIpv4MappedAddress', 
                    'ns3::Ipv6Address', 
@@ -2017,6 +2117,10 @@
     cls.add_method('RemoveAll', 
                    'void', 
                    [])
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function]
+    cls.add_method('Replace', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     return
 
 def register_Ns3PacketTagListTagData_methods(root_module, cls):
@@ -2412,6 +2516,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -2471,6 +2580,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -3158,6 +3277,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -3340,11 +3471,26 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
     cls.add_method('SetResolution', 
                    'void', 
                    [param('ns3::Time::Unit', 'resolution')], 
                    is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
     cls.add_method('To', 
                    'ns3::int64x64_t', 
@@ -4997,6 +5143,10 @@
     cls.add_method('RemoveTrailer', 
                    'uint32_t', 
                    [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('ReplacePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
     cls.add_method('Serialize', 
                    'uint32_t', 
@@ -5145,13 +5295,6 @@
                    visibility='private', is_virtual=True)
     return
 
-def register_Ns3TimeChecker_methods(root_module, cls):
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor]
-    cls.add_constructor([])
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')])
-    return
-
 def register_Ns3TimeValue_methods(root_module, cls):
     ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
     cls.add_constructor([])
@@ -5505,14 +5648,127 @@
                    visibility='protected')
     return
 
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_functions(root_module):
     module = root_module
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     return
 
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def main():
     out = FileCodeSink(sys.stdout)
     root_module = module_init()
diff -Naur ns-3.17/src/csma/model/csma-net-device.h ns-3.18/src/csma/model/csma-net-device.h
--- ns-3.17/src/csma/model/csma-net-device.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/csma/model/csma-net-device.h	2013-10-26 07:07:29.683364384 -0700
@@ -225,7 +225,7 @@
    * \brief Make and return a MAC multicast address using the provided
    *        multicast group
    *
-   * RFC 1112 says that an Ipv4 host group address is mapped to an Ethernet 
+   * \RFC{1112} says that an Ipv4 host group address is mapped to an Ethernet 
    * multicast address by placing the low-order 23-bits of the IP address into 
    * the low-order 23 bits of the Ethernet multicast address 
    * 01-00-5E-00-00-00 (hex).
diff -Naur ns-3.17/src/csma-layout/bindings/modulegen__gcc_ILP32.py ns-3.18/src/csma-layout/bindings/modulegen__gcc_ILP32.py
--- ns-3.17/src/csma-layout/bindings/modulegen__gcc_ILP32.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/csma-layout/bindings/modulegen__gcc_ILP32.py	2013-10-26 07:07:29.859364389 -0700
@@ -62,6 +62,8 @@
     module.add_class('DataRate', import_from_module='ns.network')
     ## event-id.h (module 'core'): ns3::EventId [class]
     module.add_class('EventId', import_from_module='ns.core')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress [class]
     module.add_class('Inet6SocketAddress', import_from_module='ns.network')
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress [class]
@@ -156,6 +158,8 @@
     module.add_class('PacketTagList', import_from_module='ns.network')
     ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct]
     module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration]
+    module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network')
     ## pcap-file.h (module 'network'): ns3::PcapFile [class]
     module.add_class('PcapFile', import_from_module='ns.network')
     ## trace-helper.h (module 'network'): ns3::PcapHelper [class]
@@ -207,9 +211,9 @@
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header [class]
     module.add_class('Ipv4Header', import_from_module='ns.internet', parent=root_module['ns3::Header'])
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType [enumeration]
-    module.add_enum('DscpType', ['DscpDefault', 'CS1', 'AF11', 'AF12', 'AF13', 'CS2', 'AF21', 'AF22', 'AF23', 'CS3', 'AF31', 'AF32', 'AF33', 'CS4', 'AF41', 'AF42', 'AF43', 'CS5', 'EF', 'CS6', 'CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
+    module.add_enum('DscpType', ['DscpDefault', 'DSCP_CS1', 'DSCP_AF11', 'DSCP_AF12', 'DSCP_AF13', 'DSCP_CS2', 'DSCP_AF21', 'DSCP_AF22', 'DSCP_AF23', 'DSCP_CS3', 'DSCP_AF31', 'DSCP_AF32', 'DSCP_AF33', 'DSCP_CS4', 'DSCP_AF41', 'DSCP_AF42', 'DSCP_AF43', 'DSCP_CS5', 'DSCP_EF', 'DSCP_CS6', 'DSCP_CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType [enumeration]
-    module.add_enum('EcnType', ['NotECT', 'ECT1', 'ECT0', 'CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
+    module.add_enum('EcnType', ['ECN_NotECT', 'ECN_ECT1', 'ECN_ECT0', 'ECN_CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
     ## ipv6-header.h (module 'internet'): ns3::Ipv6Header [class]
     module.add_class('Ipv6Header', import_from_module='ns.internet', parent=root_module['ns3::Header'])
     ## ipv6-header.h (module 'internet'): ns3::Ipv6Header::NextHeader_e [enumeration]
@@ -230,6 +234,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Ipv4MulticastRoute', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Ipv4MulticastRoute>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> > [class]
@@ -330,6 +336,8 @@
     module.add_class('Ipv6L3Protocol', import_from_module='ns.internet', parent=root_module['ns3::Ipv6'])
     ## ipv6-l3-protocol.h (module 'internet'): ns3::Ipv6L3Protocol::DropReason [enumeration]
     module.add_enum('DropReason', ['DROP_TTL_EXPIRED', 'DROP_NO_ROUTE', 'DROP_INTERFACE_DOWN', 'DROP_ROUTE_ERROR', 'DROP_UNKNOWN_PROTOCOL'], outer_class=root_module['ns3::Ipv6L3Protocol'], import_from_module='ns.internet')
+    ## ipv6-pmtu-cache.h (module 'internet'): ns3::Ipv6PmtuCache [class]
+    module.add_class('Ipv6PmtuCache', import_from_module='ns.internet', parent=root_module['ns3::Object'])
     ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixChecker [class]
     module.add_class('Ipv6PrefixChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
     ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixValue [class]
@@ -350,8 +358,6 @@
     module.add_class('OutputStreamWrapper', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> >'])
     ## packet.h (module 'network'): ns3::Packet [class]
     module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
-    ## nstime.h (module 'core'): ns3::TimeChecker [class]
-    module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
     module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
@@ -370,11 +376,47 @@
     nested_module = module.add_cpp_namespace('FatalImpl')
     register_types_ns3_FatalImpl(nested_module)
     
+    
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
 
 def register_types_ns3_FatalImpl(module):
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_methods(root_module):
     register_Ns3Address_methods(root_module, root_module['ns3::Address'])
     register_Ns3AsciiTraceHelper_methods(root_module, root_module['ns3::AsciiTraceHelper'])
@@ -395,6 +437,7 @@
     register_Ns3CsmaStarHelper_methods(root_module, root_module['ns3::CsmaStarHelper'])
     register_Ns3DataRate_methods(root_module, root_module['ns3::DataRate'])
     register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3Inet6SocketAddress_methods(root_module, root_module['ns3::Inet6SocketAddress'])
     register_Ns3InetSocketAddress_methods(root_module, root_module['ns3::InetSocketAddress'])
     register_Ns3IntToType__0_methods(root_module, root_module['ns3::IntToType< 0 >'])
@@ -457,6 +500,7 @@
     register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
     register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3Ipv4MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4MulticastRoute__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> >'])
     register_Ns3SimpleRefCount__Ns3Ipv4Route_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4Route__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> >'])
     register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
@@ -500,6 +544,7 @@
     register_Ns3Ipv6AddressValue_methods(root_module, root_module['ns3::Ipv6AddressValue'])
     register_Ns3Ipv6Interface_methods(root_module, root_module['ns3::Ipv6Interface'])
     register_Ns3Ipv6L3Protocol_methods(root_module, root_module['ns3::Ipv6L3Protocol'])
+    register_Ns3Ipv6PmtuCache_methods(root_module, root_module['ns3::Ipv6PmtuCache'])
     register_Ns3Ipv6PrefixChecker_methods(root_module, root_module['ns3::Ipv6PrefixChecker'])
     register_Ns3Ipv6PrefixValue_methods(root_module, root_module['ns3::Ipv6PrefixValue'])
     register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice'])
@@ -509,12 +554,16 @@
     register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue'])
     register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper'])
     register_Ns3Packet_methods(root_module, root_module['ns3::Packet'])
-    register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
     register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
     register_Ns3AddressChecker_methods(root_module, root_module['ns3::AddressChecker'])
     register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     return
 
 def register_Ns3Address_methods(root_module, cls):
@@ -1388,6 +1437,35 @@
                    is_const=True)
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3Inet6SocketAddress_methods(root_module, cls):
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress::Inet6SocketAddress(ns3::Inet6SocketAddress const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::Inet6SocketAddress const &', 'arg0')])
@@ -1926,6 +2004,11 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
     cls.add_method('IsEqual', 
                    'bool', 
@@ -1965,16 +2048,36 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
     cls.add_method('MakeAutoconfiguredAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
     cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'mac')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
     cls.add_method('MakeIpv4MappedAddress', 
                    'ns3::Ipv6Address', 
@@ -2191,6 +2294,14 @@
                    'uint32_t', 
                    [param('uint32_t', 'i')], 
                    is_const=True)
+    ## ipv6-interface-container.h (module 'internet'): ns3::Ipv6Address ns3::Ipv6InterfaceContainer::GetLinkLocalAddress(uint32_t i) [member function]
+    cls.add_method('GetLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('uint32_t', 'i')])
+    ## ipv6-interface-container.h (module 'internet'): ns3::Ipv6Address ns3::Ipv6InterfaceContainer::GetLinkLocalAddress(ns3::Ipv6Address address) [member function]
+    cls.add_method('GetLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Ipv6Address', 'address')])
     ## ipv6-interface-container.h (module 'internet'): uint32_t ns3::Ipv6InterfaceContainer::GetN() const [member function]
     cls.add_method('GetN', 
                    'uint32_t', 
@@ -2200,10 +2311,27 @@
     cls.add_method('SetDefaultRoute', 
                    'void', 
                    [param('uint32_t', 'i'), param('uint32_t', 'router')])
+    ## ipv6-interface-container.h (module 'internet'): void ns3::Ipv6InterfaceContainer::SetDefaultRoute(uint32_t i, ns3::Ipv6Address routerAddr) [member function]
+    cls.add_method('SetDefaultRoute', 
+                   'void', 
+                   [param('uint32_t', 'i'), param('ns3::Ipv6Address', 'routerAddr')])
+    ## ipv6-interface-container.h (module 'internet'): void ns3::Ipv6InterfaceContainer::SetDefaultRouteInAllNodes(uint32_t router) [member function]
+    cls.add_method('SetDefaultRouteInAllNodes', 
+                   'void', 
+                   [param('uint32_t', 'router')])
+    ## ipv6-interface-container.h (module 'internet'): void ns3::Ipv6InterfaceContainer::SetDefaultRouteInAllNodes(ns3::Ipv6Address routerAddr) [member function]
+    cls.add_method('SetDefaultRouteInAllNodes', 
+                   'void', 
+                   [param('ns3::Ipv6Address', 'routerAddr')])
+    ## ipv6-interface-container.h (module 'internet'): void ns3::Ipv6InterfaceContainer::SetForwarding(uint32_t i, bool state) [member function]
+    cls.add_method('SetForwarding', 
+                   'void', 
+                   [param('uint32_t', 'i'), param('bool', 'state')])
     ## ipv6-interface-container.h (module 'internet'): void ns3::Ipv6InterfaceContainer::SetRouter(uint32_t i, bool router) [member function]
     cls.add_method('SetRouter', 
                    'void', 
-                   [param('uint32_t', 'i'), param('bool', 'router')])
+                   [param('uint32_t', 'i'), param('bool', 'router')], 
+                   deprecated=True)
     return
 
 def register_Ns3Ipv6Prefix_methods(root_module, cls):
@@ -2652,6 +2780,10 @@
     cls.add_method('RemoveAll', 
                    'void', 
                    [])
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function]
+    cls.add_method('Replace', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     return
 
 def register_Ns3PacketTagListTagData_methods(root_module, cls):
@@ -3203,6 +3335,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -3262,6 +3399,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -3609,10 +3756,18 @@
     cls.add_method('Reset', 
                    'void', 
                    [])
+    ## internet-stack-helper.h (module 'internet'): void ns3::InternetStackHelper::SetIpv4ArpJitter(bool enable) [member function]
+    cls.add_method('SetIpv4ArpJitter', 
+                   'void', 
+                   [param('bool', 'enable')])
     ## internet-stack-helper.h (module 'internet'): void ns3::InternetStackHelper::SetIpv4StackInstall(bool enable) [member function]
     cls.add_method('SetIpv4StackInstall', 
                    'void', 
                    [param('bool', 'enable')])
+    ## internet-stack-helper.h (module 'internet'): void ns3::InternetStackHelper::SetIpv6NsRsJitter(bool enable) [member function]
+    cls.add_method('SetIpv6NsRsJitter', 
+                   'void', 
+                   [param('bool', 'enable')])
     ## internet-stack-helper.h (module 'internet'): void ns3::InternetStackHelper::SetIpv6StackInstall(bool enable) [member function]
     cls.add_method('SetIpv6StackInstall', 
                    'void', 
@@ -4129,6 +4284,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3Ipv4MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4MulticastRoute__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -4946,11 +5113,26 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
     cls.add_method('SetResolution', 
                    'void', 
                    [param('ns3::Time::Unit', 'resolution')], 
                    is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
     cls.add_method('To', 
                    'ns3::int64x64_t', 
@@ -5531,6 +5713,11 @@
                    'bool', 
                    [param('uint32_t', 'interface'), param('uint32_t', 'addressIndex')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## ipv4.h (module 'internet'): bool ns3::Ipv4::RemoveAddress(uint32_t interface, ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4Address', 'address')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## ipv4.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4::SelectSourceAddress(ns3::Ptr<const ns3::NetDevice> device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function]
     cls.add_method('SelectSourceAddress', 
                    'ns3::Ipv4Address', 
@@ -5756,6 +5943,11 @@
                    'bool', 
                    [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], 
                    is_virtual=True)
+    ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interface, ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4Address', 'address')], 
+                   is_virtual=True)
     ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr<const ns3::NetDevice> device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function]
     cls.add_method('SelectSourceAddress', 
                    'ns3::Ipv4Address', 
@@ -6121,6 +6313,11 @@
                    'bool', 
                    [param('uint32_t', 'interface'), param('uint32_t', 'addressIndex')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## ipv6.h (module 'internet'): bool ns3::Ipv6::RemoveAddress(uint32_t interface, ns3::Ipv6Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv6Address', 'address')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## ipv6.h (module 'internet'): void ns3::Ipv6::SetDown(uint32_t interface) [member function]
     cls.add_method('SetDown', 
                    'void', 
@@ -6136,6 +6333,11 @@
                    'void', 
                    [param('uint32_t', 'interface'), param('uint16_t', 'metric')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## ipv6.h (module 'internet'): void ns3::Ipv6::SetPmtu(ns3::Ipv6Address dst, uint32_t pmtu) [member function]
+    cls.add_method('SetPmtu', 
+                   'void', 
+                   [param('ns3::Ipv6Address', 'dst'), param('uint32_t', 'pmtu')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## ipv6.h (module 'internet'): void ns3::Ipv6::SetRoutingProtocol(ns3::Ptr<ns3::Ipv6RoutingProtocol> routingProtocol) [member function]
     cls.add_method('SetRoutingProtocol', 
                    'void', 
@@ -6153,11 +6355,21 @@
                    'bool', 
                    [], 
                    is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
+    ## ipv6.h (module 'internet'): bool ns3::Ipv6::GetMtuDiscover() const [member function]
+    cls.add_method('GetMtuDiscover', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
     ## ipv6.h (module 'internet'): void ns3::Ipv6::SetIpForward(bool forward) [member function]
     cls.add_method('SetIpForward', 
                    'void', 
                    [param('bool', 'forward')], 
                    is_pure_virtual=True, visibility='private', is_virtual=True)
+    ## ipv6.h (module 'internet'): void ns3::Ipv6::SetMtuDiscover(bool mtuDiscover) [member function]
+    cls.add_method('SetMtuDiscover', 
+                   'void', 
+                   [param('bool', 'mtuDiscover')], 
+                   is_pure_virtual=True, visibility='private', is_virtual=True)
     return
 
 def register_Ns3Ipv6AddressChecker_methods(root_module, cls):
@@ -6282,6 +6494,10 @@
     cls.add_method('RemoveAddress', 
                    'ns3::Ipv6InterfaceAddress', 
                    [param('uint32_t', 'index')])
+    ## ipv6-interface.h (module 'internet'): ns3::Ipv6InterfaceAddress ns3::Ipv6Interface::RemoveAddress(ns3::Ipv6Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'ns3::Ipv6InterfaceAddress', 
+                   [param('ns3::Ipv6Address', 'address')])
     ## ipv6-interface.h (module 'internet'): void ns3::Ipv6Interface::Send(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Address dest) [member function]
     cls.add_method('Send', 
                    'void', 
@@ -6452,6 +6668,11 @@
                    'bool', 
                    [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], 
                    is_virtual=True)
+    ## ipv6-l3-protocol.h (module 'internet'): bool ns3::Ipv6L3Protocol::RemoveAddress(uint32_t interface, ns3::Ipv6Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv6Address', 'address')], 
+                   is_virtual=True)
     ## ipv6-l3-protocol.h (module 'internet'): void ns3::Ipv6L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function]
     cls.add_method('SetMetric', 
                    'void', 
@@ -6467,6 +6688,11 @@
                    'uint16_t', 
                    [param('uint32_t', 'i')], 
                    is_const=True, is_virtual=True)
+    ## ipv6-l3-protocol.h (module 'internet'): void ns3::Ipv6L3Protocol::SetPmtu(ns3::Ipv6Address dst, uint32_t pmtu) [member function]
+    cls.add_method('SetPmtu', 
+                   'void', 
+                   [param('ns3::Ipv6Address', 'dst'), param('uint32_t', 'pmtu')], 
+                   is_virtual=True)
     ## ipv6-l3-protocol.h (module 'internet'): bool ns3::Ipv6L3Protocol::IsUp(uint32_t i) const [member function]
     cls.add_method('IsUp', 
                    'bool', 
@@ -6540,6 +6766,16 @@
                    'bool', 
                    [], 
                    is_const=True, visibility='private', is_virtual=True)
+    ## ipv6-l3-protocol.h (module 'internet'): void ns3::Ipv6L3Protocol::SetMtuDiscover(bool mtuDiscover) [member function]
+    cls.add_method('SetMtuDiscover', 
+                   'void', 
+                   [param('bool', 'mtuDiscover')], 
+                   visibility='private', is_virtual=True)
+    ## ipv6-l3-protocol.h (module 'internet'): bool ns3::Ipv6L3Protocol::GetMtuDiscover() const [member function]
+    cls.add_method('GetMtuDiscover', 
+                   'bool', 
+                   [], 
+                   is_const=True, visibility='private', is_virtual=True)
     ## ipv6-l3-protocol.h (module 'internet'): void ns3::Ipv6L3Protocol::SetSendIcmpv6Redirect(bool sendIcmpv6Redirect) [member function]
     cls.add_method('SetSendIcmpv6Redirect', 
                    'void', 
@@ -6552,6 +6788,40 @@
                    is_const=True, visibility='private', is_virtual=True)
     return
 
+def register_Ns3Ipv6PmtuCache_methods(root_module, cls):
+    ## ipv6-pmtu-cache.h (module 'internet'): ns3::Ipv6PmtuCache::Ipv6PmtuCache(ns3::Ipv6PmtuCache const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv6PmtuCache const &', 'arg0')])
+    ## ipv6-pmtu-cache.h (module 'internet'): ns3::Ipv6PmtuCache::Ipv6PmtuCache() [constructor]
+    cls.add_constructor([])
+    ## ipv6-pmtu-cache.h (module 'internet'): void ns3::Ipv6PmtuCache::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    ## ipv6-pmtu-cache.h (module 'internet'): uint32_t ns3::Ipv6PmtuCache::GetPmtu(ns3::Ipv6Address dst) [member function]
+    cls.add_method('GetPmtu', 
+                   'uint32_t', 
+                   [param('ns3::Ipv6Address', 'dst')])
+    ## ipv6-pmtu-cache.h (module 'internet'): ns3::Time ns3::Ipv6PmtuCache::GetPmtuValidityTime() const [member function]
+    cls.add_method('GetPmtuValidityTime', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## ipv6-pmtu-cache.h (module 'internet'): static ns3::TypeId ns3::Ipv6PmtuCache::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## ipv6-pmtu-cache.h (module 'internet'): void ns3::Ipv6PmtuCache::SetPmtu(ns3::Ipv6Address dst, uint32_t pmtu) [member function]
+    cls.add_method('SetPmtu', 
+                   'void', 
+                   [param('ns3::Ipv6Address', 'dst'), param('uint32_t', 'pmtu')])
+    ## ipv6-pmtu-cache.h (module 'internet'): bool ns3::Ipv6PmtuCache::SetPmtuValidityTime(ns3::Time validity) [member function]
+    cls.add_method('SetPmtuValidityTime', 
+                   'bool', 
+                   [param('ns3::Time', 'validity')])
+    return
+
 def register_Ns3Ipv6PrefixChecker_methods(root_module, cls):
     ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixChecker::Ipv6PrefixChecker() [constructor]
     cls.add_constructor([])
@@ -7074,6 +7344,10 @@
     cls.add_method('RemoveTrailer', 
                    'uint32_t', 
                    [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('ReplacePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
     cls.add_method('Serialize', 
                    'uint32_t', 
@@ -7085,13 +7359,6 @@
                    [param('ns3::Ptr< ns3::NixVector >', 'arg0')])
     return
 
-def register_Ns3TimeChecker_methods(root_module, cls):
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor]
-    cls.add_constructor([])
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')])
-    return
-
 def register_Ns3TimeValue_methods(root_module, cls):
     ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
     cls.add_constructor([])
@@ -7205,14 +7472,127 @@
                    [param('ns3::Address const &', 'value')])
     return
 
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_functions(root_module):
     module = root_module
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     return
 
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def main():
     out = FileCodeSink(sys.stdout)
     root_module = module_init()
diff -Naur ns-3.17/src/csma-layout/bindings/modulegen__gcc_LP64.py ns-3.18/src/csma-layout/bindings/modulegen__gcc_LP64.py
--- ns-3.17/src/csma-layout/bindings/modulegen__gcc_LP64.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/csma-layout/bindings/modulegen__gcc_LP64.py	2013-10-26 07:07:29.855364388 -0700
@@ -62,6 +62,8 @@
     module.add_class('DataRate', import_from_module='ns.network')
     ## event-id.h (module 'core'): ns3::EventId [class]
     module.add_class('EventId', import_from_module='ns.core')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress [class]
     module.add_class('Inet6SocketAddress', import_from_module='ns.network')
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress [class]
@@ -156,6 +158,8 @@
     module.add_class('PacketTagList', import_from_module='ns.network')
     ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct]
     module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration]
+    module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network')
     ## pcap-file.h (module 'network'): ns3::PcapFile [class]
     module.add_class('PcapFile', import_from_module='ns.network')
     ## trace-helper.h (module 'network'): ns3::PcapHelper [class]
@@ -207,9 +211,9 @@
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header [class]
     module.add_class('Ipv4Header', import_from_module='ns.internet', parent=root_module['ns3::Header'])
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType [enumeration]
-    module.add_enum('DscpType', ['DscpDefault', 'CS1', 'AF11', 'AF12', 'AF13', 'CS2', 'AF21', 'AF22', 'AF23', 'CS3', 'AF31', 'AF32', 'AF33', 'CS4', 'AF41', 'AF42', 'AF43', 'CS5', 'EF', 'CS6', 'CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
+    module.add_enum('DscpType', ['DscpDefault', 'DSCP_CS1', 'DSCP_AF11', 'DSCP_AF12', 'DSCP_AF13', 'DSCP_CS2', 'DSCP_AF21', 'DSCP_AF22', 'DSCP_AF23', 'DSCP_CS3', 'DSCP_AF31', 'DSCP_AF32', 'DSCP_AF33', 'DSCP_CS4', 'DSCP_AF41', 'DSCP_AF42', 'DSCP_AF43', 'DSCP_CS5', 'DSCP_EF', 'DSCP_CS6', 'DSCP_CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType [enumeration]
-    module.add_enum('EcnType', ['NotECT', 'ECT1', 'ECT0', 'CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
+    module.add_enum('EcnType', ['ECN_NotECT', 'ECN_ECT1', 'ECN_ECT0', 'ECN_CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
     ## ipv6-header.h (module 'internet'): ns3::Ipv6Header [class]
     module.add_class('Ipv6Header', import_from_module='ns.internet', parent=root_module['ns3::Header'])
     ## ipv6-header.h (module 'internet'): ns3::Ipv6Header::NextHeader_e [enumeration]
@@ -230,6 +234,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Ipv4MulticastRoute', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Ipv4MulticastRoute>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> > [class]
@@ -330,6 +336,8 @@
     module.add_class('Ipv6L3Protocol', import_from_module='ns.internet', parent=root_module['ns3::Ipv6'])
     ## ipv6-l3-protocol.h (module 'internet'): ns3::Ipv6L3Protocol::DropReason [enumeration]
     module.add_enum('DropReason', ['DROP_TTL_EXPIRED', 'DROP_NO_ROUTE', 'DROP_INTERFACE_DOWN', 'DROP_ROUTE_ERROR', 'DROP_UNKNOWN_PROTOCOL'], outer_class=root_module['ns3::Ipv6L3Protocol'], import_from_module='ns.internet')
+    ## ipv6-pmtu-cache.h (module 'internet'): ns3::Ipv6PmtuCache [class]
+    module.add_class('Ipv6PmtuCache', import_from_module='ns.internet', parent=root_module['ns3::Object'])
     ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixChecker [class]
     module.add_class('Ipv6PrefixChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
     ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixValue [class]
@@ -350,8 +358,6 @@
     module.add_class('OutputStreamWrapper', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> >'])
     ## packet.h (module 'network'): ns3::Packet [class]
     module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
-    ## nstime.h (module 'core'): ns3::TimeChecker [class]
-    module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
     module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
@@ -370,11 +376,47 @@
     nested_module = module.add_cpp_namespace('FatalImpl')
     register_types_ns3_FatalImpl(nested_module)
     
+    
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
 
 def register_types_ns3_FatalImpl(module):
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_methods(root_module):
     register_Ns3Address_methods(root_module, root_module['ns3::Address'])
     register_Ns3AsciiTraceHelper_methods(root_module, root_module['ns3::AsciiTraceHelper'])
@@ -395,6 +437,7 @@
     register_Ns3CsmaStarHelper_methods(root_module, root_module['ns3::CsmaStarHelper'])
     register_Ns3DataRate_methods(root_module, root_module['ns3::DataRate'])
     register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3Inet6SocketAddress_methods(root_module, root_module['ns3::Inet6SocketAddress'])
     register_Ns3InetSocketAddress_methods(root_module, root_module['ns3::InetSocketAddress'])
     register_Ns3IntToType__0_methods(root_module, root_module['ns3::IntToType< 0 >'])
@@ -457,6 +500,7 @@
     register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
     register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3Ipv4MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4MulticastRoute__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> >'])
     register_Ns3SimpleRefCount__Ns3Ipv4Route_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4Route__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> >'])
     register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
@@ -500,6 +544,7 @@
     register_Ns3Ipv6AddressValue_methods(root_module, root_module['ns3::Ipv6AddressValue'])
     register_Ns3Ipv6Interface_methods(root_module, root_module['ns3::Ipv6Interface'])
     register_Ns3Ipv6L3Protocol_methods(root_module, root_module['ns3::Ipv6L3Protocol'])
+    register_Ns3Ipv6PmtuCache_methods(root_module, root_module['ns3::Ipv6PmtuCache'])
     register_Ns3Ipv6PrefixChecker_methods(root_module, root_module['ns3::Ipv6PrefixChecker'])
     register_Ns3Ipv6PrefixValue_methods(root_module, root_module['ns3::Ipv6PrefixValue'])
     register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice'])
@@ -509,12 +554,16 @@
     register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue'])
     register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper'])
     register_Ns3Packet_methods(root_module, root_module['ns3::Packet'])
-    register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
     register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
     register_Ns3AddressChecker_methods(root_module, root_module['ns3::AddressChecker'])
     register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     return
 
 def register_Ns3Address_methods(root_module, cls):
@@ -1388,6 +1437,35 @@
                    is_const=True)
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3Inet6SocketAddress_methods(root_module, cls):
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress::Inet6SocketAddress(ns3::Inet6SocketAddress const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::Inet6SocketAddress const &', 'arg0')])
@@ -1926,6 +2004,11 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
     cls.add_method('IsEqual', 
                    'bool', 
@@ -1965,16 +2048,36 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
     cls.add_method('MakeAutoconfiguredAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
     cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'mac')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
     cls.add_method('MakeIpv4MappedAddress', 
                    'ns3::Ipv6Address', 
@@ -2191,6 +2294,14 @@
                    'uint32_t', 
                    [param('uint32_t', 'i')], 
                    is_const=True)
+    ## ipv6-interface-container.h (module 'internet'): ns3::Ipv6Address ns3::Ipv6InterfaceContainer::GetLinkLocalAddress(uint32_t i) [member function]
+    cls.add_method('GetLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('uint32_t', 'i')])
+    ## ipv6-interface-container.h (module 'internet'): ns3::Ipv6Address ns3::Ipv6InterfaceContainer::GetLinkLocalAddress(ns3::Ipv6Address address) [member function]
+    cls.add_method('GetLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Ipv6Address', 'address')])
     ## ipv6-interface-container.h (module 'internet'): uint32_t ns3::Ipv6InterfaceContainer::GetN() const [member function]
     cls.add_method('GetN', 
                    'uint32_t', 
@@ -2200,10 +2311,27 @@
     cls.add_method('SetDefaultRoute', 
                    'void', 
                    [param('uint32_t', 'i'), param('uint32_t', 'router')])
+    ## ipv6-interface-container.h (module 'internet'): void ns3::Ipv6InterfaceContainer::SetDefaultRoute(uint32_t i, ns3::Ipv6Address routerAddr) [member function]
+    cls.add_method('SetDefaultRoute', 
+                   'void', 
+                   [param('uint32_t', 'i'), param('ns3::Ipv6Address', 'routerAddr')])
+    ## ipv6-interface-container.h (module 'internet'): void ns3::Ipv6InterfaceContainer::SetDefaultRouteInAllNodes(uint32_t router) [member function]
+    cls.add_method('SetDefaultRouteInAllNodes', 
+                   'void', 
+                   [param('uint32_t', 'router')])
+    ## ipv6-interface-container.h (module 'internet'): void ns3::Ipv6InterfaceContainer::SetDefaultRouteInAllNodes(ns3::Ipv6Address routerAddr) [member function]
+    cls.add_method('SetDefaultRouteInAllNodes', 
+                   'void', 
+                   [param('ns3::Ipv6Address', 'routerAddr')])
+    ## ipv6-interface-container.h (module 'internet'): void ns3::Ipv6InterfaceContainer::SetForwarding(uint32_t i, bool state) [member function]
+    cls.add_method('SetForwarding', 
+                   'void', 
+                   [param('uint32_t', 'i'), param('bool', 'state')])
     ## ipv6-interface-container.h (module 'internet'): void ns3::Ipv6InterfaceContainer::SetRouter(uint32_t i, bool router) [member function]
     cls.add_method('SetRouter', 
                    'void', 
-                   [param('uint32_t', 'i'), param('bool', 'router')])
+                   [param('uint32_t', 'i'), param('bool', 'router')], 
+                   deprecated=True)
     return
 
 def register_Ns3Ipv6Prefix_methods(root_module, cls):
@@ -2652,6 +2780,10 @@
     cls.add_method('RemoveAll', 
                    'void', 
                    [])
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function]
+    cls.add_method('Replace', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     return
 
 def register_Ns3PacketTagListTagData_methods(root_module, cls):
@@ -3203,6 +3335,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -3262,6 +3399,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -3609,10 +3756,18 @@
     cls.add_method('Reset', 
                    'void', 
                    [])
+    ## internet-stack-helper.h (module 'internet'): void ns3::InternetStackHelper::SetIpv4ArpJitter(bool enable) [member function]
+    cls.add_method('SetIpv4ArpJitter', 
+                   'void', 
+                   [param('bool', 'enable')])
     ## internet-stack-helper.h (module 'internet'): void ns3::InternetStackHelper::SetIpv4StackInstall(bool enable) [member function]
     cls.add_method('SetIpv4StackInstall', 
                    'void', 
                    [param('bool', 'enable')])
+    ## internet-stack-helper.h (module 'internet'): void ns3::InternetStackHelper::SetIpv6NsRsJitter(bool enable) [member function]
+    cls.add_method('SetIpv6NsRsJitter', 
+                   'void', 
+                   [param('bool', 'enable')])
     ## internet-stack-helper.h (module 'internet'): void ns3::InternetStackHelper::SetIpv6StackInstall(bool enable) [member function]
     cls.add_method('SetIpv6StackInstall', 
                    'void', 
@@ -4129,6 +4284,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3Ipv4MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4MulticastRoute__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -4946,11 +5113,26 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
     cls.add_method('SetResolution', 
                    'void', 
                    [param('ns3::Time::Unit', 'resolution')], 
                    is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
     cls.add_method('To', 
                    'ns3::int64x64_t', 
@@ -5531,6 +5713,11 @@
                    'bool', 
                    [param('uint32_t', 'interface'), param('uint32_t', 'addressIndex')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## ipv4.h (module 'internet'): bool ns3::Ipv4::RemoveAddress(uint32_t interface, ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4Address', 'address')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## ipv4.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4::SelectSourceAddress(ns3::Ptr<const ns3::NetDevice> device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function]
     cls.add_method('SelectSourceAddress', 
                    'ns3::Ipv4Address', 
@@ -5756,6 +5943,11 @@
                    'bool', 
                    [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], 
                    is_virtual=True)
+    ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interface, ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4Address', 'address')], 
+                   is_virtual=True)
     ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr<const ns3::NetDevice> device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function]
     cls.add_method('SelectSourceAddress', 
                    'ns3::Ipv4Address', 
@@ -6121,6 +6313,11 @@
                    'bool', 
                    [param('uint32_t', 'interface'), param('uint32_t', 'addressIndex')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## ipv6.h (module 'internet'): bool ns3::Ipv6::RemoveAddress(uint32_t interface, ns3::Ipv6Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv6Address', 'address')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## ipv6.h (module 'internet'): void ns3::Ipv6::SetDown(uint32_t interface) [member function]
     cls.add_method('SetDown', 
                    'void', 
@@ -6136,6 +6333,11 @@
                    'void', 
                    [param('uint32_t', 'interface'), param('uint16_t', 'metric')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## ipv6.h (module 'internet'): void ns3::Ipv6::SetPmtu(ns3::Ipv6Address dst, uint32_t pmtu) [member function]
+    cls.add_method('SetPmtu', 
+                   'void', 
+                   [param('ns3::Ipv6Address', 'dst'), param('uint32_t', 'pmtu')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## ipv6.h (module 'internet'): void ns3::Ipv6::SetRoutingProtocol(ns3::Ptr<ns3::Ipv6RoutingProtocol> routingProtocol) [member function]
     cls.add_method('SetRoutingProtocol', 
                    'void', 
@@ -6153,11 +6355,21 @@
                    'bool', 
                    [], 
                    is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
+    ## ipv6.h (module 'internet'): bool ns3::Ipv6::GetMtuDiscover() const [member function]
+    cls.add_method('GetMtuDiscover', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
     ## ipv6.h (module 'internet'): void ns3::Ipv6::SetIpForward(bool forward) [member function]
     cls.add_method('SetIpForward', 
                    'void', 
                    [param('bool', 'forward')], 
                    is_pure_virtual=True, visibility='private', is_virtual=True)
+    ## ipv6.h (module 'internet'): void ns3::Ipv6::SetMtuDiscover(bool mtuDiscover) [member function]
+    cls.add_method('SetMtuDiscover', 
+                   'void', 
+                   [param('bool', 'mtuDiscover')], 
+                   is_pure_virtual=True, visibility='private', is_virtual=True)
     return
 
 def register_Ns3Ipv6AddressChecker_methods(root_module, cls):
@@ -6282,6 +6494,10 @@
     cls.add_method('RemoveAddress', 
                    'ns3::Ipv6InterfaceAddress', 
                    [param('uint32_t', 'index')])
+    ## ipv6-interface.h (module 'internet'): ns3::Ipv6InterfaceAddress ns3::Ipv6Interface::RemoveAddress(ns3::Ipv6Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'ns3::Ipv6InterfaceAddress', 
+                   [param('ns3::Ipv6Address', 'address')])
     ## ipv6-interface.h (module 'internet'): void ns3::Ipv6Interface::Send(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Address dest) [member function]
     cls.add_method('Send', 
                    'void', 
@@ -6452,6 +6668,11 @@
                    'bool', 
                    [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], 
                    is_virtual=True)
+    ## ipv6-l3-protocol.h (module 'internet'): bool ns3::Ipv6L3Protocol::RemoveAddress(uint32_t interface, ns3::Ipv6Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv6Address', 'address')], 
+                   is_virtual=True)
     ## ipv6-l3-protocol.h (module 'internet'): void ns3::Ipv6L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function]
     cls.add_method('SetMetric', 
                    'void', 
@@ -6467,6 +6688,11 @@
                    'uint16_t', 
                    [param('uint32_t', 'i')], 
                    is_const=True, is_virtual=True)
+    ## ipv6-l3-protocol.h (module 'internet'): void ns3::Ipv6L3Protocol::SetPmtu(ns3::Ipv6Address dst, uint32_t pmtu) [member function]
+    cls.add_method('SetPmtu', 
+                   'void', 
+                   [param('ns3::Ipv6Address', 'dst'), param('uint32_t', 'pmtu')], 
+                   is_virtual=True)
     ## ipv6-l3-protocol.h (module 'internet'): bool ns3::Ipv6L3Protocol::IsUp(uint32_t i) const [member function]
     cls.add_method('IsUp', 
                    'bool', 
@@ -6540,6 +6766,16 @@
                    'bool', 
                    [], 
                    is_const=True, visibility='private', is_virtual=True)
+    ## ipv6-l3-protocol.h (module 'internet'): void ns3::Ipv6L3Protocol::SetMtuDiscover(bool mtuDiscover) [member function]
+    cls.add_method('SetMtuDiscover', 
+                   'void', 
+                   [param('bool', 'mtuDiscover')], 
+                   visibility='private', is_virtual=True)
+    ## ipv6-l3-protocol.h (module 'internet'): bool ns3::Ipv6L3Protocol::GetMtuDiscover() const [member function]
+    cls.add_method('GetMtuDiscover', 
+                   'bool', 
+                   [], 
+                   is_const=True, visibility='private', is_virtual=True)
     ## ipv6-l3-protocol.h (module 'internet'): void ns3::Ipv6L3Protocol::SetSendIcmpv6Redirect(bool sendIcmpv6Redirect) [member function]
     cls.add_method('SetSendIcmpv6Redirect', 
                    'void', 
@@ -6552,6 +6788,40 @@
                    is_const=True, visibility='private', is_virtual=True)
     return
 
+def register_Ns3Ipv6PmtuCache_methods(root_module, cls):
+    ## ipv6-pmtu-cache.h (module 'internet'): ns3::Ipv6PmtuCache::Ipv6PmtuCache(ns3::Ipv6PmtuCache const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv6PmtuCache const &', 'arg0')])
+    ## ipv6-pmtu-cache.h (module 'internet'): ns3::Ipv6PmtuCache::Ipv6PmtuCache() [constructor]
+    cls.add_constructor([])
+    ## ipv6-pmtu-cache.h (module 'internet'): void ns3::Ipv6PmtuCache::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    ## ipv6-pmtu-cache.h (module 'internet'): uint32_t ns3::Ipv6PmtuCache::GetPmtu(ns3::Ipv6Address dst) [member function]
+    cls.add_method('GetPmtu', 
+                   'uint32_t', 
+                   [param('ns3::Ipv6Address', 'dst')])
+    ## ipv6-pmtu-cache.h (module 'internet'): ns3::Time ns3::Ipv6PmtuCache::GetPmtuValidityTime() const [member function]
+    cls.add_method('GetPmtuValidityTime', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## ipv6-pmtu-cache.h (module 'internet'): static ns3::TypeId ns3::Ipv6PmtuCache::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## ipv6-pmtu-cache.h (module 'internet'): void ns3::Ipv6PmtuCache::SetPmtu(ns3::Ipv6Address dst, uint32_t pmtu) [member function]
+    cls.add_method('SetPmtu', 
+                   'void', 
+                   [param('ns3::Ipv6Address', 'dst'), param('uint32_t', 'pmtu')])
+    ## ipv6-pmtu-cache.h (module 'internet'): bool ns3::Ipv6PmtuCache::SetPmtuValidityTime(ns3::Time validity) [member function]
+    cls.add_method('SetPmtuValidityTime', 
+                   'bool', 
+                   [param('ns3::Time', 'validity')])
+    return
+
 def register_Ns3Ipv6PrefixChecker_methods(root_module, cls):
     ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixChecker::Ipv6PrefixChecker() [constructor]
     cls.add_constructor([])
@@ -7074,6 +7344,10 @@
     cls.add_method('RemoveTrailer', 
                    'uint32_t', 
                    [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('ReplacePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
     cls.add_method('Serialize', 
                    'uint32_t', 
@@ -7085,13 +7359,6 @@
                    [param('ns3::Ptr< ns3::NixVector >', 'arg0')])
     return
 
-def register_Ns3TimeChecker_methods(root_module, cls):
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor]
-    cls.add_constructor([])
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')])
-    return
-
 def register_Ns3TimeValue_methods(root_module, cls):
     ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
     cls.add_constructor([])
@@ -7205,14 +7472,127 @@
                    [param('ns3::Address const &', 'value')])
     return
 
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_functions(root_module):
     module = root_module
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     return
 
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def main():
     out = FileCodeSink(sys.stdout)
     root_module = module_init()
diff -Naur ns-3.17/src/dsdv/bindings/modulegen__gcc_ILP32.py ns-3.18/src/dsdv/bindings/modulegen__gcc_ILP32.py
--- ns-3.17/src/dsdv/bindings/modulegen__gcc_ILP32.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/dsdv/bindings/modulegen__gcc_ILP32.py	2013-10-26 07:07:30.611364407 -0700
@@ -46,6 +46,8 @@
     module.add_class('CallbackBase', import_from_module='ns.core')
     ## event-id.h (module 'core'): ns3::EventId [class]
     module.add_class('EventId', import_from_module='ns.core')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress [class]
     module.add_class('Inet6SocketAddress', import_from_module='ns.network')
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress [class]
@@ -130,6 +132,8 @@
     module.add_class('PacketTagList', import_from_module='ns.network')
     ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct]
     module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration]
+    module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network')
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter> [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simulator.h (module 'core'): ns3::Simulator [class]
@@ -167,9 +171,9 @@
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header [class]
     module.add_class('Ipv4Header', import_from_module='ns.internet', parent=root_module['ns3::Header'])
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType [enumeration]
-    module.add_enum('DscpType', ['DscpDefault', 'CS1', 'AF11', 'AF12', 'AF13', 'CS2', 'AF21', 'AF22', 'AF23', 'CS3', 'AF31', 'AF32', 'AF33', 'CS4', 'AF41', 'AF42', 'AF43', 'CS5', 'EF', 'CS6', 'CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
+    module.add_enum('DscpType', ['DscpDefault', 'DSCP_CS1', 'DSCP_AF11', 'DSCP_AF12', 'DSCP_AF13', 'DSCP_CS2', 'DSCP_AF21', 'DSCP_AF22', 'DSCP_AF23', 'DSCP_CS3', 'DSCP_AF31', 'DSCP_AF32', 'DSCP_AF33', 'DSCP_CS4', 'DSCP_AF41', 'DSCP_AF42', 'DSCP_AF43', 'DSCP_CS5', 'DSCP_EF', 'DSCP_CS6', 'DSCP_CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType [enumeration]
-    module.add_enum('EcnType', ['NotECT', 'ECT1', 'ECT0', 'CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
+    module.add_enum('EcnType', ['ECN_NotECT', 'ECN_ECT1', 'ECN_ECT0', 'ECN_CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
     ## ipv6-header.h (module 'internet'): ns3::Ipv6Header [class]
     module.add_class('Ipv6Header', import_from_module='ns.internet', parent=root_module['ns3::Header'])
     ## ipv6-header.h (module 'internet'): ns3::Ipv6Header::NextHeader_e [enumeration]
@@ -192,6 +196,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Ipv4MulticastRoute', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Ipv4MulticastRoute>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> > [class]
@@ -328,8 +334,6 @@
     module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
     ## random-variable-stream.h (module 'core'): ns3::ParetoRandomVariable [class]
     module.add_class('ParetoRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
-    ## nstime.h (module 'core'): ns3::TimeChecker [class]
-    module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
     module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
@@ -340,6 +344,8 @@
     module.add_class('AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
     ## address.h (module 'network'): ns3::AddressValue [class]
     module.add_class('AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
+    ## ipv4-list-routing.h (module 'internet'): ns3::Ipv4ListRouting [class]
+    module.add_class('Ipv4ListRouting', import_from_module='ns.internet', parent=root_module['ns3::Ipv4RoutingProtocol'])
     module.add_container('std::map< unsigned int, unsigned int >', ('unsigned int', 'unsigned int'), container_type='map')
     
     ## Register a nested module for the namespace FatalImpl
@@ -348,6 +354,12 @@
     register_types_ns3_FatalImpl(nested_module)
     
     
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
+    
     ## Register a nested module for the namespace dsdv
     
     nested_module = module.add_cpp_namespace('dsdv')
@@ -358,6 +370,36 @@
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_types_ns3_dsdv(module):
     root_module = module.get_root()
     
@@ -390,6 +432,7 @@
     register_Ns3ByteTagListIteratorItem_methods(root_module, root_module['ns3::ByteTagList::Iterator::Item'])
     register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase'])
     register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3Inet6SocketAddress_methods(root_module, root_module['ns3::Inet6SocketAddress'])
     register_Ns3InetSocketAddress_methods(root_module, root_module['ns3::InetSocketAddress'])
     register_Ns3IntToType__0_methods(root_module, root_module['ns3::IntToType< 0 >'])
@@ -442,6 +485,7 @@
     register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
     register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3Ipv4MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4MulticastRoute__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> >'])
     register_Ns3SimpleRefCount__Ns3Ipv4Route_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4Route__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> >'])
     register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
@@ -503,12 +547,17 @@
     register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper'])
     register_Ns3Packet_methods(root_module, root_module['ns3::Packet'])
     register_Ns3ParetoRandomVariable_methods(root_module, root_module['ns3::ParetoRandomVariable'])
-    register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
     register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
     register_Ns3AddressChecker_methods(root_module, root_module['ns3::AddressChecker'])
     register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue'])
+    register_Ns3Ipv4ListRouting_methods(root_module, root_module['ns3::Ipv4ListRouting'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     register_Ns3DsdvDsdvHeader_methods(root_module, root_module['ns3::dsdv::DsdvHeader'])
     register_Ns3DsdvPacketQueue_methods(root_module, root_module['ns3::dsdv::PacketQueue'])
     register_Ns3DsdvQueueEntry_methods(root_module, root_module['ns3::dsdv::QueueEntry'])
@@ -1040,6 +1089,35 @@
                    is_const=True)
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3Inet6SocketAddress_methods(root_module, cls):
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress::Inet6SocketAddress(ns3::Inet6SocketAddress const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::Inet6SocketAddress const &', 'arg0')])
@@ -1538,6 +1616,11 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
     cls.add_method('IsEqual', 
                    'bool', 
@@ -1577,16 +1660,36 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
     cls.add_method('MakeAutoconfiguredAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
     cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'mac')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
     cls.add_method('MakeIpv4MappedAddress', 
                    'ns3::Ipv6Address', 
@@ -2073,6 +2176,10 @@
     cls.add_method('RemoveAll', 
                    'void', 
                    [])
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function]
+    cls.add_method('Replace', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     return
 
 def register_Ns3PacketTagListTagData_methods(root_module, cls):
@@ -2409,6 +2516,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -2468,6 +2580,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -3206,6 +3328,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3Ipv4MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4MulticastRoute__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -4023,11 +4157,26 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
     cls.add_method('SetResolution', 
                    'void', 
                    [param('ns3::Time::Unit', 'resolution')], 
                    is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
     cls.add_method('To', 
                    'ns3::int64x64_t', 
@@ -4856,6 +5005,11 @@
                    'bool', 
                    [param('uint32_t', 'interface'), param('uint32_t', 'addressIndex')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## ipv4.h (module 'internet'): bool ns3::Ipv4::RemoveAddress(uint32_t interface, ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4Address', 'address')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## ipv4.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4::SelectSourceAddress(ns3::Ptr<const ns3::NetDevice> device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function]
     cls.add_method('SelectSourceAddress', 
                    'ns3::Ipv4Address', 
@@ -5018,6 +5172,10 @@
     cls.add_method('RemoveAddress', 
                    'ns3::Ipv4InterfaceAddress', 
                    [param('uint32_t', 'index')])
+    ## ipv4-interface.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4Interface::RemoveAddress(ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'ns3::Ipv4InterfaceAddress', 
+                   [param('ns3::Ipv4Address', 'address')])
     ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::Send(ns3::Ptr<ns3::Packet> p, ns3::Ipv4Address dest) [member function]
     cls.add_method('Send', 
                    'void', 
@@ -5178,6 +5336,11 @@
                    'bool', 
                    [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], 
                    is_virtual=True)
+    ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interface, ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4Address', 'address')], 
+                   is_virtual=True)
     ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr<const ns3::NetDevice> device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function]
     cls.add_method('SelectSourceAddress', 
                    'ns3::Ipv4Address', 
@@ -5570,6 +5733,10 @@
     cls.add_method('RemoveAddress', 
                    'ns3::Ipv6InterfaceAddress', 
                    [param('uint32_t', 'index')])
+    ## ipv6-interface.h (module 'internet'): ns3::Ipv6InterfaceAddress ns3::Ipv6Interface::RemoveAddress(ns3::Ipv6Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'ns3::Ipv6InterfaceAddress', 
+                   [param('ns3::Ipv6Address', 'address')])
     ## ipv6-interface.h (module 'internet'): void ns3::Ipv6Interface::Send(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Address dest) [member function]
     cls.add_method('Send', 
                    'void', 
@@ -6234,6 +6401,10 @@
     cls.add_method('RemoveTrailer', 
                    'uint32_t', 
                    [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('ReplacePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
     cls.add_method('Serialize', 
                    'uint32_t', 
@@ -6288,13 +6459,6 @@
                    is_virtual=True)
     return
 
-def register_Ns3TimeChecker_methods(root_module, cls):
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor]
-    cls.add_constructor([])
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')])
-    return
-
 def register_Ns3TimeValue_methods(root_module, cls):
     ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
     cls.add_constructor([])
@@ -6408,6 +6572,188 @@
                    [param('ns3::Address const &', 'value')])
     return
 
+def register_Ns3Ipv4ListRouting_methods(root_module, cls):
+    ## ipv4-list-routing.h (module 'internet'): ns3::Ipv4ListRouting::Ipv4ListRouting(ns3::Ipv4ListRouting const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv4ListRouting const &', 'arg0')])
+    ## ipv4-list-routing.h (module 'internet'): ns3::Ipv4ListRouting::Ipv4ListRouting() [constructor]
+    cls.add_constructor([])
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::AddRoutingProtocol(ns3::Ptr<ns3::Ipv4RoutingProtocol> routingProtocol, int16_t priority) [member function]
+    cls.add_method('AddRoutingProtocol', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol'), param('int16_t', 'priority')], 
+                   is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): uint32_t ns3::Ipv4ListRouting::GetNRoutingProtocols() const [member function]
+    cls.add_method('GetNRoutingProtocols', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): ns3::Ptr<ns3::Ipv4RoutingProtocol> ns3::Ipv4ListRouting::GetRoutingProtocol(uint32_t index, int16_t & priority) const [member function]
+    cls.add_method('GetRoutingProtocol', 
+                   'ns3::Ptr< ns3::Ipv4RoutingProtocol >', 
+                   [param('uint32_t', 'index'), param('int16_t &', 'priority', direction=2)], 
+                   is_const=True, is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): static ns3::TypeId ns3::Ipv4ListRouting::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::NotifyAddAddress(uint32_t interface, ns3::Ipv4InterfaceAddress address) [member function]
+    cls.add_method('NotifyAddAddress', 
+                   'void', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4InterfaceAddress', 'address')], 
+                   is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::NotifyInterfaceDown(uint32_t interface) [member function]
+    cls.add_method('NotifyInterfaceDown', 
+                   'void', 
+                   [param('uint32_t', 'interface')], 
+                   is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::NotifyInterfaceUp(uint32_t interface) [member function]
+    cls.add_method('NotifyInterfaceUp', 
+                   'void', 
+                   [param('uint32_t', 'interface')], 
+                   is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::NotifyRemoveAddress(uint32_t interface, ns3::Ipv4InterfaceAddress address) [member function]
+    cls.add_method('NotifyRemoveAddress', 
+                   'void', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4InterfaceAddress', 'address')], 
+                   is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::PrintRoutingTable(ns3::Ptr<ns3::OutputStreamWrapper> stream) const [member function]
+    cls.add_method('PrintRoutingTable', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], 
+                   is_const=True, is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): bool ns3::Ipv4ListRouting::RouteInput(ns3::Ptr<ns3::Packet const> p, ns3::Ipv4Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void, ns3::Ptr<ns3::Ipv4Route>, ns3::Ptr<ns3::Packet const>, ns3::Ipv4Header const&, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<ns3::Ipv4MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void, ns3::Ptr<ns3::Packet const>, ns3::Ipv4Header const&, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> ecb) [member function]
+    cls.add_method('RouteInput', 
+                   'bool', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv4Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], 
+                   is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): ns3::Ptr<ns3::Ipv4Route> ns3::Ipv4ListRouting::RouteOutput(ns3::Ptr<ns3::Packet> p, ns3::Ipv4Header const & header, ns3::Ptr<ns3::NetDevice> oif, ns3::Socket::SocketErrno & sockerr) [member function]
+    cls.add_method('RouteOutput', 
+                   'ns3::Ptr< ns3::Ipv4Route >', 
+                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv4Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice >', 'oif'), param('ns3::Socket::SocketErrno &', 'sockerr')], 
+                   is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::SetIpv4(ns3::Ptr<ns3::Ipv4> ipv4) [member function]
+    cls.add_method('SetIpv4', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Ipv4 >', 'ipv4')], 
+                   is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::DoInitialize() [member function]
+    cls.add_method('DoInitialize', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    return
+
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_Ns3DsdvDsdvHeader_methods(root_module, cls):
     cls.add_output_stream_operator()
     ## dsdv-packet.h (module 'dsdv'): ns3::dsdv::DsdvHeader::DsdvHeader(ns3::dsdv::DsdvHeader const & arg0) [copy constructor]
@@ -6762,8 +7108,8 @@
 def register_Ns3DsdvRoutingTableEntry_methods(root_module, cls):
     ## dsdv-rtable.h (module 'dsdv'): ns3::dsdv::RoutingTableEntry::RoutingTableEntry(ns3::dsdv::RoutingTableEntry const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::dsdv::RoutingTableEntry const &', 'arg0')])
-    ## dsdv-rtable.h (module 'dsdv'): ns3::dsdv::RoutingTableEntry::RoutingTableEntry(ns3::Ptr<ns3::NetDevice> dev=0, ns3::Ipv4Address dst=ns3::Ipv4Address(), u_int32_t m_seqNo=0, ns3::Ipv4InterfaceAddress iface=ns3::Ipv4InterfaceAddress(), u_int32_t hops=0, ns3::Ipv4Address nextHop=ns3::Ipv4Address(), ns3::Time lifetime=ns3::Simulator::Now( ), ns3::Time SettlingTime=ns3::Simulator::Now( ), bool changedEntries=false) [constructor]
-    cls.add_constructor([param('ns3::Ptr< ns3::NetDevice >', 'dev', default_value='0'), param('ns3::Ipv4Address', 'dst', default_value='ns3::Ipv4Address()'), param('u_int32_t', 'm_seqNo', default_value='0'), param('ns3::Ipv4InterfaceAddress', 'iface', default_value='ns3::Ipv4InterfaceAddress()'), param('u_int32_t', 'hops', default_value='0'), param('ns3::Ipv4Address', 'nextHop', default_value='ns3::Ipv4Address()'), param('ns3::Time', 'lifetime', default_value='ns3::Simulator::Now( )'), param('ns3::Time', 'SettlingTime', default_value='ns3::Simulator::Now( )'), param('bool', 'changedEntries', default_value='false')])
+    ## dsdv-rtable.h (module 'dsdv'): ns3::dsdv::RoutingTableEntry::RoutingTableEntry(ns3::Ptr<ns3::NetDevice> dev=0, ns3::Ipv4Address dst=ns3::Ipv4Address(), uint32_t m_seqNo=0, ns3::Ipv4InterfaceAddress iface=ns3::Ipv4InterfaceAddress(), uint32_t hops=0, ns3::Ipv4Address nextHop=ns3::Ipv4Address(), ns3::Time lifetime=ns3::Simulator::Now( ), ns3::Time SettlingTime=ns3::Simulator::Now( ), bool changedEntries=false) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::NetDevice >', 'dev', default_value='0'), param('ns3::Ipv4Address', 'dst', default_value='ns3::Ipv4Address()'), param('uint32_t', 'm_seqNo', default_value='0'), param('ns3::Ipv4InterfaceAddress', 'iface', default_value='ns3::Ipv4InterfaceAddress()'), param('uint32_t', 'hops', default_value='0'), param('ns3::Ipv4Address', 'nextHop', default_value='ns3::Ipv4Address()'), param('ns3::Time', 'lifetime', default_value='ns3::Simulator::Now( )'), param('ns3::Time', 'SettlingTime', default_value='ns3::Simulator::Now( )'), param('bool', 'changedEntries', default_value='false')])
     ## dsdv-rtable.h (module 'dsdv'): ns3::Ipv4Address ns3::dsdv::RoutingTableEntry::GetDestination() const [member function]
     cls.add_method('GetDestination', 
                    'ns3::Ipv4Address', 
@@ -6869,12 +7215,20 @@
 def register_functions(root_module):
     module = root_module
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     register_functions_ns3_dsdv(module.get_submodule('dsdv'), root_module)
     return
 
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def register_functions_ns3_dsdv(module, root_module):
     return
 
diff -Naur ns-3.17/src/dsdv/bindings/modulegen__gcc_LP64.py ns-3.18/src/dsdv/bindings/modulegen__gcc_LP64.py
--- ns-3.17/src/dsdv/bindings/modulegen__gcc_LP64.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/dsdv/bindings/modulegen__gcc_LP64.py	2013-10-26 07:07:30.607364407 -0700
@@ -46,6 +46,8 @@
     module.add_class('CallbackBase', import_from_module='ns.core')
     ## event-id.h (module 'core'): ns3::EventId [class]
     module.add_class('EventId', import_from_module='ns.core')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress [class]
     module.add_class('Inet6SocketAddress', import_from_module='ns.network')
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress [class]
@@ -130,6 +132,8 @@
     module.add_class('PacketTagList', import_from_module='ns.network')
     ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct]
     module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration]
+    module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network')
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter> [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simulator.h (module 'core'): ns3::Simulator [class]
@@ -167,9 +171,9 @@
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header [class]
     module.add_class('Ipv4Header', import_from_module='ns.internet', parent=root_module['ns3::Header'])
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType [enumeration]
-    module.add_enum('DscpType', ['DscpDefault', 'CS1', 'AF11', 'AF12', 'AF13', 'CS2', 'AF21', 'AF22', 'AF23', 'CS3', 'AF31', 'AF32', 'AF33', 'CS4', 'AF41', 'AF42', 'AF43', 'CS5', 'EF', 'CS6', 'CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
+    module.add_enum('DscpType', ['DscpDefault', 'DSCP_CS1', 'DSCP_AF11', 'DSCP_AF12', 'DSCP_AF13', 'DSCP_CS2', 'DSCP_AF21', 'DSCP_AF22', 'DSCP_AF23', 'DSCP_CS3', 'DSCP_AF31', 'DSCP_AF32', 'DSCP_AF33', 'DSCP_CS4', 'DSCP_AF41', 'DSCP_AF42', 'DSCP_AF43', 'DSCP_CS5', 'DSCP_EF', 'DSCP_CS6', 'DSCP_CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType [enumeration]
-    module.add_enum('EcnType', ['NotECT', 'ECT1', 'ECT0', 'CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
+    module.add_enum('EcnType', ['ECN_NotECT', 'ECN_ECT1', 'ECN_ECT0', 'ECN_CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
     ## ipv6-header.h (module 'internet'): ns3::Ipv6Header [class]
     module.add_class('Ipv6Header', import_from_module='ns.internet', parent=root_module['ns3::Header'])
     ## ipv6-header.h (module 'internet'): ns3::Ipv6Header::NextHeader_e [enumeration]
@@ -192,6 +196,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Ipv4MulticastRoute', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Ipv4MulticastRoute>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> > [class]
@@ -328,8 +334,6 @@
     module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
     ## random-variable-stream.h (module 'core'): ns3::ParetoRandomVariable [class]
     module.add_class('ParetoRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
-    ## nstime.h (module 'core'): ns3::TimeChecker [class]
-    module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
     module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
@@ -340,6 +344,8 @@
     module.add_class('AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
     ## address.h (module 'network'): ns3::AddressValue [class]
     module.add_class('AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
+    ## ipv4-list-routing.h (module 'internet'): ns3::Ipv4ListRouting [class]
+    module.add_class('Ipv4ListRouting', import_from_module='ns.internet', parent=root_module['ns3::Ipv4RoutingProtocol'])
     module.add_container('std::map< unsigned int, unsigned int >', ('unsigned int', 'unsigned int'), container_type='map')
     
     ## Register a nested module for the namespace FatalImpl
@@ -348,6 +354,12 @@
     register_types_ns3_FatalImpl(nested_module)
     
     
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
+    
     ## Register a nested module for the namespace dsdv
     
     nested_module = module.add_cpp_namespace('dsdv')
@@ -358,6 +370,36 @@
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_types_ns3_dsdv(module):
     root_module = module.get_root()
     
@@ -390,6 +432,7 @@
     register_Ns3ByteTagListIteratorItem_methods(root_module, root_module['ns3::ByteTagList::Iterator::Item'])
     register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase'])
     register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3Inet6SocketAddress_methods(root_module, root_module['ns3::Inet6SocketAddress'])
     register_Ns3InetSocketAddress_methods(root_module, root_module['ns3::InetSocketAddress'])
     register_Ns3IntToType__0_methods(root_module, root_module['ns3::IntToType< 0 >'])
@@ -442,6 +485,7 @@
     register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
     register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3Ipv4MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4MulticastRoute__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> >'])
     register_Ns3SimpleRefCount__Ns3Ipv4Route_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4Route__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> >'])
     register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
@@ -503,12 +547,17 @@
     register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper'])
     register_Ns3Packet_methods(root_module, root_module['ns3::Packet'])
     register_Ns3ParetoRandomVariable_methods(root_module, root_module['ns3::ParetoRandomVariable'])
-    register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
     register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
     register_Ns3AddressChecker_methods(root_module, root_module['ns3::AddressChecker'])
     register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue'])
+    register_Ns3Ipv4ListRouting_methods(root_module, root_module['ns3::Ipv4ListRouting'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     register_Ns3DsdvDsdvHeader_methods(root_module, root_module['ns3::dsdv::DsdvHeader'])
     register_Ns3DsdvPacketQueue_methods(root_module, root_module['ns3::dsdv::PacketQueue'])
     register_Ns3DsdvQueueEntry_methods(root_module, root_module['ns3::dsdv::QueueEntry'])
@@ -1040,6 +1089,35 @@
                    is_const=True)
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3Inet6SocketAddress_methods(root_module, cls):
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress::Inet6SocketAddress(ns3::Inet6SocketAddress const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::Inet6SocketAddress const &', 'arg0')])
@@ -1538,6 +1616,11 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
     cls.add_method('IsEqual', 
                    'bool', 
@@ -1577,16 +1660,36 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
     cls.add_method('MakeAutoconfiguredAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
     cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'mac')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
     cls.add_method('MakeIpv4MappedAddress', 
                    'ns3::Ipv6Address', 
@@ -2073,6 +2176,10 @@
     cls.add_method('RemoveAll', 
                    'void', 
                    [])
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function]
+    cls.add_method('Replace', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     return
 
 def register_Ns3PacketTagListTagData_methods(root_module, cls):
@@ -2409,6 +2516,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -2468,6 +2580,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -3206,6 +3328,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3Ipv4MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4MulticastRoute__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -4023,11 +4157,26 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
     cls.add_method('SetResolution', 
                    'void', 
                    [param('ns3::Time::Unit', 'resolution')], 
                    is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
     cls.add_method('To', 
                    'ns3::int64x64_t', 
@@ -4856,6 +5005,11 @@
                    'bool', 
                    [param('uint32_t', 'interface'), param('uint32_t', 'addressIndex')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## ipv4.h (module 'internet'): bool ns3::Ipv4::RemoveAddress(uint32_t interface, ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4Address', 'address')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## ipv4.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4::SelectSourceAddress(ns3::Ptr<const ns3::NetDevice> device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function]
     cls.add_method('SelectSourceAddress', 
                    'ns3::Ipv4Address', 
@@ -5018,6 +5172,10 @@
     cls.add_method('RemoveAddress', 
                    'ns3::Ipv4InterfaceAddress', 
                    [param('uint32_t', 'index')])
+    ## ipv4-interface.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4Interface::RemoveAddress(ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'ns3::Ipv4InterfaceAddress', 
+                   [param('ns3::Ipv4Address', 'address')])
     ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::Send(ns3::Ptr<ns3::Packet> p, ns3::Ipv4Address dest) [member function]
     cls.add_method('Send', 
                    'void', 
@@ -5178,6 +5336,11 @@
                    'bool', 
                    [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], 
                    is_virtual=True)
+    ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interface, ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4Address', 'address')], 
+                   is_virtual=True)
     ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr<const ns3::NetDevice> device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function]
     cls.add_method('SelectSourceAddress', 
                    'ns3::Ipv4Address', 
@@ -5570,6 +5733,10 @@
     cls.add_method('RemoveAddress', 
                    'ns3::Ipv6InterfaceAddress', 
                    [param('uint32_t', 'index')])
+    ## ipv6-interface.h (module 'internet'): ns3::Ipv6InterfaceAddress ns3::Ipv6Interface::RemoveAddress(ns3::Ipv6Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'ns3::Ipv6InterfaceAddress', 
+                   [param('ns3::Ipv6Address', 'address')])
     ## ipv6-interface.h (module 'internet'): void ns3::Ipv6Interface::Send(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Address dest) [member function]
     cls.add_method('Send', 
                    'void', 
@@ -6234,6 +6401,10 @@
     cls.add_method('RemoveTrailer', 
                    'uint32_t', 
                    [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('ReplacePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
     cls.add_method('Serialize', 
                    'uint32_t', 
@@ -6288,13 +6459,6 @@
                    is_virtual=True)
     return
 
-def register_Ns3TimeChecker_methods(root_module, cls):
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor]
-    cls.add_constructor([])
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')])
-    return
-
 def register_Ns3TimeValue_methods(root_module, cls):
     ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
     cls.add_constructor([])
@@ -6408,6 +6572,188 @@
                    [param('ns3::Address const &', 'value')])
     return
 
+def register_Ns3Ipv4ListRouting_methods(root_module, cls):
+    ## ipv4-list-routing.h (module 'internet'): ns3::Ipv4ListRouting::Ipv4ListRouting(ns3::Ipv4ListRouting const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv4ListRouting const &', 'arg0')])
+    ## ipv4-list-routing.h (module 'internet'): ns3::Ipv4ListRouting::Ipv4ListRouting() [constructor]
+    cls.add_constructor([])
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::AddRoutingProtocol(ns3::Ptr<ns3::Ipv4RoutingProtocol> routingProtocol, int16_t priority) [member function]
+    cls.add_method('AddRoutingProtocol', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol'), param('int16_t', 'priority')], 
+                   is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): uint32_t ns3::Ipv4ListRouting::GetNRoutingProtocols() const [member function]
+    cls.add_method('GetNRoutingProtocols', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): ns3::Ptr<ns3::Ipv4RoutingProtocol> ns3::Ipv4ListRouting::GetRoutingProtocol(uint32_t index, int16_t & priority) const [member function]
+    cls.add_method('GetRoutingProtocol', 
+                   'ns3::Ptr< ns3::Ipv4RoutingProtocol >', 
+                   [param('uint32_t', 'index'), param('int16_t &', 'priority', direction=2)], 
+                   is_const=True, is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): static ns3::TypeId ns3::Ipv4ListRouting::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::NotifyAddAddress(uint32_t interface, ns3::Ipv4InterfaceAddress address) [member function]
+    cls.add_method('NotifyAddAddress', 
+                   'void', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4InterfaceAddress', 'address')], 
+                   is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::NotifyInterfaceDown(uint32_t interface) [member function]
+    cls.add_method('NotifyInterfaceDown', 
+                   'void', 
+                   [param('uint32_t', 'interface')], 
+                   is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::NotifyInterfaceUp(uint32_t interface) [member function]
+    cls.add_method('NotifyInterfaceUp', 
+                   'void', 
+                   [param('uint32_t', 'interface')], 
+                   is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::NotifyRemoveAddress(uint32_t interface, ns3::Ipv4InterfaceAddress address) [member function]
+    cls.add_method('NotifyRemoveAddress', 
+                   'void', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4InterfaceAddress', 'address')], 
+                   is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::PrintRoutingTable(ns3::Ptr<ns3::OutputStreamWrapper> stream) const [member function]
+    cls.add_method('PrintRoutingTable', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], 
+                   is_const=True, is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): bool ns3::Ipv4ListRouting::RouteInput(ns3::Ptr<ns3::Packet const> p, ns3::Ipv4Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void, ns3::Ptr<ns3::Ipv4Route>, ns3::Ptr<ns3::Packet const>, ns3::Ipv4Header const&, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<ns3::Ipv4MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void, ns3::Ptr<ns3::Packet const>, ns3::Ipv4Header const&, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> ecb) [member function]
+    cls.add_method('RouteInput', 
+                   'bool', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv4Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], 
+                   is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): ns3::Ptr<ns3::Ipv4Route> ns3::Ipv4ListRouting::RouteOutput(ns3::Ptr<ns3::Packet> p, ns3::Ipv4Header const & header, ns3::Ptr<ns3::NetDevice> oif, ns3::Socket::SocketErrno & sockerr) [member function]
+    cls.add_method('RouteOutput', 
+                   'ns3::Ptr< ns3::Ipv4Route >', 
+                   [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv4Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice >', 'oif'), param('ns3::Socket::SocketErrno &', 'sockerr')], 
+                   is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::SetIpv4(ns3::Ptr<ns3::Ipv4> ipv4) [member function]
+    cls.add_method('SetIpv4', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Ipv4 >', 'ipv4')], 
+                   is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    ## ipv4-list-routing.h (module 'internet'): void ns3::Ipv4ListRouting::DoInitialize() [member function]
+    cls.add_method('DoInitialize', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
+    return
+
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_Ns3DsdvDsdvHeader_methods(root_module, cls):
     cls.add_output_stream_operator()
     ## dsdv-packet.h (module 'dsdv'): ns3::dsdv::DsdvHeader::DsdvHeader(ns3::dsdv::DsdvHeader const & arg0) [copy constructor]
@@ -6762,8 +7108,8 @@
 def register_Ns3DsdvRoutingTableEntry_methods(root_module, cls):
     ## dsdv-rtable.h (module 'dsdv'): ns3::dsdv::RoutingTableEntry::RoutingTableEntry(ns3::dsdv::RoutingTableEntry const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::dsdv::RoutingTableEntry const &', 'arg0')])
-    ## dsdv-rtable.h (module 'dsdv'): ns3::dsdv::RoutingTableEntry::RoutingTableEntry(ns3::Ptr<ns3::NetDevice> dev=0, ns3::Ipv4Address dst=ns3::Ipv4Address(), u_int32_t m_seqNo=0, ns3::Ipv4InterfaceAddress iface=ns3::Ipv4InterfaceAddress(), u_int32_t hops=0, ns3::Ipv4Address nextHop=ns3::Ipv4Address(), ns3::Time lifetime=ns3::Simulator::Now( ), ns3::Time SettlingTime=ns3::Simulator::Now( ), bool changedEntries=false) [constructor]
-    cls.add_constructor([param('ns3::Ptr< ns3::NetDevice >', 'dev', default_value='0'), param('ns3::Ipv4Address', 'dst', default_value='ns3::Ipv4Address()'), param('u_int32_t', 'm_seqNo', default_value='0'), param('ns3::Ipv4InterfaceAddress', 'iface', default_value='ns3::Ipv4InterfaceAddress()'), param('u_int32_t', 'hops', default_value='0'), param('ns3::Ipv4Address', 'nextHop', default_value='ns3::Ipv4Address()'), param('ns3::Time', 'lifetime', default_value='ns3::Simulator::Now( )'), param('ns3::Time', 'SettlingTime', default_value='ns3::Simulator::Now( )'), param('bool', 'changedEntries', default_value='false')])
+    ## dsdv-rtable.h (module 'dsdv'): ns3::dsdv::RoutingTableEntry::RoutingTableEntry(ns3::Ptr<ns3::NetDevice> dev=0, ns3::Ipv4Address dst=ns3::Ipv4Address(), uint32_t m_seqNo=0, ns3::Ipv4InterfaceAddress iface=ns3::Ipv4InterfaceAddress(), uint32_t hops=0, ns3::Ipv4Address nextHop=ns3::Ipv4Address(), ns3::Time lifetime=ns3::Simulator::Now( ), ns3::Time SettlingTime=ns3::Simulator::Now( ), bool changedEntries=false) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::NetDevice >', 'dev', default_value='0'), param('ns3::Ipv4Address', 'dst', default_value='ns3::Ipv4Address()'), param('uint32_t', 'm_seqNo', default_value='0'), param('ns3::Ipv4InterfaceAddress', 'iface', default_value='ns3::Ipv4InterfaceAddress()'), param('uint32_t', 'hops', default_value='0'), param('ns3::Ipv4Address', 'nextHop', default_value='ns3::Ipv4Address()'), param('ns3::Time', 'lifetime', default_value='ns3::Simulator::Now( )'), param('ns3::Time', 'SettlingTime', default_value='ns3::Simulator::Now( )'), param('bool', 'changedEntries', default_value='false')])
     ## dsdv-rtable.h (module 'dsdv'): ns3::Ipv4Address ns3::dsdv::RoutingTableEntry::GetDestination() const [member function]
     cls.add_method('GetDestination', 
                    'ns3::Ipv4Address', 
@@ -6869,12 +7215,20 @@
 def register_functions(root_module):
     module = root_module
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     register_functions_ns3_dsdv(module.get_submodule('dsdv'), root_module)
     return
 
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def register_functions_ns3_dsdv(module, root_module):
     return
 
diff -Naur ns-3.17/src/dsdv/model/dsdv-routing-protocol.cc ns-3.18/src/dsdv/model/dsdv-routing-protocol.cc
--- ns-3.17/src/dsdv/model/dsdv-routing-protocol.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/dsdv/model/dsdv-routing-protocol.cc	2013-10-26 07:07:30.599364408 -0700
@@ -691,7 +691,7 @@
                       /*Received update with same seq number but with same or greater hop count.
                        * Discard that update.
                        */
-                      if (not m_advRoutingTable.AnyRunningEvent (dsdvHeader.GetDst ()))
+                      if (!m_advRoutingTable.AnyRunningEvent (dsdvHeader.GetDst ()))
                         {
                           /*update the timer only if nexthop address matches thus discarding
                            * updates to that destination from other nodes.
@@ -711,7 +711,7 @@
               else
                 {
                   // Received update with an old sequence number. Discard the update
-                  if (not m_advRoutingTable.AnyRunningEvent (dsdvHeader.GetDst ()))
+                  if (!m_advRoutingTable.AnyRunningEvent (dsdvHeader.GetDst ()))
                     {
                       m_advRoutingTable.DeleteRoute (dsdvHeader.GetDst ());
                     }
@@ -743,7 +743,7 @@
                 }
               else
                 {
-                  if (not m_advRoutingTable.AnyRunningEvent (dsdvHeader.GetDst ()))
+                  if (!m_advRoutingTable.AnyRunningEvent (dsdvHeader.GetDst ()))
                     {
                       m_advRoutingTable.DeleteRoute (dsdvHeader.GetDst ());
                     }
@@ -786,7 +786,7 @@
                                         << " SeqNo:" << i->second.GetSeqNo () << " HopCount:"
                                         << i->second.GetHop () + 1);
           RoutingTableEntry temp = i->second;
-          if ((i->second.GetEntriesChanged () == true) && (not m_advRoutingTable.AnyRunningEvent (temp.GetDestination ())))
+          if ((i->second.GetEntriesChanged () == true) && (!m_advRoutingTable.AnyRunningEvent (temp.GetDestination ())))
             {
               dsdvHeader.SetDst (i->second.GetDestination ());
               dsdvHeader.SetDstSeqno (i->second.GetSeqNo ());
@@ -1189,7 +1189,7 @@
       for (std::map<Ipv4Address, RoutingTableEntry>::const_iterator i = allRoutes.begin (); i != allRoutes.end (); ++i)
         {
           RoutingTableEntry advEntry = i->second;
-          if ((advEntry.GetEntriesChanged () == true) && (not m_advRoutingTable.AnyRunningEvent (advEntry.GetDestination ())))
+          if ((advEntry.GetEntriesChanged () == true) && (!m_advRoutingTable.AnyRunningEvent (advEntry.GetDestination ())))
             {
               if (!(advEntry.GetSeqNo () % 2))
                 {
diff -Naur ns-3.17/src/dsdv/model/dsdv-rtable.cc ns-3.18/src/dsdv/model/dsdv-rtable.cc
--- ns-3.17/src/dsdv/model/dsdv-rtable.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/dsdv/model/dsdv-rtable.cc	2013-10-26 07:07:30.599364408 -0700
@@ -39,9 +39,9 @@
 namespace dsdv {
 RoutingTableEntry::RoutingTableEntry (Ptr<NetDevice> dev,
                                       Ipv4Address dst,
-                                      u_int32_t seqNo,
+                                      uint32_t seqNo,
                                       Ipv4InterfaceAddress iface,
-                                      u_int32_t hops,
+                                      uint32_t hops,
                                       Ipv4Address nextHop,
                                       Time lifetime,
                                       Time SettlingTime,
@@ -233,7 +233,7 @@
           ++i;
           m_ipv4AddressEntry.erase (itmp);
         }
-      // TODO: Need to decide when to invalidate a route
+      /** \todo Need to decide when to invalidate a route */
       /*          else if (i->second.GetLifeTime() > m_holddownTime)
        {
        ++i;
diff -Naur ns-3.17/src/dsdv/model/dsdv-rtable.h ns-3.18/src/dsdv/model/dsdv-rtable.h
--- ns-3.17/src/dsdv/model/dsdv-rtable.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/dsdv/model/dsdv-rtable.h	2013-10-26 07:07:30.599364408 -0700
@@ -57,8 +57,8 @@
 {
 public:
   /// c-tor
-  RoutingTableEntry (Ptr<NetDevice> dev = 0, Ipv4Address dst = Ipv4Address (), u_int32_t m_seqNo = 0,
-                     Ipv4InterfaceAddress iface = Ipv4InterfaceAddress (), u_int32_t hops = 0, Ipv4Address nextHop = Ipv4Address (),
+  RoutingTableEntry (Ptr<NetDevice> dev = 0, Ipv4Address dst = Ipv4Address (), uint32_t m_seqNo = 0,
+                     Ipv4InterfaceAddress iface = Ipv4InterfaceAddress (), uint32_t hops = 0, Ipv4Address nextHop = Ipv4Address (),
                      Time lifetime = Simulator::Now (), Time SettlingTime = Simulator::Now (), bool changedEntries = false);
 
   ~RoutingTableEntry ();
diff -Naur ns-3.17/src/dsdv/test/dsdv-testcase.cc ns-3.18/src/dsdv/test/dsdv-testcase.cc
--- ns-3.17/src/dsdv/test/dsdv-testcase.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/dsdv/test/dsdv-testcase.cc	2013-10-26 07:07:30.611364407 -0700
@@ -78,22 +78,22 @@
     hdr2.SetDstSeqno (4);
     hdr2.SetHopCount (1);
     packet->AddHeader (hdr2);
-    NS_TEST_ASSERT_MSG_EQ (packet->GetSize (), 24, "XXX");
+    NS_TEST_ASSERT_MSG_EQ (packet->GetSize (), 24, "001");
   }
 
   {
     dsdv::DsdvHeader hdr2;
     packet->RemoveHeader (hdr2);
-    NS_TEST_ASSERT_MSG_EQ (hdr2.GetSerializedSize (),12,"XXX");
-    NS_TEST_ASSERT_MSG_EQ (hdr2.GetDst (),Ipv4Address ("10.1.1.3"),"XXX");
-    NS_TEST_ASSERT_MSG_EQ (hdr2.GetDstSeqno (),4,"XXX");
-    NS_TEST_ASSERT_MSG_EQ (hdr2.GetHopCount (),1,"XXX");
+    NS_TEST_ASSERT_MSG_EQ (hdr2.GetSerializedSize (),12,"002");
+    NS_TEST_ASSERT_MSG_EQ (hdr2.GetDst (),Ipv4Address ("10.1.1.3"),"003");
+    NS_TEST_ASSERT_MSG_EQ (hdr2.GetDstSeqno (),4,"004");
+    NS_TEST_ASSERT_MSG_EQ (hdr2.GetHopCount (),1,"005");
     dsdv::DsdvHeader hdr1;
     packet->RemoveHeader (hdr1);
-    NS_TEST_ASSERT_MSG_EQ (hdr1.GetSerializedSize (),12,"XXX");
-    NS_TEST_ASSERT_MSG_EQ (hdr1.GetDst (),Ipv4Address ("10.1.1.2"),"XXX");
-    NS_TEST_ASSERT_MSG_EQ (hdr1.GetDstSeqno (),2,"XXX");
-    NS_TEST_ASSERT_MSG_EQ (hdr1.GetHopCount (),2,"XXX");
+    NS_TEST_ASSERT_MSG_EQ (hdr1.GetSerializedSize (),12,"006");
+    NS_TEST_ASSERT_MSG_EQ (hdr1.GetDst (),Ipv4Address ("10.1.1.2"),"008");
+    NS_TEST_ASSERT_MSG_EQ (hdr1.GetDstSeqno (),2,"009");
+    NS_TEST_ASSERT_MSG_EQ (hdr1.GetHopCount (),2,"010");
   }
 }
 
@@ -156,28 +156,28 @@
     dsdv::RoutingTableEntry rEntry;
     if (rtable.LookupRoute (Ipv4Address ("10.1.1.4"), rEntry))
       {
-        NS_TEST_ASSERT_MSG_EQ (rEntry.GetDestination (),Ipv4Address ("10.1.1.4"),"XXX");
-        NS_TEST_ASSERT_MSG_EQ (rEntry.GetSeqNo (),2,"XXX");
-        NS_TEST_ASSERT_MSG_EQ (rEntry.GetHop (),2,"XXX");
+        NS_TEST_ASSERT_MSG_EQ (rEntry.GetDestination (),Ipv4Address ("10.1.1.4"),"100");
+        NS_TEST_ASSERT_MSG_EQ (rEntry.GetSeqNo (),2,"101");
+        NS_TEST_ASSERT_MSG_EQ (rEntry.GetHop (),2,"102");
       }
     if (rtable.LookupRoute (Ipv4Address ("10.1.1.2"), rEntry))
       {
-        NS_TEST_ASSERT_MSG_EQ (rEntry.GetDestination (),Ipv4Address ("10.1.1.2"),"XXX");
-        NS_TEST_ASSERT_MSG_EQ (rEntry.GetSeqNo (),4,"XXX");
-        NS_TEST_ASSERT_MSG_EQ (rEntry.GetHop (),1,"XXX");
+        NS_TEST_ASSERT_MSG_EQ (rEntry.GetDestination (),Ipv4Address ("10.1.1.2"),"103");
+        NS_TEST_ASSERT_MSG_EQ (rEntry.GetSeqNo (),4,"104");
+        NS_TEST_ASSERT_MSG_EQ (rEntry.GetHop (),1,"105");
       }
     if (rtable.LookupRoute (Ipv4Address ("10.1.1.3"), rEntry))
       {
-        NS_TEST_ASSERT_MSG_EQ (rEntry.GetDestination (),Ipv4Address ("10.1.1.3"),"XXX");
-        NS_TEST_ASSERT_MSG_EQ (rEntry.GetSeqNo (),4,"XXX");
-        NS_TEST_ASSERT_MSG_EQ (rEntry.GetHop (),1,"XXX");
+        NS_TEST_ASSERT_MSG_EQ (rEntry.GetDestination (),Ipv4Address ("10.1.1.3"),"106");
+        NS_TEST_ASSERT_MSG_EQ (rEntry.GetSeqNo (),4,"107");
+        NS_TEST_ASSERT_MSG_EQ (rEntry.GetHop (),1,"108");
       }
     if (rtable.LookupRoute (Ipv4Address ("10.1.1.255"), rEntry))
       {
-        NS_TEST_ASSERT_MSG_EQ (rEntry.GetDestination (),Ipv4Address ("10.1.1.255"),"XXX");
+        NS_TEST_ASSERT_MSG_EQ (rEntry.GetDestination (),Ipv4Address ("10.1.1.255"),"109");
       }
-    NS_TEST_ASSERT_MSG_EQ (rEntry.GetInterface ().GetLocal (),Ipv4Address ("10.1.1.1"),"XXX");
-    NS_TEST_ASSERT_MSG_EQ (rEntry.GetInterface ().GetBroadcast (),Ipv4Address ("10.1.1.255"),"XXX");
+    NS_TEST_ASSERT_MSG_EQ (rEntry.GetInterface ().GetLocal (),Ipv4Address ("10.1.1.1"),"110");
+    NS_TEST_ASSERT_MSG_EQ (rEntry.GetInterface ().GetBroadcast (),Ipv4Address ("10.1.1.255"),"111");
     NS_TEST_ASSERT_MSG_EQ (rtable.RoutingTableSize (),4,"Rtable size incorrect");
   }
   Simulator::Destroy ();
diff -Naur ns-3.17/src/dsr/bindings/modulegen__gcc_ILP32.py ns-3.18/src/dsr/bindings/modulegen__gcc_ILP32.py
--- ns-3.17/src/dsr/bindings/modulegen__gcc_ILP32.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/dsr/bindings/modulegen__gcc_ILP32.py	2013-10-26 07:07:29.847364388 -0700
@@ -21,17 +21,17 @@
     root_module = module.get_root()
     
     ## wifi-mac-header.h (module 'wifi'): ns3::WifiMacType [enumeration]
-    module.add_enum('WifiMacType', ['WIFI_MAC_CTL_RTS', 'WIFI_MAC_CTL_CTS', 'WIFI_MAC_CTL_ACK', 'WIFI_MAC_CTL_BACKREQ', 'WIFI_MAC_CTL_BACKRESP', 'WIFI_MAC_MGT_BEACON', 'WIFI_MAC_MGT_ASSOCIATION_REQUEST', 'WIFI_MAC_MGT_ASSOCIATION_RESPONSE', 'WIFI_MAC_MGT_DISASSOCIATION', 'WIFI_MAC_MGT_REASSOCIATION_REQUEST', 'WIFI_MAC_MGT_REASSOCIATION_RESPONSE', 'WIFI_MAC_MGT_PROBE_REQUEST', 'WIFI_MAC_MGT_PROBE_RESPONSE', 'WIFI_MAC_MGT_AUTHENTICATION', 'WIFI_MAC_MGT_DEAUTHENTICATION', 'WIFI_MAC_MGT_ACTION', 'WIFI_MAC_MGT_ACTION_NO_ACK', 'WIFI_MAC_MGT_MULTIHOP_ACTION', 'WIFI_MAC_DATA', 'WIFI_MAC_DATA_CFACK', 'WIFI_MAC_DATA_CFPOLL', 'WIFI_MAC_DATA_CFACK_CFPOLL', 'WIFI_MAC_DATA_NULL', 'WIFI_MAC_DATA_NULL_CFACK', 'WIFI_MAC_DATA_NULL_CFPOLL', 'WIFI_MAC_DATA_NULL_CFACK_CFPOLL', 'WIFI_MAC_QOSDATA', 'WIFI_MAC_QOSDATA_CFACK', 'WIFI_MAC_QOSDATA_CFPOLL', 'WIFI_MAC_QOSDATA_CFACK_CFPOLL', 'WIFI_MAC_QOSDATA_NULL', 'WIFI_MAC_QOSDATA_NULL_CFPOLL', 'WIFI_MAC_QOSDATA_NULL_CFACK_CFPOLL'], import_from_module='ns.wifi')
+    module.add_enum('WifiMacType', ['WIFI_MAC_CTL_RTS', 'WIFI_MAC_CTL_CTS', 'WIFI_MAC_CTL_ACK', 'WIFI_MAC_CTL_BACKREQ', 'WIFI_MAC_CTL_BACKRESP', 'WIFI_MAC_CTL_CTLWRAPPER', 'WIFI_MAC_MGT_BEACON', 'WIFI_MAC_MGT_ASSOCIATION_REQUEST', 'WIFI_MAC_MGT_ASSOCIATION_RESPONSE', 'WIFI_MAC_MGT_DISASSOCIATION', 'WIFI_MAC_MGT_REASSOCIATION_REQUEST', 'WIFI_MAC_MGT_REASSOCIATION_RESPONSE', 'WIFI_MAC_MGT_PROBE_REQUEST', 'WIFI_MAC_MGT_PROBE_RESPONSE', 'WIFI_MAC_MGT_AUTHENTICATION', 'WIFI_MAC_MGT_DEAUTHENTICATION', 'WIFI_MAC_MGT_ACTION', 'WIFI_MAC_MGT_ACTION_NO_ACK', 'WIFI_MAC_MGT_MULTIHOP_ACTION', 'WIFI_MAC_DATA', 'WIFI_MAC_DATA_CFACK', 'WIFI_MAC_DATA_CFPOLL', 'WIFI_MAC_DATA_CFACK_CFPOLL', 'WIFI_MAC_DATA_NULL', 'WIFI_MAC_DATA_NULL_CFACK', 'WIFI_MAC_DATA_NULL_CFPOLL', 'WIFI_MAC_DATA_NULL_CFACK_CFPOLL', 'WIFI_MAC_QOSDATA', 'WIFI_MAC_QOSDATA_CFACK', 'WIFI_MAC_QOSDATA_CFPOLL', 'WIFI_MAC_QOSDATA_CFACK_CFPOLL', 'WIFI_MAC_QOSDATA_NULL', 'WIFI_MAC_QOSDATA_NULL_CFPOLL', 'WIFI_MAC_QOSDATA_NULL_CFACK_CFPOLL'], import_from_module='ns.wifi')
     ## wifi-preamble.h (module 'wifi'): ns3::WifiPreamble [enumeration]
-    module.add_enum('WifiPreamble', ['WIFI_PREAMBLE_LONG', 'WIFI_PREAMBLE_SHORT'], import_from_module='ns.wifi')
+    module.add_enum('WifiPreamble', ['WIFI_PREAMBLE_LONG', 'WIFI_PREAMBLE_SHORT', 'WIFI_PREAMBLE_HT_MF', 'WIFI_PREAMBLE_HT_GF'], import_from_module='ns.wifi')
     ## wifi-mode.h (module 'wifi'): ns3::WifiModulationClass [enumeration]
     module.add_enum('WifiModulationClass', ['WIFI_MOD_CLASS_UNKNOWN', 'WIFI_MOD_CLASS_IR', 'WIFI_MOD_CLASS_FHSS', 'WIFI_MOD_CLASS_DSSS', 'WIFI_MOD_CLASS_ERP_PBCC', 'WIFI_MOD_CLASS_DSSS_OFDM', 'WIFI_MOD_CLASS_ERP_OFDM', 'WIFI_MOD_CLASS_OFDM', 'WIFI_MOD_CLASS_HT'], import_from_module='ns.wifi')
     ## wifi-phy-standard.h (module 'wifi'): ns3::WifiPhyStandard [enumeration]
-    module.add_enum('WifiPhyStandard', ['WIFI_PHY_STANDARD_80211a', 'WIFI_PHY_STANDARD_80211b', 'WIFI_PHY_STANDARD_80211g', 'WIFI_PHY_STANDARD_80211_10MHZ', 'WIFI_PHY_STANDARD_80211_5MHZ', 'WIFI_PHY_STANDARD_holland', 'WIFI_PHY_STANDARD_80211p_CCH', 'WIFI_PHY_STANDARD_80211p_SCH'], import_from_module='ns.wifi')
+    module.add_enum('WifiPhyStandard', ['WIFI_PHY_STANDARD_80211a', 'WIFI_PHY_STANDARD_80211b', 'WIFI_PHY_STANDARD_80211g', 'WIFI_PHY_STANDARD_80211_10MHZ', 'WIFI_PHY_STANDARD_80211_5MHZ', 'WIFI_PHY_STANDARD_holland', 'WIFI_PHY_STANDARD_80211p_CCH', 'WIFI_PHY_STANDARD_80211p_SCH', 'WIFI_PHY_STANDARD_80211n_2_4GHZ', 'WIFI_PHY_STANDARD_80211n_5GHZ'], import_from_module='ns.wifi')
     ## qos-utils.h (module 'wifi'): ns3::AcIndex [enumeration]
     module.add_enum('AcIndex', ['AC_BE', 'AC_BK', 'AC_VI', 'AC_VO', 'AC_BE_NQOS', 'AC_UNDEF'], import_from_module='ns.wifi')
     ## wifi-mode.h (module 'wifi'): ns3::WifiCodeRate [enumeration]
-    module.add_enum('WifiCodeRate', ['WIFI_CODE_RATE_UNDEFINED', 'WIFI_CODE_RATE_3_4', 'WIFI_CODE_RATE_2_3', 'WIFI_CODE_RATE_1_2'], import_from_module='ns.wifi')
+    module.add_enum('WifiCodeRate', ['WIFI_CODE_RATE_UNDEFINED', 'WIFI_CODE_RATE_3_4', 'WIFI_CODE_RATE_2_3', 'WIFI_CODE_RATE_1_2', 'WIFI_CODE_RATE_5_6'], import_from_module='ns.wifi')
     ## address.h (module 'network'): ns3::Address [class]
     module.add_class('Address', import_from_module='ns.network')
     ## address.h (module 'network'): ns3::Address::MaxSize_e [enumeration]
@@ -60,10 +60,12 @@
     module.add_class('DsrHelper')
     ## dsr-main-helper.h (module 'dsr'): ns3::DsrMainHelper [class]
     module.add_class('DsrMainHelper')
-    ## event-garbage-collector.h (module 'tools'): ns3::EventGarbageCollector [class]
-    module.add_class('EventGarbageCollector', import_from_module='ns.tools')
+    ## event-garbage-collector.h (module 'core'): ns3::EventGarbageCollector [class]
+    module.add_class('EventGarbageCollector', import_from_module='ns.core')
     ## event-id.h (module 'core'): ns3::EventId [class]
     module.add_class('EventId', import_from_module='ns.core')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress [class]
     module.add_class('Inet6SocketAddress', import_from_module='ns.network')
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress [class]
@@ -150,6 +152,8 @@
     module.add_class('PacketTagList', import_from_module='ns.network')
     ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct]
     module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration]
+    module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network')
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter> [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simulator.h (module 'core'): ns3::Simulator [class]
@@ -190,6 +194,8 @@
     module.add_class('WifiRemoteStationState', import_from_module='ns.wifi')
     ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState [enumeration]
     module.add_enum('', ['BRAND_NEW', 'DISASSOC', 'WAIT_ASSOC_TX_OK', 'GOT_ASSOC_TX_OK'], outer_class=root_module['ns3::WifiRemoteStationState'], import_from_module='ns.wifi')
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector [class]
+    module.add_class('WifiTxVector', import_from_module='ns.wifi')
     ## empty.h (module 'core'): ns3::empty [class]
     module.add_class('empty', import_from_module='ns.core')
     ## int64x64-double.h (module 'core'): ns3::int64x64_t [class]
@@ -215,9 +221,9 @@
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header [class]
     module.add_class('Ipv4Header', import_from_module='ns.internet', parent=root_module['ns3::Header'])
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType [enumeration]
-    module.add_enum('DscpType', ['DscpDefault', 'CS1', 'AF11', 'AF12', 'AF13', 'CS2', 'AF21', 'AF22', 'AF23', 'CS3', 'AF31', 'AF32', 'AF33', 'CS4', 'AF41', 'AF42', 'AF43', 'CS5', 'EF', 'CS6', 'CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
+    module.add_enum('DscpType', ['DscpDefault', 'DSCP_CS1', 'DSCP_AF11', 'DSCP_AF12', 'DSCP_AF13', 'DSCP_CS2', 'DSCP_AF21', 'DSCP_AF22', 'DSCP_AF23', 'DSCP_CS3', 'DSCP_AF31', 'DSCP_AF32', 'DSCP_AF33', 'DSCP_CS4', 'DSCP_AF41', 'DSCP_AF42', 'DSCP_AF43', 'DSCP_CS5', 'DSCP_EF', 'DSCP_CS6', 'DSCP_CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType [enumeration]
-    module.add_enum('EcnType', ['NotECT', 'ECT1', 'ECT0', 'CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
+    module.add_enum('EcnType', ['ECN_NotECT', 'ECN_ECT1', 'ECN_ECT0', 'ECN_CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
     ## ipv6-header.h (module 'internet'): ns3::Ipv6Header [class]
     module.add_class('Ipv6Header', import_from_module='ns.internet', parent=root_module['ns3::Header'])
     ## ipv6-header.h (module 'internet'): ns3::Ipv6Header::NextHeader_e [enumeration]
@@ -240,6 +246,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Ipv4MulticastRoute', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Ipv4MulticastRoute>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> > [class]
@@ -344,6 +352,12 @@
     module.add_class('ExponentialRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
     ## random-variable-stream.h (module 'core'): ns3::GammaRandomVariable [class]
     module.add_class('GammaRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilities [class]
+    module.add_class('HtCapabilities', import_from_module='ns.wifi', parent=root_module['ns3::WifiInformationElement'])
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilitiesChecker [class]
+    module.add_class('HtCapabilitiesChecker', import_from_module='ns.wifi', parent=root_module['ns3::AttributeChecker'])
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilitiesValue [class]
+    module.add_class('HtCapabilitiesValue', import_from_module='ns.wifi', parent=root_module['ns3::AttributeValue'])
     ## ip-l4-protocol.h (module 'internet'): ns3::IpL4Protocol [class]
     module.add_class('IpL4Protocol', import_from_module='ns.internet', parent=root_module['ns3::Object'])
     ## ip-l4-protocol.h (module 'internet'): ns3::IpL4Protocol::RxStatus [enumeration]
@@ -414,8 +428,6 @@
     module.add_class('SsidValue', import_from_module='ns.wifi', parent=root_module['ns3::AttributeValue'])
     ## tcp-l4-protocol.h (module 'internet'): ns3::TcpL4Protocol [class]
     module.add_class('TcpL4Protocol', import_from_module='ns.internet', parent=root_module['ns3::IpL4Protocol'])
-    ## nstime.h (module 'core'): ns3::TimeChecker [class]
-    module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
     module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
@@ -437,8 +449,15 @@
     ## icmpv4-l4-protocol.h (module 'internet'): ns3::Icmpv4L4Protocol [class]
     module.add_class('Icmpv4L4Protocol', import_from_module='ns.internet', parent=root_module['ns3::IpL4Protocol'])
     module.add_container('ns3::WifiModeList', 'ns3::WifiMode', container_type='vector')
+    module.add_container('ns3::WifiMcsList', 'unsigned char', container_type='vector')
     module.add_container('std::list< ns3::Ptr< ns3::Packet > >', 'ns3::Ptr< ns3::Packet >', container_type='list')
     module.add_container('std::map< unsigned int, unsigned int >', ('unsigned int', 'unsigned int'), container_type='map')
+    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< unsigned char const *, std::vector< unsigned char, std::allocator< unsigned char > > >', 'ns3::WifiMcsListIterator')
+    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< unsigned char const *, std::vector< unsigned char, std::allocator< unsigned char > > >*', 'ns3::WifiMcsListIterator*')
+    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< unsigned char const *, std::vector< unsigned char, std::allocator< unsigned char > > >&', 'ns3::WifiMcsListIterator&')
+    typehandlers.add_type_alias('std::vector< unsigned char, std::allocator< unsigned char > >', 'ns3::WifiMcsList')
+    typehandlers.add_type_alias('std::vector< unsigned char, std::allocator< unsigned char > >*', 'ns3::WifiMcsList*')
+    typehandlers.add_type_alias('std::vector< unsigned char, std::allocator< unsigned char > >&', 'ns3::WifiMcsList&')
     typehandlers.add_type_alias('uint8_t', 'ns3::WifiInformationElementId')
     typehandlers.add_type_alias('uint8_t*', 'ns3::WifiInformationElementId*')
     typehandlers.add_type_alias('uint8_t&', 'ns3::WifiInformationElementId&')
@@ -455,6 +474,12 @@
     register_types_ns3_FatalImpl(nested_module)
     
     
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
+    
     ## Register a nested module for the namespace dsr
     
     nested_module = module.add_cpp_namespace('dsr')
@@ -471,6 +496,36 @@
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_types_ns3_dsr(module):
     root_module = module.get_root()
     
@@ -611,6 +666,7 @@
     register_Ns3DsrMainHelper_methods(root_module, root_module['ns3::DsrMainHelper'])
     register_Ns3EventGarbageCollector_methods(root_module, root_module['ns3::EventGarbageCollector'])
     register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3Inet6SocketAddress_methods(root_module, root_module['ns3::Inet6SocketAddress'])
     register_Ns3InetSocketAddress_methods(root_module, root_module['ns3::InetSocketAddress'])
     register_Ns3IntToType__0_methods(root_module, root_module['ns3::IntToType< 0 >'])
@@ -654,6 +710,7 @@
     register_Ns3WifiRemoteStation_methods(root_module, root_module['ns3::WifiRemoteStation'])
     register_Ns3WifiRemoteStationInfo_methods(root_module, root_module['ns3::WifiRemoteStationInfo'])
     register_Ns3WifiRemoteStationState_methods(root_module, root_module['ns3::WifiRemoteStationState'])
+    register_Ns3WifiTxVector_methods(root_module, root_module['ns3::WifiTxVector'])
     register_Ns3Empty_methods(root_module, root_module['ns3::empty'])
     register_Ns3Int64x64_t_methods(root_module, root_module['ns3::int64x64_t'])
     register_Ns3Chunk_methods(root_module, root_module['ns3::Chunk'])
@@ -673,6 +730,7 @@
     register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
     register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3Ipv4MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4MulticastRoute__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> >'])
     register_Ns3SimpleRefCount__Ns3Ipv4Route_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4Route__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> >'])
     register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
@@ -718,6 +776,9 @@
     register_Ns3EventImpl_methods(root_module, root_module['ns3::EventImpl'])
     register_Ns3ExponentialRandomVariable_methods(root_module, root_module['ns3::ExponentialRandomVariable'])
     register_Ns3GammaRandomVariable_methods(root_module, root_module['ns3::GammaRandomVariable'])
+    register_Ns3HtCapabilities_methods(root_module, root_module['ns3::HtCapabilities'])
+    register_Ns3HtCapabilitiesChecker_methods(root_module, root_module['ns3::HtCapabilitiesChecker'])
+    register_Ns3HtCapabilitiesValue_methods(root_module, root_module['ns3::HtCapabilitiesValue'])
     register_Ns3IpL4Protocol_methods(root_module, root_module['ns3::IpL4Protocol'])
     register_Ns3Ipv4_methods(root_module, root_module['ns3::Ipv4'])
     register_Ns3Ipv4AddressChecker_methods(root_module, root_module['ns3::Ipv4AddressChecker'])
@@ -750,7 +811,6 @@
     register_Ns3SsidChecker_methods(root_module, root_module['ns3::SsidChecker'])
     register_Ns3SsidValue_methods(root_module, root_module['ns3::SsidValue'])
     register_Ns3TcpL4Protocol_methods(root_module, root_module['ns3::TcpL4Protocol'])
-    register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
     register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
@@ -761,6 +821,11 @@
     register_Ns3AddressChecker_methods(root_module, root_module['ns3::AddressChecker'])
     register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue'])
     register_Ns3Icmpv4L4Protocol_methods(root_module, root_module['ns3::Icmpv4L4Protocol'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     register_Ns3DsrBlackList_methods(root_module, root_module['ns3::dsr::BlackList'])
     register_Ns3DsrDsrFsHeader_methods(root_module, root_module['ns3::dsr::DsrFsHeader'])
     register_Ns3DsrDsrNetworkQueue_methods(root_module, root_module['ns3::dsr::DsrNetworkQueue'])
@@ -1328,11 +1393,11 @@
     return
 
 def register_Ns3EventGarbageCollector_methods(root_module, cls):
-    ## event-garbage-collector.h (module 'tools'): ns3::EventGarbageCollector::EventGarbageCollector(ns3::EventGarbageCollector const & arg0) [copy constructor]
+    ## event-garbage-collector.h (module 'core'): ns3::EventGarbageCollector::EventGarbageCollector(ns3::EventGarbageCollector const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::EventGarbageCollector const &', 'arg0')])
-    ## event-garbage-collector.h (module 'tools'): ns3::EventGarbageCollector::EventGarbageCollector() [constructor]
+    ## event-garbage-collector.h (module 'core'): ns3::EventGarbageCollector::EventGarbageCollector() [constructor]
     cls.add_constructor([])
-    ## event-garbage-collector.h (module 'tools'): void ns3::EventGarbageCollector::Track(ns3::EventId event) [member function]
+    ## event-garbage-collector.h (module 'core'): void ns3::EventGarbageCollector::Track(ns3::EventId event) [member function]
     cls.add_method('Track', 
                    'void', 
                    [param('ns3::EventId', 'event')])
@@ -1383,6 +1448,35 @@
                    is_const=True)
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3Inet6SocketAddress_methods(root_module, cls):
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress::Inet6SocketAddress(ns3::Inet6SocketAddress const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::Inet6SocketAddress const &', 'arg0')])
@@ -1844,6 +1938,11 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
     cls.add_method('IsEqual', 
                    'bool', 
@@ -1883,16 +1982,36 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
     cls.add_method('MakeAutoconfiguredAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
     cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'mac')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
     cls.add_method('MakeIpv4MappedAddress', 
                    'ns3::Ipv6Address', 
@@ -2451,6 +2570,10 @@
     cls.add_method('RemoveAll', 
                    'void', 
                    [])
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function]
+    cls.add_method('Replace', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     return
 
 def register_Ns3PacketTagListTagData_methods(root_module, cls):
@@ -2817,6 +2940,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -2876,6 +3004,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -3088,10 +3226,95 @@
     cls.add_constructor([param('ns3::WifiRemoteStationState const &', 'arg0')])
     ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_address [variable]
     cls.add_instance_attribute('m_address', 'ns3::Mac48Address', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_greenfield [variable]
+    cls.add_instance_attribute('m_greenfield', 'bool', is_const=False)
     ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_info [variable]
     cls.add_instance_attribute('m_info', 'ns3::WifiRemoteStationInfo', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_operationalMcsSet [variable]
+    cls.add_instance_attribute('m_operationalMcsSet', 'ns3::WifiMcsList', is_const=False)
     ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_operationalRateSet [variable]
     cls.add_instance_attribute('m_operationalRateSet', 'ns3::WifiModeList', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_rx [variable]
+    cls.add_instance_attribute('m_rx', 'uint32_t', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_shortGuardInterval [variable]
+    cls.add_instance_attribute('m_shortGuardInterval', 'bool', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_stbc [variable]
+    cls.add_instance_attribute('m_stbc', 'bool', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_tx [variable]
+    cls.add_instance_attribute('m_tx', 'uint32_t', is_const=False)
+    return
+
+def register_Ns3WifiTxVector_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiTxVector const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiTxVector const &', 'arg0')])
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector() [constructor]
+    cls.add_constructor([])
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiMode m, uint8_t l, uint8_t r, bool sg, uint8_t ns, uint8_t ne, bool Stbc) [constructor]
+    cls.add_constructor([param('ns3::WifiMode', 'm'), param('uint8_t', 'l'), param('uint8_t', 'r'), param('bool', 'sg'), param('uint8_t', 'ns'), param('uint8_t', 'ne'), param('bool', 'Stbc')])
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiMode ns3::WifiTxVector::GetMode() const [member function]
+    cls.add_method('GetMode', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): uint8_t ns3::WifiTxVector::GetNess() const [member function]
+    cls.add_method('GetNess', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): uint8_t ns3::WifiTxVector::GetNss() const [member function]
+    cls.add_method('GetNss', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): uint8_t ns3::WifiTxVector::GetRetries() const [member function]
+    cls.add_method('GetRetries', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): uint8_t ns3::WifiTxVector::GetTxPowerLevel() const [member function]
+    cls.add_method('GetTxPowerLevel', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): bool ns3::WifiTxVector::IsShortGuardInterval() const [member function]
+    cls.add_method('IsShortGuardInterval', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): bool ns3::WifiTxVector::IsStbc() const [member function]
+    cls.add_method('IsStbc', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetMode(ns3::WifiMode mode) [member function]
+    cls.add_method('SetMode', 
+                   'void', 
+                   [param('ns3::WifiMode', 'mode')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetNess(uint8_t ness) [member function]
+    cls.add_method('SetNess', 
+                   'void', 
+                   [param('uint8_t', 'ness')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetNss(uint8_t nss) [member function]
+    cls.add_method('SetNss', 
+                   'void', 
+                   [param('uint8_t', 'nss')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetRetries(uint8_t retries) [member function]
+    cls.add_method('SetRetries', 
+                   'void', 
+                   [param('uint8_t', 'retries')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetShortGuardInterval(bool guardinterval) [member function]
+    cls.add_method('SetShortGuardInterval', 
+                   'void', 
+                   [param('bool', 'guardinterval')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetStbc(bool stbcsatuts) [member function]
+    cls.add_method('SetStbc', 
+                   'void', 
+                   [param('bool', 'stbcsatuts')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetTxPowerLevel(uint8_t powerlevel) [member function]
+    cls.add_method('SetTxPowerLevel', 
+                   'void', 
+                   [param('uint8_t', 'powerlevel')])
     return
 
 def register_Ns3Empty_methods(root_module, cls):
@@ -3991,6 +4214,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3Ipv4MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4MulticastRoute__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -4820,11 +5055,26 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
     cls.add_method('SetResolution', 
                    'void', 
                    [param('ns3::Time::Unit', 'resolution')], 
                    is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
     cls.add_method('To', 
                    'ns3::int64x64_t', 
@@ -5147,6 +5397,11 @@
                    'ns3::Time', 
                    [], 
                    is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): ns3::Time ns3::WifiMac::GetRifs() const [member function]
+    cls.add_method('GetRifs', 
+                   'ns3::Time', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
     ## wifi-mac.h (module 'wifi'): ns3::Time ns3::WifiMac::GetSifs() const [member function]
     cls.add_method('GetSifs', 
                    'ns3::Time', 
@@ -5246,6 +5501,11 @@
                    'void', 
                    [], 
                    is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetRifs(ns3::Time rifs) [member function]
+    cls.add_method('SetRifs', 
+                   'void', 
+                   [param('ns3::Time', 'rifs')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetSifs(ns3::Time sifs) [member function]
     cls.add_method('SetSifs', 
                    'void', 
@@ -5638,10 +5898,18 @@
     cls.add_method('SetNoMoreFragments', 
                    'void', 
                    [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetNoOrder() [member function]
+    cls.add_method('SetNoOrder', 
+                   'void', 
+                   [])
     ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetNoRetry() [member function]
     cls.add_method('SetNoRetry', 
                    'void', 
                    [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetOrder() [member function]
+    cls.add_method('SetOrder', 
+                   'void', 
+                   [])
     ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetProbeReq() [member function]
     cls.add_method('SetProbeReq', 
                    'void', 
@@ -5727,21 +5995,31 @@
                    'double', 
                    [param('ns3::WifiMode', 'txMode'), param('double', 'ber')], 
                    is_pure_virtual=True, is_const=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::CalculateTxDuration(uint32_t size, ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
+    ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::CalculateTxDuration(uint32_t size, ns3::WifiTxVector txvector, ns3::WifiPreamble preamble) [member function]
     cls.add_method('CalculateTxDuration', 
                    'ns3::Time', 
-                   [param('uint32_t', 'size'), param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
+                   [param('uint32_t', 'size'), param('ns3::WifiTxVector', 'txvector'), param('ns3::WifiPreamble', 'preamble')], 
                    is_static=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::ConfigureStandard(ns3::WifiPhyStandard standard) [member function]
     cls.add_method('ConfigureStandard', 
                    'void', 
                    [param('ns3::WifiPhyStandard', 'standard')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetBssMembershipSelector(uint32_t selector) const [member function]
+    cls.add_method('GetBssMembershipSelector', 
+                   'uint32_t', 
+                   [param('uint32_t', 'selector')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): ns3::Ptr<ns3::WifiChannel> ns3::WifiPhy::GetChannel() const [member function]
     cls.add_method('GetChannel', 
                    'ns3::Ptr< ns3::WifiChannel >', 
                    [], 
                    is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::GetChannelBonding() const [member function]
+    cls.add_method('GetChannelBonding', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): uint16_t ns3::WifiPhy::GetChannelNumber() const [member function]
     cls.add_method('GetChannelNumber', 
                    'uint16_t', 
@@ -5812,16 +6090,61 @@
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetFrequency() const [member function]
+    cls.add_method('GetFrequency', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::GetGreenfield() const [member function]
+    cls.add_method('GetGreenfield', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::GetGuardInterval() const [member function]
+    cls.add_method('GetGuardInterval', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): ns3::Time ns3::WifiPhy::GetLastRxStartTime() const [member function]
     cls.add_method('GetLastRxStartTime', 
                    'ns3::Time', 
                    [], 
                    is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::GetLdpc() const [member function]
+    cls.add_method('GetLdpc', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetMFPlcpHeaderMode(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
+    cls.add_method('GetMFPlcpHeaderMode', 
+                   'ns3::WifiMode', 
+                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): uint8_t ns3::WifiPhy::GetMcs(uint8_t mcs) const [member function]
+    cls.add_method('GetMcs', 
+                   'uint8_t', 
+                   [param('uint8_t', 'mcs')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): ns3::WifiModeList ns3::WifiPhy::GetMembershipSelectorModes(uint32_t selector) [member function]
+    cls.add_method('GetMembershipSelectorModes', 
+                   'ns3::WifiModeList', 
+                   [param('uint32_t', 'selector')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): ns3::WifiMode ns3::WifiPhy::GetMode(uint32_t mode) const [member function]
     cls.add_method('GetMode', 
                    'ns3::WifiMode', 
                    [param('uint32_t', 'mode')], 
                    is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetNBssMembershipSelectors() const [member function]
+    cls.add_method('GetNBssMembershipSelectors', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint8_t ns3::WifiPhy::GetNMcs() const [member function]
+    cls.add_method('GetNMcs', 
+                   'uint8_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetNModes() const [member function]
     cls.add_method('GetNModes', 
                    'uint32_t', 
@@ -5832,6 +6155,31 @@
                    'uint32_t', 
                    [], 
                    is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetNumberOfReceiveAntennas() const [member function]
+    cls.add_method('GetNumberOfReceiveAntennas', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetNumberOfTransmitAntennas() const [member function]
+    cls.add_method('GetNumberOfTransmitAntennas', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate108MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate108MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate120MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate120MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate121_5MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate121_5MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate12Mbps() [member function]
     cls.add_method('GetOfdmRate12Mbps', 
                    'ns3::WifiMode', 
@@ -5847,11 +6195,46 @@
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate135MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate135MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate135MbpsBW40MHzShGi() [member function]
+    cls.add_method('GetOfdmRate135MbpsBW40MHzShGi', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate13MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate13MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate13_5MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate13_5MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate13_5MbpsBW5MHz() [member function]
     cls.add_method('GetOfdmRate13_5MbpsBW5MHz', 
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate14_4MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate14_4MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate150MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate150MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate15MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate15MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate18Mbps() [member function]
     cls.add_method('GetOfdmRate18Mbps', 
                    'ns3::WifiMode', 
@@ -5862,11 +6245,21 @@
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate19_5MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate19_5MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate1_5MbpsBW5MHz() [member function]
     cls.add_method('GetOfdmRate1_5MbpsBW5MHz', 
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate21_7MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate21_7MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate24Mbps() [member function]
     cls.add_method('GetOfdmRate24Mbps', 
                    'ns3::WifiMode', 
@@ -5877,21 +6270,46 @@
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate26MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate26MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate27MbpsBW10MHz() [member function]
     cls.add_method('GetOfdmRate27MbpsBW10MHz', 
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate27MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate27MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate28_9MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate28_9MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate2_25MbpsBW5MHz() [member function]
     cls.add_method('GetOfdmRate2_25MbpsBW5MHz', 
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate30MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate30MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate36Mbps() [member function]
     cls.add_method('GetOfdmRate36Mbps', 
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate39MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate39MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate3MbpsBW10MHz() [member function]
     cls.add_method('GetOfdmRate3MbpsBW10MHz', 
                    'ns3::WifiMode', 
@@ -5902,6 +6320,21 @@
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate40_5MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate40_5MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate43_3MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate43_3MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate45MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate45MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate48Mbps() [member function]
     cls.add_method('GetOfdmRate48Mbps', 
                    'ns3::WifiMode', 
@@ -5917,11 +6350,46 @@
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate52MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate52MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate54Mbps() [member function]
     cls.add_method('GetOfdmRate54Mbps', 
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate54MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate54MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate57_8MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate57_8MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate58_5MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate58_5MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate60MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate60MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate65MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate65MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate65MbpsBW20MHzShGi() [member function]
+    cls.add_method('GetOfdmRate65MbpsBW20MHzShGi', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate6Mbps() [member function]
     cls.add_method('GetOfdmRate6Mbps', 
                    'ns3::WifiMode', 
@@ -5937,6 +6405,31 @@
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate6_5MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate6_5MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate72_2MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate72_2MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate7_2MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate7_2MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate81MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate81MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate90MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate90MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate9Mbps() [member function]
     cls.add_method('GetOfdmRate9Mbps', 
                    'ns3::WifiMode', 
@@ -5952,10 +6445,10 @@
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
-    ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPayloadDurationMicroSeconds(uint32_t size, ns3::WifiMode payloadMode) [member function]
+    ## wifi-phy.h (module 'wifi'): static double ns3::WifiPhy::GetPayloadDurationMicroSeconds(uint32_t size, ns3::WifiTxVector txvector) [member function]
     cls.add_method('GetPayloadDurationMicroSeconds', 
-                   'uint32_t', 
-                   [param('uint32_t', 'size'), param('ns3::WifiMode', 'payloadMode')], 
+                   'double', 
+                   [param('uint32_t', 'size'), param('ns3::WifiTxVector', 'txvector')], 
                    is_static=True)
     ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPlcpHeaderDurationMicroSeconds(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
     cls.add_method('GetPlcpHeaderDurationMicroSeconds', 
@@ -5967,6 +6460,16 @@
                    'ns3::WifiMode', 
                    [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPlcpHtSigHeaderDurationMicroSeconds(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
+    cls.add_method('GetPlcpHtSigHeaderDurationMicroSeconds', 
+                   'uint32_t', 
+                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPlcpHtTrainingSymbolDurationMicroSeconds(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble, ns3::WifiTxVector txvector) [member function]
+    cls.add_method('GetPlcpHtTrainingSymbolDurationMicroSeconds', 
+                   'uint32_t', 
+                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble'), param('ns3::WifiTxVector', 'txvector')], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPlcpPreambleDurationMicroSeconds(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
     cls.add_method('GetPlcpPreambleDurationMicroSeconds', 
                    'uint32_t', 
@@ -5977,6 +6480,11 @@
                    'ns3::Time', 
                    [], 
                    is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::GetStbc() const [member function]
+    cls.add_method('GetStbc', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): double ns3::WifiPhy::GetTxPowerEnd() const [member function]
     cls.add_method('GetTxPowerEnd', 
                    'double', 
@@ -6022,14 +6530,19 @@
                    'bool', 
                    [], 
                    is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): ns3::WifiMode ns3::WifiPhy::McsToWifiMode(uint8_t mcs) [member function]
+    cls.add_method('McsToWifiMode', 
+                   'ns3::WifiMode', 
+                   [param('uint8_t', 'mcs')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyMonitorSniffRx(ns3::Ptr<ns3::Packet const> packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble, double signalDbm, double noiseDbm) [member function]
     cls.add_method('NotifyMonitorSniffRx', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'channelFreqMhz'), param('uint16_t', 'channelNumber'), param('uint32_t', 'rate'), param('bool', 'isShortPreamble'), param('double', 'signalDbm'), param('double', 'noiseDbm')])
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyMonitorSniffTx(ns3::Ptr<ns3::Packet const> packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyMonitorSniffTx(ns3::Ptr<ns3::Packet const> packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble, uint8_t txPower) [member function]
     cls.add_method('NotifyMonitorSniffTx', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'channelFreqMhz'), param('uint16_t', 'channelNumber'), param('uint32_t', 'rate'), param('bool', 'isShortPreamble')])
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'channelFreqMhz'), param('uint16_t', 'channelNumber'), param('uint32_t', 'rate'), param('bool', 'isShortPreamble'), param('uint8_t', 'txPower')])
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyRxBegin(ns3::Ptr<ns3::Packet const> packet) [member function]
     cls.add_method('NotifyRxBegin', 
                    'void', 
@@ -6059,16 +6572,51 @@
                    'void', 
                    [param('ns3::WifiPhyListener *', 'listener')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SendPacket(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMode mode, ns3::WifiPreamble preamble, uint8_t txPowerLevel) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SendPacket(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMode mode, ns3::WifiPreamble preamble, ns3::WifiTxVector txvector) [member function]
     cls.add_method('SendPacket', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMode', 'mode'), param('ns3::WifiPreamble', 'preamble'), param('uint8_t', 'txPowerLevel')], 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMode', 'mode'), param('ns3::WifiPreamble', 'preamble'), param('ns3::WifiTxVector', 'txvector')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetChannelBonding(bool channelbonding) [member function]
+    cls.add_method('SetChannelBonding', 
+                   'void', 
+                   [param('bool', 'channelbonding')], 
                    is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetChannelNumber(uint16_t id) [member function]
     cls.add_method('SetChannelNumber', 
                    'void', 
                    [param('uint16_t', 'id')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetFrequency(uint32_t freq) [member function]
+    cls.add_method('SetFrequency', 
+                   'void', 
+                   [param('uint32_t', 'freq')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetGreenfield(bool greenfield) [member function]
+    cls.add_method('SetGreenfield', 
+                   'void', 
+                   [param('bool', 'greenfield')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetGuardInterval(bool GuardInterval) [member function]
+    cls.add_method('SetGuardInterval', 
+                   'void', 
+                   [param('bool', 'GuardInterval')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetLdpc(bool Ldpc) [member function]
+    cls.add_method('SetLdpc', 
+                   'void', 
+                   [param('bool', 'Ldpc')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetNumberOfReceiveAntennas(uint32_t rx) [member function]
+    cls.add_method('SetNumberOfReceiveAntennas', 
+                   'void', 
+                   [param('uint32_t', 'rx')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetNumberOfTransmitAntennas(uint32_t tx) [member function]
+    cls.add_method('SetNumberOfTransmitAntennas', 
+                   'void', 
+                   [param('uint32_t', 'tx')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetReceiveErrorCallback(ns3::Callback<void,ns3::Ptr<const ns3::Packet>,double,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> callback) [member function]
     cls.add_method('SetReceiveErrorCallback', 
                    'void', 
@@ -6079,6 +6627,16 @@
                    'void', 
                    [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiMode, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetStbc(bool stbc) [member function]
+    cls.add_method('SetStbc', 
+                   'void', 
+                   [param('bool', 'stbc')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::WifiModeToMcs(ns3::WifiMode mode) [member function]
+    cls.add_method('WifiModeToMcs', 
+                   'uint32_t', 
+                   [param('ns3::WifiMode', 'mode')], 
+                   is_pure_virtual=True, is_virtual=True)
     return
 
 def register_Ns3WifiRemoteStationManager_methods(root_module, cls):
@@ -6086,36 +6644,75 @@
     cls.add_constructor([param('ns3::WifiRemoteStationManager const &', 'arg0')])
     ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationManager::WifiRemoteStationManager() [constructor]
     cls.add_constructor([])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::AddBasicMcs(uint8_t mcs) [member function]
+    cls.add_method('AddBasicMcs', 
+                   'void', 
+                   [param('uint8_t', 'mcs')])
     ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::AddBasicMode(ns3::WifiMode mode) [member function]
     cls.add_method('AddBasicMode', 
                    'void', 
                    [param('ns3::WifiMode', 'mode')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::AddStationHtCapabilities(ns3::Mac48Address from, ns3::HtCapabilities htcapabilities) [member function]
+    cls.add_method('AddStationHtCapabilities', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'from'), param('ns3::HtCapabilities', 'htcapabilities')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::AddSupportedMcs(ns3::Mac48Address address, uint8_t mcs) [member function]
+    cls.add_method('AddSupportedMcs', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address'), param('uint8_t', 'mcs')])
     ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::AddSupportedMode(ns3::Mac48Address address, ns3::WifiMode mode) [member function]
     cls.add_method('AddSupportedMode', 
                    'void', 
                    [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'mode')])
-    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiMode ns3::WifiRemoteStationManager::GetAckMode(ns3::Mac48Address address, ns3::WifiMode dataMode) [member function]
-    cls.add_method('GetAckMode', 
-                   'ns3::WifiMode', 
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::DoGetCtsToSelfTxVector() [member function]
+    cls.add_method('DoGetCtsToSelfTxVector', 
+                   'ns3::WifiTxVector', 
+                   [])
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::GetAckTxVector(ns3::Mac48Address address, ns3::WifiMode dataMode) [member function]
+    cls.add_method('GetAckTxVector', 
+                   'ns3::WifiTxVector', 
                    [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'dataMode')])
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::GetBasicMcs(uint32_t i) const [member function]
+    cls.add_method('GetBasicMcs', 
+                   'uint8_t', 
+                   [param('uint32_t', 'i')], 
+                   is_const=True)
     ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiMode ns3::WifiRemoteStationManager::GetBasicMode(uint32_t i) const [member function]
     cls.add_method('GetBasicMode', 
                    'ns3::WifiMode', 
                    [param('uint32_t', 'i')], 
                    is_const=True)
-    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiMode ns3::WifiRemoteStationManager::GetCtsMode(ns3::Mac48Address address, ns3::WifiMode rtsMode) [member function]
-    cls.add_method('GetCtsMode', 
-                   'ns3::WifiMode', 
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::GetBlockAckTxVector(ns3::Mac48Address address, ns3::WifiMode dataMode) [member function]
+    cls.add_method('GetBlockAckTxVector', 
+                   'ns3::WifiTxVector', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'dataMode')])
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::GetCtsToSelfTxVector(ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('GetCtsToSelfTxVector', 
+                   'ns3::WifiTxVector', 
+                   [param('ns3::WifiMacHeader const *', 'header'), param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::GetCtsTxVector(ns3::Mac48Address address, ns3::WifiMode rtsMode) [member function]
+    cls.add_method('GetCtsTxVector', 
+                   'ns3::WifiTxVector', 
                    [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'rtsMode')])
-    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiMode ns3::WifiRemoteStationManager::GetDataMode(ns3::Mac48Address address, ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet, uint32_t fullPacketSize) [member function]
-    cls.add_method('GetDataMode', 
-                   'ns3::WifiMode', 
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::GetDataTxVector(ns3::Mac48Address address, ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet, uint32_t fullPacketSize) [member function]
+    cls.add_method('GetDataTxVector', 
+                   'ns3::WifiTxVector', 
                    [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint32_t', 'fullPacketSize')])
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::GetDefaultMcs() const [member function]
+    cls.add_method('GetDefaultMcs', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
     ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiMode ns3::WifiRemoteStationManager::GetDefaultMode() const [member function]
     cls.add_method('GetDefaultMode', 
                    'ns3::WifiMode', 
                    [], 
                    is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::GetDefaultTxPowerLevel() const [member function]
+    cls.add_method('GetDefaultTxPowerLevel', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
     ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetFragmentOffset(ns3::Mac48Address address, ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet, uint32_t fragmentNumber) [member function]
     cls.add_method('GetFragmentOffset', 
                    'uint32_t', 
@@ -6129,6 +6726,11 @@
                    'uint32_t', 
                    [], 
                    is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::GetGreenfieldSupported(ns3::Mac48Address address) const [member function]
+    cls.add_method('GetGreenfieldSupported', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address')], 
+                   is_const=True)
     ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationInfo ns3::WifiRemoteStationManager::GetInfo(ns3::Mac48Address address) [member function]
     cls.add_method('GetInfo', 
                    'ns3::WifiRemoteStationInfo', 
@@ -6143,6 +6745,11 @@
                    'uint32_t', 
                    [], 
                    is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetNBasicMcs() const [member function]
+    cls.add_method('GetNBasicMcs', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetNBasicModes() const [member function]
     cls.add_method('GetNBasicModes', 
                    'uint32_t', 
@@ -6153,20 +6760,29 @@
                    'ns3::WifiMode', 
                    [], 
                    is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetNumberOfTransmitAntennas() [member function]
+    cls.add_method('GetNumberOfTransmitAntennas', 
+                   'uint32_t', 
+                   [])
     ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetRtsCtsThreshold() const [member function]
     cls.add_method('GetRtsCtsThreshold', 
                    'uint32_t', 
                    [], 
                    is_const=True)
-    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiMode ns3::WifiRemoteStationManager::GetRtsMode(ns3::Mac48Address address, ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet) [member function]
-    cls.add_method('GetRtsMode', 
-                   'ns3::WifiMode', 
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::GetRtsTxVector(ns3::Mac48Address address, ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('GetRtsTxVector', 
+                   'ns3::WifiTxVector', 
                    [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header'), param('ns3::Ptr< ns3::Packet const >', 'packet')])
     ## wifi-remote-station-manager.h (module 'wifi'): static ns3::TypeId ns3::WifiRemoteStationManager::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
                    'ns3::TypeId', 
                    [], 
                    is_static=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::HasHtSupported() const [member function]
+    cls.add_method('HasHtSupported', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::IsAssociated(ns3::Mac48Address address) const [member function]
     cls.add_method('IsAssociated', 
                    'bool', 
@@ -6186,6 +6802,10 @@
                    'bool', 
                    [param('ns3::Mac48Address', 'address')], 
                    is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::NeedCtsToSelf(ns3::WifiTxVector txVector) [member function]
+    cls.add_method('NeedCtsToSelf', 
+                   'bool', 
+                   [param('ns3::WifiTxVector', 'txVector')])
     ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::NeedDataRetransmission(ns3::Mac48Address address, ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet) [member function]
     cls.add_method('NeedDataRetransmission', 
                    'bool', 
@@ -6258,10 +6878,18 @@
     cls.add_method('Reset', 
                    'void', 
                    [param('ns3::Mac48Address', 'address')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::SetDefaultTxPowerLevel(uint8_t txPower) [member function]
+    cls.add_method('SetDefaultTxPowerLevel', 
+                   'void', 
+                   [param('uint8_t', 'txPower')])
     ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::SetFragmentationThreshold(uint32_t threshold) [member function]
     cls.add_method('SetFragmentationThreshold', 
                    'void', 
                    [param('uint32_t', 'threshold')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::SetHtSupported(bool enable) [member function]
+    cls.add_method('SetHtSupported', 
+                   'void', 
+                   [param('bool', 'enable')])
     ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::SetMaxSlrc(uint32_t maxSlrc) [member function]
     cls.add_method('SetMaxSlrc', 
                    'void', 
@@ -6284,11 +6912,56 @@
                    'void', 
                    [], 
                    visibility='protected', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::GetGreenfield(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetGreenfield', 
+                   'bool', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetLongRetryCount(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetLongRetryCount', 
+                   'uint32_t', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::GetMcsSupported(ns3::WifiRemoteStation const * station, uint32_t i) const [member function]
+    cls.add_method('GetMcsSupported', 
+                   'uint8_t', 
+                   [param('ns3::WifiRemoteStation const *', 'station'), param('uint32_t', 'i')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetNMcsSupported(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetNMcsSupported', 
+                   'uint32_t', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
     ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetNSupported(ns3::WifiRemoteStation const * station) const [member function]
     cls.add_method('GetNSupported', 
                    'uint32_t', 
                    [param('ns3::WifiRemoteStation const *', 'station')], 
                    is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetNumberOfReceiveAntennas(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetNumberOfReceiveAntennas', 
+                   'uint32_t', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetNumberOfTransmitAntennas(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetNumberOfTransmitAntennas', 
+                   'uint32_t', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::GetShortGuardInterval(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetShortGuardInterval', 
+                   'bool', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetShortRetryCount(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetShortRetryCount', 
+                   'uint32_t', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::GetStbc(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetStbc', 
+                   'bool', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
     ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiMode ns3::WifiRemoteStationManager::GetSupported(ns3::WifiRemoteStation const * station, uint32_t i) const [member function]
     cls.add_method('GetSupported', 
                    'ns3::WifiMode', 
@@ -6299,14 +6972,89 @@
                    'ns3::WifiRemoteStation *', 
                    [], 
                    is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
-    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiMode ns3::WifiRemoteStationManager::DoGetDataMode(ns3::WifiRemoteStation * station, uint32_t size) [member function]
-    cls.add_method('DoGetDataMode', 
-                   'ns3::WifiMode', 
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoGetAckTxGuardInterval(ns3::Mac48Address address, ns3::WifiMode ackMode) [member function]
+    cls.add_method('DoGetAckTxGuardInterval', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ackMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetAckTxNess(ns3::Mac48Address address, ns3::WifiMode ackMode) [member function]
+    cls.add_method('DoGetAckTxNess', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ackMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetAckTxNss(ns3::Mac48Address address, ns3::WifiMode ackMode) [member function]
+    cls.add_method('DoGetAckTxNss', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ackMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetAckTxPowerLevel(ns3::Mac48Address address, ns3::WifiMode ackMode) [member function]
+    cls.add_method('DoGetAckTxPowerLevel', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ackMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoGetAckTxStbc(ns3::Mac48Address address, ns3::WifiMode ackMode) [member function]
+    cls.add_method('DoGetAckTxStbc', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ackMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoGetBlockAckTxGuardInterval(ns3::Mac48Address address, ns3::WifiMode blockAckMode) [member function]
+    cls.add_method('DoGetBlockAckTxGuardInterval', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'blockAckMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetBlockAckTxNess(ns3::Mac48Address address, ns3::WifiMode blockAckMode) [member function]
+    cls.add_method('DoGetBlockAckTxNess', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'blockAckMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetBlockAckTxNss(ns3::Mac48Address address, ns3::WifiMode blockAckMode) [member function]
+    cls.add_method('DoGetBlockAckTxNss', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'blockAckMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetBlockAckTxPowerLevel(ns3::Mac48Address address, ns3::WifiMode blockAckMode) [member function]
+    cls.add_method('DoGetBlockAckTxPowerLevel', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'blockAckMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoGetBlockAckTxStbc(ns3::Mac48Address address, ns3::WifiMode blockAckMode) [member function]
+    cls.add_method('DoGetBlockAckTxStbc', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'blockAckMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoGetCtsTxGuardInterval(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function]
+    cls.add_method('DoGetCtsTxGuardInterval', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ctsMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetCtsTxNess(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function]
+    cls.add_method('DoGetCtsTxNess', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ctsMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetCtsTxNss(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function]
+    cls.add_method('DoGetCtsTxNss', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ctsMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetCtsTxPowerLevel(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function]
+    cls.add_method('DoGetCtsTxPowerLevel', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ctsMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoGetCtsTxStbc(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function]
+    cls.add_method('DoGetCtsTxStbc', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ctsMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::DoGetDataTxVector(ns3::WifiRemoteStation * station, uint32_t size) [member function]
+    cls.add_method('DoGetDataTxVector', 
+                   'ns3::WifiTxVector', 
                    [param('ns3::WifiRemoteStation *', 'station'), param('uint32_t', 'size')], 
                    is_pure_virtual=True, visibility='private', is_virtual=True)
-    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiMode ns3::WifiRemoteStationManager::DoGetRtsMode(ns3::WifiRemoteStation * station) [member function]
-    cls.add_method('DoGetRtsMode', 
-                   'ns3::WifiMode', 
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::DoGetRtsTxVector(ns3::WifiRemoteStation * station) [member function]
+    cls.add_method('DoGetRtsTxVector', 
+                   'ns3::WifiTxVector', 
                    [param('ns3::WifiRemoteStation *', 'station')], 
                    is_pure_virtual=True, visibility='private', is_virtual=True)
     ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoNeedDataRetransmission(ns3::WifiRemoteStation * station, ns3::Ptr<ns3::Packet const> packet, bool normally) [member function]
@@ -7056,6 +7804,168 @@
                    is_virtual=True)
     return
 
+def register_Ns3HtCapabilities_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilities::HtCapabilities(ns3::HtCapabilities const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::HtCapabilities const &', 'arg0')])
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilities::HtCapabilities() [constructor]
+    cls.add_constructor([])
+    ## ht-capabilities.h (module 'wifi'): uint8_t ns3::HtCapabilities::DeserializeInformationField(ns3::Buffer::Iterator start, uint8_t length) [member function]
+    cls.add_method('DeserializeInformationField', 
+                   'uint8_t', 
+                   [param('ns3::Buffer::Iterator', 'start'), param('uint8_t', 'length')], 
+                   is_virtual=True)
+    ## ht-capabilities.h (module 'wifi'): ns3::WifiInformationElementId ns3::HtCapabilities::ElementId() const [member function]
+    cls.add_method('ElementId', 
+                   'ns3::WifiInformationElementId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ht-capabilities.h (module 'wifi'): uint8_t ns3::HtCapabilities::GetAmpduParameters() const [member function]
+    cls.add_method('GetAmpduParameters', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): uint8_t ns3::HtCapabilities::GetGreenfield() const [member function]
+    cls.add_method('GetGreenfield', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): uint16_t ns3::HtCapabilities::GetHtCapabilitiesInfo() const [member function]
+    cls.add_method('GetHtCapabilitiesInfo', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): uint8_t ns3::HtCapabilities::GetInformationFieldSize() const [member function]
+    cls.add_method('GetInformationFieldSize', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ht-capabilities.h (module 'wifi'): uint8_t ns3::HtCapabilities::GetLdpc() const [member function]
+    cls.add_method('GetLdpc', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): uint8_t * ns3::HtCapabilities::GetRxMcsBitmask() [member function]
+    cls.add_method('GetRxMcsBitmask', 
+                   'uint8_t *', 
+                   [])
+    ## ht-capabilities.h (module 'wifi'): uint16_t ns3::HtCapabilities::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): uint8_t ns3::HtCapabilities::GetShortGuardInterval20() const [member function]
+    cls.add_method('GetShortGuardInterval20', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): uint8_t ns3::HtCapabilities::GetSupportedChannelWidth() const [member function]
+    cls.add_method('GetSupportedChannelWidth', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): uint64_t ns3::HtCapabilities::GetSupportedMcsSet1() const [member function]
+    cls.add_method('GetSupportedMcsSet1', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): uint64_t ns3::HtCapabilities::GetSupportedMcsSet2() const [member function]
+    cls.add_method('GetSupportedMcsSet2', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): bool ns3::HtCapabilities::IsSupportedMcs(uint8_t mcs) [member function]
+    cls.add_method('IsSupportedMcs', 
+                   'bool', 
+                   [param('uint8_t', 'mcs')])
+    ## ht-capabilities.h (module 'wifi'): ns3::Buffer::Iterator ns3::HtCapabilities::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'ns3::Buffer::Iterator', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SerializeInformationField(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('SerializeInformationField', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetAmpduParameters(uint8_t ctrl) [member function]
+    cls.add_method('SetAmpduParameters', 
+                   'void', 
+                   [param('uint8_t', 'ctrl')])
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetGreenfield(uint8_t greenfield) [member function]
+    cls.add_method('SetGreenfield', 
+                   'void', 
+                   [param('uint8_t', 'greenfield')])
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetHtCapabilitiesInfo(uint16_t ctrl) [member function]
+    cls.add_method('SetHtCapabilitiesInfo', 
+                   'void', 
+                   [param('uint16_t', 'ctrl')])
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetHtSupported(uint8_t htsupported) [member function]
+    cls.add_method('SetHtSupported', 
+                   'void', 
+                   [param('uint8_t', 'htsupported')])
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetLdpc(uint8_t ldpc) [member function]
+    cls.add_method('SetLdpc', 
+                   'void', 
+                   [param('uint8_t', 'ldpc')])
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetRxMcsBitmask(uint8_t index) [member function]
+    cls.add_method('SetRxMcsBitmask', 
+                   'void', 
+                   [param('uint8_t', 'index')])
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetShortGuardInterval20(uint8_t shortguardinterval) [member function]
+    cls.add_method('SetShortGuardInterval20', 
+                   'void', 
+                   [param('uint8_t', 'shortguardinterval')])
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetSupportedChannelWidth(uint8_t supportedchannelwidth) [member function]
+    cls.add_method('SetSupportedChannelWidth', 
+                   'void', 
+                   [param('uint8_t', 'supportedchannelwidth')])
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetSupportedMcsSet(uint64_t ctrl1, uint64_t ctrl2) [member function]
+    cls.add_method('SetSupportedMcsSet', 
+                   'void', 
+                   [param('uint64_t', 'ctrl1'), param('uint64_t', 'ctrl2')])
+    return
+
+def register_Ns3HtCapabilitiesChecker_methods(root_module, cls):
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilitiesChecker::HtCapabilitiesChecker() [constructor]
+    cls.add_constructor([])
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilitiesChecker::HtCapabilitiesChecker(ns3::HtCapabilitiesChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::HtCapabilitiesChecker const &', 'arg0')])
+    return
+
+def register_Ns3HtCapabilitiesValue_methods(root_module, cls):
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilitiesValue::HtCapabilitiesValue() [constructor]
+    cls.add_constructor([])
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilitiesValue::HtCapabilitiesValue(ns3::HtCapabilitiesValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::HtCapabilitiesValue const &', 'arg0')])
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilitiesValue::HtCapabilitiesValue(ns3::HtCapabilities const & value) [constructor]
+    cls.add_constructor([param('ns3::HtCapabilities const &', 'value')])
+    ## ht-capabilities.h (module 'wifi'): ns3::Ptr<ns3::AttributeValue> ns3::HtCapabilitiesValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ht-capabilities.h (module 'wifi'): bool ns3::HtCapabilitiesValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilities ns3::HtCapabilitiesValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::HtCapabilities', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): std::string ns3::HtCapabilitiesValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilitiesValue::Set(ns3::HtCapabilities const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::HtCapabilities const &', 'value')])
+    return
+
 def register_Ns3IpL4Protocol_methods(root_module, cls):
     ## ip-l4-protocol.h (module 'internet'): ns3::IpL4Protocol::IpL4Protocol() [constructor]
     cls.add_constructor([])
@@ -7223,6 +8133,11 @@
                    'bool', 
                    [param('uint32_t', 'interface'), param('uint32_t', 'addressIndex')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## ipv4.h (module 'internet'): bool ns3::Ipv4::RemoveAddress(uint32_t interface, ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4Address', 'address')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## ipv4.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4::SelectSourceAddress(ns3::Ptr<const ns3::NetDevice> device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function]
     cls.add_method('SelectSourceAddress', 
                    'ns3::Ipv4Address', 
@@ -7385,6 +8300,10 @@
     cls.add_method('RemoveAddress', 
                    'ns3::Ipv4InterfaceAddress', 
                    [param('uint32_t', 'index')])
+    ## ipv4-interface.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4Interface::RemoveAddress(ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'ns3::Ipv4InterfaceAddress', 
+                   [param('ns3::Ipv4Address', 'address')])
     ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::Send(ns3::Ptr<ns3::Packet> p, ns3::Ipv4Address dest) [member function]
     cls.add_method('Send', 
                    'void', 
@@ -7545,6 +8464,11 @@
                    'bool', 
                    [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], 
                    is_virtual=True)
+    ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interface, ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4Address', 'address')], 
+                   is_virtual=True)
     ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr<const ns3::NetDevice> device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function]
     cls.add_method('SelectSourceAddress', 
                    'ns3::Ipv4Address', 
@@ -7937,6 +8861,10 @@
     cls.add_method('RemoveAddress', 
                    'ns3::Ipv6InterfaceAddress', 
                    [param('uint32_t', 'index')])
+    ## ipv6-interface.h (module 'internet'): ns3::Ipv6InterfaceAddress ns3::Ipv6Interface::RemoveAddress(ns3::Ipv6Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'ns3::Ipv6InterfaceAddress', 
+                   [param('ns3::Ipv6Address', 'address')])
     ## ipv6-interface.h (module 'internet'): void ns3::Ipv6Interface::Send(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Address dest) [member function]
     cls.add_method('Send', 
                    'void', 
@@ -8641,6 +9569,10 @@
     cls.add_method('RemoveTrailer', 
                    'uint32_t', 
                    [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('ReplacePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
     cls.add_method('Serialize', 
                    'uint32_t', 
@@ -8917,13 +9849,6 @@
                    visibility='protected', is_virtual=True)
     return
 
-def register_Ns3TimeChecker_methods(root_module, cls):
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor]
-    cls.add_constructor([])
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')])
-    return
-
 def register_Ns3TimeValue_methods(root_module, cls):
     ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
     cls.add_constructor([])
@@ -9329,6 +10254,111 @@
                    visibility='private', is_virtual=True)
     return
 
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_Ns3DsrBlackList_methods(root_module, cls):
     ## dsr-rreq-table.h (module 'dsr'): ns3::dsr::BlackList::BlackList(ns3::dsr::BlackList const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::dsr::BlackList const &', 'arg0')])
@@ -10009,10 +11039,6 @@
                    'void', 
                    [param('std::ostream &', 'os')], 
                    is_const=True, is_virtual=True)
-    ## dsr-option-header.h (module 'dsr'): ns3::Ipv4Address ns3::dsr::DsrOptionRrepHeader::SearchNextHop(ns3::Ipv4Address ipv4Address) [member function]
-    cls.add_method('SearchNextHop', 
-                   'ns3::Ipv4Address', 
-                   [param('ns3::Ipv4Address', 'ipv4Address')])
     ## dsr-option-header.h (module 'dsr'): void ns3::dsr::DsrOptionRrepHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
     cls.add_method('Serialize', 
                    'void', 
@@ -10051,11 +11077,6 @@
                    'ns3::dsr::DsrOptionHeader::Alignment', 
                    [], 
                    is_const=True, is_virtual=True)
-    ## dsr-option-header.h (module 'dsr'): uint32_t ns3::dsr::DsrOptionRreqHeader::GetDataLength() const [member function]
-    cls.add_method('GetDataLength', 
-                   'uint32_t', 
-                   [], 
-                   is_const=True)
     ## dsr-option-header.h (module 'dsr'): uint16_t ns3::dsr::DsrOptionRreqHeader::GetId() const [member function]
     cls.add_method('GetId', 
                    'uint16_t', 
@@ -10105,10 +11126,6 @@
                    'void', 
                    [param('ns3::Buffer::Iterator', 'start')], 
                    is_const=True, is_virtual=True)
-    ## dsr-option-header.h (module 'dsr'): void ns3::dsr::DsrOptionRreqHeader::SetDataLength(uint32_t dataLength) [member function]
-    cls.add_method('SetDataLength', 
-                   'void', 
-                   [param('uint32_t', 'dataLength')])
     ## dsr-option-header.h (module 'dsr'): void ns3::dsr::DsrOptionRreqHeader::SetId(uint16_t identification) [member function]
     cls.add_method('SetId', 
                    'void', 
@@ -10394,11 +11411,6 @@
     cls.add_method('GetElementsFromContext', 
                    'std::vector< std::string >', 
                    [param('std::string', 'context')])
-    ## dsr-routing.h (module 'dsr'): uint8_t ns3::dsr::DsrRouting::GetExtensionNumber() const [member function]
-    cls.add_method('GetExtensionNumber', 
-                   'uint8_t', 
-                   [], 
-                   is_const=True)
     ## dsr-routing.h (module 'dsr'): uint16_t ns3::dsr::DsrRouting::GetIDfromIP(ns3::Ipv4Address address) [member function]
     cls.add_method('GetIDfromIP', 
                    'uint16_t', 
@@ -10603,10 +11615,6 @@
     cls.add_method('SendRequest', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source')])
-    ## dsr-routing.h (module 'dsr'): void ns3::dsr::DsrRouting::SendRequestAndIncrement(ns3::Ptr<ns3::Packet> packet, ns3::Ipv4Address source, ns3::Ipv4Address destination) [member function]
-    cls.add_method('SendRequestAndIncrement', 
-                   'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination')])
     ## dsr-routing.h (module 'dsr'): void ns3::dsr::DsrRouting::SendUnreachError(ns3::Ipv4Address errorHop, ns3::Ipv4Address destination, ns3::Ipv4Address originalDst, uint8_t salvage, uint8_t protocol) [member function]
     cls.add_method('SendUnreachError', 
                    'void', 
@@ -11334,10 +12342,6 @@
     cls.add_method('DeleteRoute', 
                    'bool', 
                    [param('ns3::Ipv4Address', 'dst')])
-    ## dsr-rcache.h (module 'dsr'): void ns3::dsr::RouteCache::DropPathWithDst(ns3::Ipv4Address dst) [member function]
-    cls.add_method('DropPathWithDst', 
-                   'void', 
-                   [param('ns3::Ipv4Address', 'dst')])
     ## dsr-rcache.h (module 'dsr'): bool ns3::dsr::RouteCache::FindSameRoute(ns3::dsr::RouteCacheEntry & rt, std::list<ns3::dsr::RouteCacheEntry, std::allocator<ns3::dsr::RouteCacheEntry> > & rtVector) [member function]
     cls.add_method('FindSameRoute', 
                    'bool', 
@@ -11361,11 +12365,6 @@
                    'ns3::Callback< void, ns3::Ipv4Address, unsigned char, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 
                    [], 
                    is_const=True)
-    ## dsr-rcache.h (module 'dsr'): ns3::Ipv4Address ns3::dsr::RouteCache::GetDestination() const [member function]
-    cls.add_method('GetDestination', 
-                   'ns3::Ipv4Address', 
-                   [], 
-                   is_const=True)
     ## dsr-rcache.h (module 'dsr'): ns3::Time ns3::dsr::RouteCache::GetExpireTime(ns3::Ipv4Address addr) [member function]
     cls.add_method('GetExpireTime', 
                    'ns3::Time', 
@@ -11420,10 +12419,6 @@
                    'ns3::Time', 
                    [], 
                    is_const=True)
-    ## dsr-rcache.h (module 'dsr'): bool ns3::dsr::RouteCache::IsEqual(ns3::dsr::RouteCacheEntry ca) [member function]
-    cls.add_method('IsEqual', 
-                   'bool', 
-                   [param('ns3::dsr::RouteCacheEntry', 'ca')])
     ## dsr-rcache.h (module 'dsr'): bool ns3::dsr::RouteCache::IsLinkCache() [member function]
     cls.add_method('IsLinkCache', 
                    'bool', 
@@ -12182,6 +13177,7 @@
 def register_functions(root_module):
     module = root_module
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     register_functions_ns3_dsr(module.get_submodule('dsr'), root_module)
     register_functions_ns3_internal(module.get_submodule('internal'), root_module)
     return
@@ -12189,6 +13185,13 @@
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def register_functions_ns3_dsr(module, root_module):
     return
 
diff -Naur ns-3.17/src/dsr/bindings/modulegen__gcc_LP64.py ns-3.18/src/dsr/bindings/modulegen__gcc_LP64.py
--- ns-3.17/src/dsr/bindings/modulegen__gcc_LP64.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/dsr/bindings/modulegen__gcc_LP64.py	2013-10-26 07:07:29.839364388 -0700
@@ -21,17 +21,17 @@
     root_module = module.get_root()
     
     ## wifi-mac-header.h (module 'wifi'): ns3::WifiMacType [enumeration]
-    module.add_enum('WifiMacType', ['WIFI_MAC_CTL_RTS', 'WIFI_MAC_CTL_CTS', 'WIFI_MAC_CTL_ACK', 'WIFI_MAC_CTL_BACKREQ', 'WIFI_MAC_CTL_BACKRESP', 'WIFI_MAC_MGT_BEACON', 'WIFI_MAC_MGT_ASSOCIATION_REQUEST', 'WIFI_MAC_MGT_ASSOCIATION_RESPONSE', 'WIFI_MAC_MGT_DISASSOCIATION', 'WIFI_MAC_MGT_REASSOCIATION_REQUEST', 'WIFI_MAC_MGT_REASSOCIATION_RESPONSE', 'WIFI_MAC_MGT_PROBE_REQUEST', 'WIFI_MAC_MGT_PROBE_RESPONSE', 'WIFI_MAC_MGT_AUTHENTICATION', 'WIFI_MAC_MGT_DEAUTHENTICATION', 'WIFI_MAC_MGT_ACTION', 'WIFI_MAC_MGT_ACTION_NO_ACK', 'WIFI_MAC_MGT_MULTIHOP_ACTION', 'WIFI_MAC_DATA', 'WIFI_MAC_DATA_CFACK', 'WIFI_MAC_DATA_CFPOLL', 'WIFI_MAC_DATA_CFACK_CFPOLL', 'WIFI_MAC_DATA_NULL', 'WIFI_MAC_DATA_NULL_CFACK', 'WIFI_MAC_DATA_NULL_CFPOLL', 'WIFI_MAC_DATA_NULL_CFACK_CFPOLL', 'WIFI_MAC_QOSDATA', 'WIFI_MAC_QOSDATA_CFACK', 'WIFI_MAC_QOSDATA_CFPOLL', 'WIFI_MAC_QOSDATA_CFACK_CFPOLL', 'WIFI_MAC_QOSDATA_NULL', 'WIFI_MAC_QOSDATA_NULL_CFPOLL', 'WIFI_MAC_QOSDATA_NULL_CFACK_CFPOLL'], import_from_module='ns.wifi')
+    module.add_enum('WifiMacType', ['WIFI_MAC_CTL_RTS', 'WIFI_MAC_CTL_CTS', 'WIFI_MAC_CTL_ACK', 'WIFI_MAC_CTL_BACKREQ', 'WIFI_MAC_CTL_BACKRESP', 'WIFI_MAC_CTL_CTLWRAPPER', 'WIFI_MAC_MGT_BEACON', 'WIFI_MAC_MGT_ASSOCIATION_REQUEST', 'WIFI_MAC_MGT_ASSOCIATION_RESPONSE', 'WIFI_MAC_MGT_DISASSOCIATION', 'WIFI_MAC_MGT_REASSOCIATION_REQUEST', 'WIFI_MAC_MGT_REASSOCIATION_RESPONSE', 'WIFI_MAC_MGT_PROBE_REQUEST', 'WIFI_MAC_MGT_PROBE_RESPONSE', 'WIFI_MAC_MGT_AUTHENTICATION', 'WIFI_MAC_MGT_DEAUTHENTICATION', 'WIFI_MAC_MGT_ACTION', 'WIFI_MAC_MGT_ACTION_NO_ACK', 'WIFI_MAC_MGT_MULTIHOP_ACTION', 'WIFI_MAC_DATA', 'WIFI_MAC_DATA_CFACK', 'WIFI_MAC_DATA_CFPOLL', 'WIFI_MAC_DATA_CFACK_CFPOLL', 'WIFI_MAC_DATA_NULL', 'WIFI_MAC_DATA_NULL_CFACK', 'WIFI_MAC_DATA_NULL_CFPOLL', 'WIFI_MAC_DATA_NULL_CFACK_CFPOLL', 'WIFI_MAC_QOSDATA', 'WIFI_MAC_QOSDATA_CFACK', 'WIFI_MAC_QOSDATA_CFPOLL', 'WIFI_MAC_QOSDATA_CFACK_CFPOLL', 'WIFI_MAC_QOSDATA_NULL', 'WIFI_MAC_QOSDATA_NULL_CFPOLL', 'WIFI_MAC_QOSDATA_NULL_CFACK_CFPOLL'], import_from_module='ns.wifi')
     ## wifi-preamble.h (module 'wifi'): ns3::WifiPreamble [enumeration]
-    module.add_enum('WifiPreamble', ['WIFI_PREAMBLE_LONG', 'WIFI_PREAMBLE_SHORT'], import_from_module='ns.wifi')
+    module.add_enum('WifiPreamble', ['WIFI_PREAMBLE_LONG', 'WIFI_PREAMBLE_SHORT', 'WIFI_PREAMBLE_HT_MF', 'WIFI_PREAMBLE_HT_GF'], import_from_module='ns.wifi')
     ## wifi-mode.h (module 'wifi'): ns3::WifiModulationClass [enumeration]
     module.add_enum('WifiModulationClass', ['WIFI_MOD_CLASS_UNKNOWN', 'WIFI_MOD_CLASS_IR', 'WIFI_MOD_CLASS_FHSS', 'WIFI_MOD_CLASS_DSSS', 'WIFI_MOD_CLASS_ERP_PBCC', 'WIFI_MOD_CLASS_DSSS_OFDM', 'WIFI_MOD_CLASS_ERP_OFDM', 'WIFI_MOD_CLASS_OFDM', 'WIFI_MOD_CLASS_HT'], import_from_module='ns.wifi')
     ## wifi-phy-standard.h (module 'wifi'): ns3::WifiPhyStandard [enumeration]
-    module.add_enum('WifiPhyStandard', ['WIFI_PHY_STANDARD_80211a', 'WIFI_PHY_STANDARD_80211b', 'WIFI_PHY_STANDARD_80211g', 'WIFI_PHY_STANDARD_80211_10MHZ', 'WIFI_PHY_STANDARD_80211_5MHZ', 'WIFI_PHY_STANDARD_holland', 'WIFI_PHY_STANDARD_80211p_CCH', 'WIFI_PHY_STANDARD_80211p_SCH'], import_from_module='ns.wifi')
+    module.add_enum('WifiPhyStandard', ['WIFI_PHY_STANDARD_80211a', 'WIFI_PHY_STANDARD_80211b', 'WIFI_PHY_STANDARD_80211g', 'WIFI_PHY_STANDARD_80211_10MHZ', 'WIFI_PHY_STANDARD_80211_5MHZ', 'WIFI_PHY_STANDARD_holland', 'WIFI_PHY_STANDARD_80211p_CCH', 'WIFI_PHY_STANDARD_80211p_SCH', 'WIFI_PHY_STANDARD_80211n_2_4GHZ', 'WIFI_PHY_STANDARD_80211n_5GHZ'], import_from_module='ns.wifi')
     ## qos-utils.h (module 'wifi'): ns3::AcIndex [enumeration]
     module.add_enum('AcIndex', ['AC_BE', 'AC_BK', 'AC_VI', 'AC_VO', 'AC_BE_NQOS', 'AC_UNDEF'], import_from_module='ns.wifi')
     ## wifi-mode.h (module 'wifi'): ns3::WifiCodeRate [enumeration]
-    module.add_enum('WifiCodeRate', ['WIFI_CODE_RATE_UNDEFINED', 'WIFI_CODE_RATE_3_4', 'WIFI_CODE_RATE_2_3', 'WIFI_CODE_RATE_1_2'], import_from_module='ns.wifi')
+    module.add_enum('WifiCodeRate', ['WIFI_CODE_RATE_UNDEFINED', 'WIFI_CODE_RATE_3_4', 'WIFI_CODE_RATE_2_3', 'WIFI_CODE_RATE_1_2', 'WIFI_CODE_RATE_5_6'], import_from_module='ns.wifi')
     ## address.h (module 'network'): ns3::Address [class]
     module.add_class('Address', import_from_module='ns.network')
     ## address.h (module 'network'): ns3::Address::MaxSize_e [enumeration]
@@ -60,10 +60,12 @@
     module.add_class('DsrHelper')
     ## dsr-main-helper.h (module 'dsr'): ns3::DsrMainHelper [class]
     module.add_class('DsrMainHelper')
-    ## event-garbage-collector.h (module 'tools'): ns3::EventGarbageCollector [class]
-    module.add_class('EventGarbageCollector', import_from_module='ns.tools')
+    ## event-garbage-collector.h (module 'core'): ns3::EventGarbageCollector [class]
+    module.add_class('EventGarbageCollector', import_from_module='ns.core')
     ## event-id.h (module 'core'): ns3::EventId [class]
     module.add_class('EventId', import_from_module='ns.core')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress [class]
     module.add_class('Inet6SocketAddress', import_from_module='ns.network')
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress [class]
@@ -150,6 +152,8 @@
     module.add_class('PacketTagList', import_from_module='ns.network')
     ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct]
     module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration]
+    module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network')
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter> [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simulator.h (module 'core'): ns3::Simulator [class]
@@ -190,6 +194,8 @@
     module.add_class('WifiRemoteStationState', import_from_module='ns.wifi')
     ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState [enumeration]
     module.add_enum('', ['BRAND_NEW', 'DISASSOC', 'WAIT_ASSOC_TX_OK', 'GOT_ASSOC_TX_OK'], outer_class=root_module['ns3::WifiRemoteStationState'], import_from_module='ns.wifi')
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector [class]
+    module.add_class('WifiTxVector', import_from_module='ns.wifi')
     ## empty.h (module 'core'): ns3::empty [class]
     module.add_class('empty', import_from_module='ns.core')
     ## int64x64-double.h (module 'core'): ns3::int64x64_t [class]
@@ -215,9 +221,9 @@
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header [class]
     module.add_class('Ipv4Header', import_from_module='ns.internet', parent=root_module['ns3::Header'])
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType [enumeration]
-    module.add_enum('DscpType', ['DscpDefault', 'CS1', 'AF11', 'AF12', 'AF13', 'CS2', 'AF21', 'AF22', 'AF23', 'CS3', 'AF31', 'AF32', 'AF33', 'CS4', 'AF41', 'AF42', 'AF43', 'CS5', 'EF', 'CS6', 'CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
+    module.add_enum('DscpType', ['DscpDefault', 'DSCP_CS1', 'DSCP_AF11', 'DSCP_AF12', 'DSCP_AF13', 'DSCP_CS2', 'DSCP_AF21', 'DSCP_AF22', 'DSCP_AF23', 'DSCP_CS3', 'DSCP_AF31', 'DSCP_AF32', 'DSCP_AF33', 'DSCP_CS4', 'DSCP_AF41', 'DSCP_AF42', 'DSCP_AF43', 'DSCP_CS5', 'DSCP_EF', 'DSCP_CS6', 'DSCP_CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType [enumeration]
-    module.add_enum('EcnType', ['NotECT', 'ECT1', 'ECT0', 'CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
+    module.add_enum('EcnType', ['ECN_NotECT', 'ECN_ECT1', 'ECN_ECT0', 'ECN_CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
     ## ipv6-header.h (module 'internet'): ns3::Ipv6Header [class]
     module.add_class('Ipv6Header', import_from_module='ns.internet', parent=root_module['ns3::Header'])
     ## ipv6-header.h (module 'internet'): ns3::Ipv6Header::NextHeader_e [enumeration]
@@ -240,6 +246,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Ipv4MulticastRoute', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Ipv4MulticastRoute>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> > [class]
@@ -344,6 +352,12 @@
     module.add_class('ExponentialRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
     ## random-variable-stream.h (module 'core'): ns3::GammaRandomVariable [class]
     module.add_class('GammaRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilities [class]
+    module.add_class('HtCapabilities', import_from_module='ns.wifi', parent=root_module['ns3::WifiInformationElement'])
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilitiesChecker [class]
+    module.add_class('HtCapabilitiesChecker', import_from_module='ns.wifi', parent=root_module['ns3::AttributeChecker'])
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilitiesValue [class]
+    module.add_class('HtCapabilitiesValue', import_from_module='ns.wifi', parent=root_module['ns3::AttributeValue'])
     ## ip-l4-protocol.h (module 'internet'): ns3::IpL4Protocol [class]
     module.add_class('IpL4Protocol', import_from_module='ns.internet', parent=root_module['ns3::Object'])
     ## ip-l4-protocol.h (module 'internet'): ns3::IpL4Protocol::RxStatus [enumeration]
@@ -414,8 +428,6 @@
     module.add_class('SsidValue', import_from_module='ns.wifi', parent=root_module['ns3::AttributeValue'])
     ## tcp-l4-protocol.h (module 'internet'): ns3::TcpL4Protocol [class]
     module.add_class('TcpL4Protocol', import_from_module='ns.internet', parent=root_module['ns3::IpL4Protocol'])
-    ## nstime.h (module 'core'): ns3::TimeChecker [class]
-    module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
     module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
@@ -437,8 +449,15 @@
     ## icmpv4-l4-protocol.h (module 'internet'): ns3::Icmpv4L4Protocol [class]
     module.add_class('Icmpv4L4Protocol', import_from_module='ns.internet', parent=root_module['ns3::IpL4Protocol'])
     module.add_container('ns3::WifiModeList', 'ns3::WifiMode', container_type='vector')
+    module.add_container('ns3::WifiMcsList', 'unsigned char', container_type='vector')
     module.add_container('std::list< ns3::Ptr< ns3::Packet > >', 'ns3::Ptr< ns3::Packet >', container_type='list')
     module.add_container('std::map< unsigned int, unsigned int >', ('unsigned int', 'unsigned int'), container_type='map')
+    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< unsigned char const *, std::vector< unsigned char, std::allocator< unsigned char > > >', 'ns3::WifiMcsListIterator')
+    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< unsigned char const *, std::vector< unsigned char, std::allocator< unsigned char > > >*', 'ns3::WifiMcsListIterator*')
+    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< unsigned char const *, std::vector< unsigned char, std::allocator< unsigned char > > >&', 'ns3::WifiMcsListIterator&')
+    typehandlers.add_type_alias('std::vector< unsigned char, std::allocator< unsigned char > >', 'ns3::WifiMcsList')
+    typehandlers.add_type_alias('std::vector< unsigned char, std::allocator< unsigned char > >*', 'ns3::WifiMcsList*')
+    typehandlers.add_type_alias('std::vector< unsigned char, std::allocator< unsigned char > >&', 'ns3::WifiMcsList&')
     typehandlers.add_type_alias('uint8_t', 'ns3::WifiInformationElementId')
     typehandlers.add_type_alias('uint8_t*', 'ns3::WifiInformationElementId*')
     typehandlers.add_type_alias('uint8_t&', 'ns3::WifiInformationElementId&')
@@ -455,6 +474,12 @@
     register_types_ns3_FatalImpl(nested_module)
     
     
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
+    
     ## Register a nested module for the namespace dsr
     
     nested_module = module.add_cpp_namespace('dsr')
@@ -471,6 +496,36 @@
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_types_ns3_dsr(module):
     root_module = module.get_root()
     
@@ -611,6 +666,7 @@
     register_Ns3DsrMainHelper_methods(root_module, root_module['ns3::DsrMainHelper'])
     register_Ns3EventGarbageCollector_methods(root_module, root_module['ns3::EventGarbageCollector'])
     register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3Inet6SocketAddress_methods(root_module, root_module['ns3::Inet6SocketAddress'])
     register_Ns3InetSocketAddress_methods(root_module, root_module['ns3::InetSocketAddress'])
     register_Ns3IntToType__0_methods(root_module, root_module['ns3::IntToType< 0 >'])
@@ -654,6 +710,7 @@
     register_Ns3WifiRemoteStation_methods(root_module, root_module['ns3::WifiRemoteStation'])
     register_Ns3WifiRemoteStationInfo_methods(root_module, root_module['ns3::WifiRemoteStationInfo'])
     register_Ns3WifiRemoteStationState_methods(root_module, root_module['ns3::WifiRemoteStationState'])
+    register_Ns3WifiTxVector_methods(root_module, root_module['ns3::WifiTxVector'])
     register_Ns3Empty_methods(root_module, root_module['ns3::empty'])
     register_Ns3Int64x64_t_methods(root_module, root_module['ns3::int64x64_t'])
     register_Ns3Chunk_methods(root_module, root_module['ns3::Chunk'])
@@ -673,6 +730,7 @@
     register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
     register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3Ipv4MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4MulticastRoute__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> >'])
     register_Ns3SimpleRefCount__Ns3Ipv4Route_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4Route__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> >'])
     register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
@@ -718,6 +776,9 @@
     register_Ns3EventImpl_methods(root_module, root_module['ns3::EventImpl'])
     register_Ns3ExponentialRandomVariable_methods(root_module, root_module['ns3::ExponentialRandomVariable'])
     register_Ns3GammaRandomVariable_methods(root_module, root_module['ns3::GammaRandomVariable'])
+    register_Ns3HtCapabilities_methods(root_module, root_module['ns3::HtCapabilities'])
+    register_Ns3HtCapabilitiesChecker_methods(root_module, root_module['ns3::HtCapabilitiesChecker'])
+    register_Ns3HtCapabilitiesValue_methods(root_module, root_module['ns3::HtCapabilitiesValue'])
     register_Ns3IpL4Protocol_methods(root_module, root_module['ns3::IpL4Protocol'])
     register_Ns3Ipv4_methods(root_module, root_module['ns3::Ipv4'])
     register_Ns3Ipv4AddressChecker_methods(root_module, root_module['ns3::Ipv4AddressChecker'])
@@ -750,7 +811,6 @@
     register_Ns3SsidChecker_methods(root_module, root_module['ns3::SsidChecker'])
     register_Ns3SsidValue_methods(root_module, root_module['ns3::SsidValue'])
     register_Ns3TcpL4Protocol_methods(root_module, root_module['ns3::TcpL4Protocol'])
-    register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
     register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
@@ -761,6 +821,11 @@
     register_Ns3AddressChecker_methods(root_module, root_module['ns3::AddressChecker'])
     register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue'])
     register_Ns3Icmpv4L4Protocol_methods(root_module, root_module['ns3::Icmpv4L4Protocol'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     register_Ns3DsrBlackList_methods(root_module, root_module['ns3::dsr::BlackList'])
     register_Ns3DsrDsrFsHeader_methods(root_module, root_module['ns3::dsr::DsrFsHeader'])
     register_Ns3DsrDsrNetworkQueue_methods(root_module, root_module['ns3::dsr::DsrNetworkQueue'])
@@ -1328,11 +1393,11 @@
     return
 
 def register_Ns3EventGarbageCollector_methods(root_module, cls):
-    ## event-garbage-collector.h (module 'tools'): ns3::EventGarbageCollector::EventGarbageCollector(ns3::EventGarbageCollector const & arg0) [copy constructor]
+    ## event-garbage-collector.h (module 'core'): ns3::EventGarbageCollector::EventGarbageCollector(ns3::EventGarbageCollector const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::EventGarbageCollector const &', 'arg0')])
-    ## event-garbage-collector.h (module 'tools'): ns3::EventGarbageCollector::EventGarbageCollector() [constructor]
+    ## event-garbage-collector.h (module 'core'): ns3::EventGarbageCollector::EventGarbageCollector() [constructor]
     cls.add_constructor([])
-    ## event-garbage-collector.h (module 'tools'): void ns3::EventGarbageCollector::Track(ns3::EventId event) [member function]
+    ## event-garbage-collector.h (module 'core'): void ns3::EventGarbageCollector::Track(ns3::EventId event) [member function]
     cls.add_method('Track', 
                    'void', 
                    [param('ns3::EventId', 'event')])
@@ -1383,6 +1448,35 @@
                    is_const=True)
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3Inet6SocketAddress_methods(root_module, cls):
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress::Inet6SocketAddress(ns3::Inet6SocketAddress const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::Inet6SocketAddress const &', 'arg0')])
@@ -1844,6 +1938,11 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
     cls.add_method('IsEqual', 
                    'bool', 
@@ -1883,16 +1982,36 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
     cls.add_method('MakeAutoconfiguredAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
     cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'mac')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
     cls.add_method('MakeIpv4MappedAddress', 
                    'ns3::Ipv6Address', 
@@ -2451,6 +2570,10 @@
     cls.add_method('RemoveAll', 
                    'void', 
                    [])
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function]
+    cls.add_method('Replace', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     return
 
 def register_Ns3PacketTagListTagData_methods(root_module, cls):
@@ -2817,6 +2940,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -2876,6 +3004,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -3088,10 +3226,95 @@
     cls.add_constructor([param('ns3::WifiRemoteStationState const &', 'arg0')])
     ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_address [variable]
     cls.add_instance_attribute('m_address', 'ns3::Mac48Address', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_greenfield [variable]
+    cls.add_instance_attribute('m_greenfield', 'bool', is_const=False)
     ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_info [variable]
     cls.add_instance_attribute('m_info', 'ns3::WifiRemoteStationInfo', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_operationalMcsSet [variable]
+    cls.add_instance_attribute('m_operationalMcsSet', 'ns3::WifiMcsList', is_const=False)
     ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_operationalRateSet [variable]
     cls.add_instance_attribute('m_operationalRateSet', 'ns3::WifiModeList', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_rx [variable]
+    cls.add_instance_attribute('m_rx', 'uint32_t', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_shortGuardInterval [variable]
+    cls.add_instance_attribute('m_shortGuardInterval', 'bool', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_stbc [variable]
+    cls.add_instance_attribute('m_stbc', 'bool', is_const=False)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_tx [variable]
+    cls.add_instance_attribute('m_tx', 'uint32_t', is_const=False)
+    return
+
+def register_Ns3WifiTxVector_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiTxVector const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiTxVector const &', 'arg0')])
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector() [constructor]
+    cls.add_constructor([])
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiMode m, uint8_t l, uint8_t r, bool sg, uint8_t ns, uint8_t ne, bool Stbc) [constructor]
+    cls.add_constructor([param('ns3::WifiMode', 'm'), param('uint8_t', 'l'), param('uint8_t', 'r'), param('bool', 'sg'), param('uint8_t', 'ns'), param('uint8_t', 'ne'), param('bool', 'Stbc')])
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiMode ns3::WifiTxVector::GetMode() const [member function]
+    cls.add_method('GetMode', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): uint8_t ns3::WifiTxVector::GetNess() const [member function]
+    cls.add_method('GetNess', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): uint8_t ns3::WifiTxVector::GetNss() const [member function]
+    cls.add_method('GetNss', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): uint8_t ns3::WifiTxVector::GetRetries() const [member function]
+    cls.add_method('GetRetries', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): uint8_t ns3::WifiTxVector::GetTxPowerLevel() const [member function]
+    cls.add_method('GetTxPowerLevel', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): bool ns3::WifiTxVector::IsShortGuardInterval() const [member function]
+    cls.add_method('IsShortGuardInterval', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): bool ns3::WifiTxVector::IsStbc() const [member function]
+    cls.add_method('IsStbc', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetMode(ns3::WifiMode mode) [member function]
+    cls.add_method('SetMode', 
+                   'void', 
+                   [param('ns3::WifiMode', 'mode')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetNess(uint8_t ness) [member function]
+    cls.add_method('SetNess', 
+                   'void', 
+                   [param('uint8_t', 'ness')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetNss(uint8_t nss) [member function]
+    cls.add_method('SetNss', 
+                   'void', 
+                   [param('uint8_t', 'nss')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetRetries(uint8_t retries) [member function]
+    cls.add_method('SetRetries', 
+                   'void', 
+                   [param('uint8_t', 'retries')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetShortGuardInterval(bool guardinterval) [member function]
+    cls.add_method('SetShortGuardInterval', 
+                   'void', 
+                   [param('bool', 'guardinterval')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetStbc(bool stbcsatuts) [member function]
+    cls.add_method('SetStbc', 
+                   'void', 
+                   [param('bool', 'stbcsatuts')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetTxPowerLevel(uint8_t powerlevel) [member function]
+    cls.add_method('SetTxPowerLevel', 
+                   'void', 
+                   [param('uint8_t', 'powerlevel')])
     return
 
 def register_Ns3Empty_methods(root_module, cls):
@@ -3991,6 +4214,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3Ipv4MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4MulticastRoute__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -4820,11 +5055,26 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
     cls.add_method('SetResolution', 
                    'void', 
                    [param('ns3::Time::Unit', 'resolution')], 
                    is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
     cls.add_method('To', 
                    'ns3::int64x64_t', 
@@ -5147,6 +5397,11 @@
                    'ns3::Time', 
                    [], 
                    is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): ns3::Time ns3::WifiMac::GetRifs() const [member function]
+    cls.add_method('GetRifs', 
+                   'ns3::Time', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
     ## wifi-mac.h (module 'wifi'): ns3::Time ns3::WifiMac::GetSifs() const [member function]
     cls.add_method('GetSifs', 
                    'ns3::Time', 
@@ -5246,6 +5501,11 @@
                    'void', 
                    [], 
                    is_pure_virtual=True, is_virtual=True)
+    ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetRifs(ns3::Time rifs) [member function]
+    cls.add_method('SetRifs', 
+                   'void', 
+                   [param('ns3::Time', 'rifs')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetSifs(ns3::Time sifs) [member function]
     cls.add_method('SetSifs', 
                    'void', 
@@ -5638,10 +5898,18 @@
     cls.add_method('SetNoMoreFragments', 
                    'void', 
                    [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetNoOrder() [member function]
+    cls.add_method('SetNoOrder', 
+                   'void', 
+                   [])
     ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetNoRetry() [member function]
     cls.add_method('SetNoRetry', 
                    'void', 
                    [])
+    ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetOrder() [member function]
+    cls.add_method('SetOrder', 
+                   'void', 
+                   [])
     ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetProbeReq() [member function]
     cls.add_method('SetProbeReq', 
                    'void', 
@@ -5727,21 +5995,31 @@
                    'double', 
                    [param('ns3::WifiMode', 'txMode'), param('double', 'ber')], 
                    is_pure_virtual=True, is_const=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::CalculateTxDuration(uint32_t size, ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
+    ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::CalculateTxDuration(uint32_t size, ns3::WifiTxVector txvector, ns3::WifiPreamble preamble) [member function]
     cls.add_method('CalculateTxDuration', 
                    'ns3::Time', 
-                   [param('uint32_t', 'size'), param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
+                   [param('uint32_t', 'size'), param('ns3::WifiTxVector', 'txvector'), param('ns3::WifiPreamble', 'preamble')], 
                    is_static=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::ConfigureStandard(ns3::WifiPhyStandard standard) [member function]
     cls.add_method('ConfigureStandard', 
                    'void', 
                    [param('ns3::WifiPhyStandard', 'standard')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetBssMembershipSelector(uint32_t selector) const [member function]
+    cls.add_method('GetBssMembershipSelector', 
+                   'uint32_t', 
+                   [param('uint32_t', 'selector')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): ns3::Ptr<ns3::WifiChannel> ns3::WifiPhy::GetChannel() const [member function]
     cls.add_method('GetChannel', 
                    'ns3::Ptr< ns3::WifiChannel >', 
                    [], 
                    is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::GetChannelBonding() const [member function]
+    cls.add_method('GetChannelBonding', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): uint16_t ns3::WifiPhy::GetChannelNumber() const [member function]
     cls.add_method('GetChannelNumber', 
                    'uint16_t', 
@@ -5812,16 +6090,61 @@
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetFrequency() const [member function]
+    cls.add_method('GetFrequency', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::GetGreenfield() const [member function]
+    cls.add_method('GetGreenfield', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::GetGuardInterval() const [member function]
+    cls.add_method('GetGuardInterval', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): ns3::Time ns3::WifiPhy::GetLastRxStartTime() const [member function]
     cls.add_method('GetLastRxStartTime', 
                    'ns3::Time', 
                    [], 
                    is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::GetLdpc() const [member function]
+    cls.add_method('GetLdpc', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetMFPlcpHeaderMode(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
+    cls.add_method('GetMFPlcpHeaderMode', 
+                   'ns3::WifiMode', 
+                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): uint8_t ns3::WifiPhy::GetMcs(uint8_t mcs) const [member function]
+    cls.add_method('GetMcs', 
+                   'uint8_t', 
+                   [param('uint8_t', 'mcs')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): ns3::WifiModeList ns3::WifiPhy::GetMembershipSelectorModes(uint32_t selector) [member function]
+    cls.add_method('GetMembershipSelectorModes', 
+                   'ns3::WifiModeList', 
+                   [param('uint32_t', 'selector')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): ns3::WifiMode ns3::WifiPhy::GetMode(uint32_t mode) const [member function]
     cls.add_method('GetMode', 
                    'ns3::WifiMode', 
                    [param('uint32_t', 'mode')], 
                    is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetNBssMembershipSelectors() const [member function]
+    cls.add_method('GetNBssMembershipSelectors', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint8_t ns3::WifiPhy::GetNMcs() const [member function]
+    cls.add_method('GetNMcs', 
+                   'uint8_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetNModes() const [member function]
     cls.add_method('GetNModes', 
                    'uint32_t', 
@@ -5832,6 +6155,31 @@
                    'uint32_t', 
                    [], 
                    is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetNumberOfReceiveAntennas() const [member function]
+    cls.add_method('GetNumberOfReceiveAntennas', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetNumberOfTransmitAntennas() const [member function]
+    cls.add_method('GetNumberOfTransmitAntennas', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate108MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate108MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate120MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate120MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate121_5MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate121_5MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate12Mbps() [member function]
     cls.add_method('GetOfdmRate12Mbps', 
                    'ns3::WifiMode', 
@@ -5847,11 +6195,46 @@
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate135MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate135MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate135MbpsBW40MHzShGi() [member function]
+    cls.add_method('GetOfdmRate135MbpsBW40MHzShGi', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate13MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate13MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate13_5MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate13_5MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate13_5MbpsBW5MHz() [member function]
     cls.add_method('GetOfdmRate13_5MbpsBW5MHz', 
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate14_4MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate14_4MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate150MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate150MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate15MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate15MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate18Mbps() [member function]
     cls.add_method('GetOfdmRate18Mbps', 
                    'ns3::WifiMode', 
@@ -5862,11 +6245,21 @@
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate19_5MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate19_5MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate1_5MbpsBW5MHz() [member function]
     cls.add_method('GetOfdmRate1_5MbpsBW5MHz', 
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate21_7MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate21_7MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate24Mbps() [member function]
     cls.add_method('GetOfdmRate24Mbps', 
                    'ns3::WifiMode', 
@@ -5877,21 +6270,46 @@
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate26MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate26MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate27MbpsBW10MHz() [member function]
     cls.add_method('GetOfdmRate27MbpsBW10MHz', 
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate27MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate27MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate28_9MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate28_9MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate2_25MbpsBW5MHz() [member function]
     cls.add_method('GetOfdmRate2_25MbpsBW5MHz', 
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate30MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate30MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate36Mbps() [member function]
     cls.add_method('GetOfdmRate36Mbps', 
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate39MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate39MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate3MbpsBW10MHz() [member function]
     cls.add_method('GetOfdmRate3MbpsBW10MHz', 
                    'ns3::WifiMode', 
@@ -5902,6 +6320,21 @@
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate40_5MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate40_5MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate43_3MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate43_3MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate45MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate45MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate48Mbps() [member function]
     cls.add_method('GetOfdmRate48Mbps', 
                    'ns3::WifiMode', 
@@ -5917,11 +6350,46 @@
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate52MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate52MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate54Mbps() [member function]
     cls.add_method('GetOfdmRate54Mbps', 
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate54MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate54MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate57_8MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate57_8MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate58_5MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate58_5MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate60MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate60MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate65MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate65MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate65MbpsBW20MHzShGi() [member function]
+    cls.add_method('GetOfdmRate65MbpsBW20MHzShGi', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate6Mbps() [member function]
     cls.add_method('GetOfdmRate6Mbps', 
                    'ns3::WifiMode', 
@@ -5937,6 +6405,31 @@
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate6_5MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate6_5MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate72_2MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate72_2MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate7_2MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate7_2MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate81MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate81MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate90MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate90MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate9Mbps() [member function]
     cls.add_method('GetOfdmRate9Mbps', 
                    'ns3::WifiMode', 
@@ -5952,10 +6445,10 @@
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
-    ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPayloadDurationMicroSeconds(uint32_t size, ns3::WifiMode payloadMode) [member function]
+    ## wifi-phy.h (module 'wifi'): static double ns3::WifiPhy::GetPayloadDurationMicroSeconds(uint32_t size, ns3::WifiTxVector txvector) [member function]
     cls.add_method('GetPayloadDurationMicroSeconds', 
-                   'uint32_t', 
-                   [param('uint32_t', 'size'), param('ns3::WifiMode', 'payloadMode')], 
+                   'double', 
+                   [param('uint32_t', 'size'), param('ns3::WifiTxVector', 'txvector')], 
                    is_static=True)
     ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPlcpHeaderDurationMicroSeconds(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
     cls.add_method('GetPlcpHeaderDurationMicroSeconds', 
@@ -5967,6 +6460,16 @@
                    'ns3::WifiMode', 
                    [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPlcpHtSigHeaderDurationMicroSeconds(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
+    cls.add_method('GetPlcpHtSigHeaderDurationMicroSeconds', 
+                   'uint32_t', 
+                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPlcpHtTrainingSymbolDurationMicroSeconds(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble, ns3::WifiTxVector txvector) [member function]
+    cls.add_method('GetPlcpHtTrainingSymbolDurationMicroSeconds', 
+                   'uint32_t', 
+                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble'), param('ns3::WifiTxVector', 'txvector')], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPlcpPreambleDurationMicroSeconds(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
     cls.add_method('GetPlcpPreambleDurationMicroSeconds', 
                    'uint32_t', 
@@ -5977,6 +6480,11 @@
                    'ns3::Time', 
                    [], 
                    is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::GetStbc() const [member function]
+    cls.add_method('GetStbc', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): double ns3::WifiPhy::GetTxPowerEnd() const [member function]
     cls.add_method('GetTxPowerEnd', 
                    'double', 
@@ -6022,14 +6530,19 @@
                    'bool', 
                    [], 
                    is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): ns3::WifiMode ns3::WifiPhy::McsToWifiMode(uint8_t mcs) [member function]
+    cls.add_method('McsToWifiMode', 
+                   'ns3::WifiMode', 
+                   [param('uint8_t', 'mcs')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyMonitorSniffRx(ns3::Ptr<ns3::Packet const> packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble, double signalDbm, double noiseDbm) [member function]
     cls.add_method('NotifyMonitorSniffRx', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'channelFreqMhz'), param('uint16_t', 'channelNumber'), param('uint32_t', 'rate'), param('bool', 'isShortPreamble'), param('double', 'signalDbm'), param('double', 'noiseDbm')])
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyMonitorSniffTx(ns3::Ptr<ns3::Packet const> packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyMonitorSniffTx(ns3::Ptr<ns3::Packet const> packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble, uint8_t txPower) [member function]
     cls.add_method('NotifyMonitorSniffTx', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'channelFreqMhz'), param('uint16_t', 'channelNumber'), param('uint32_t', 'rate'), param('bool', 'isShortPreamble')])
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'channelFreqMhz'), param('uint16_t', 'channelNumber'), param('uint32_t', 'rate'), param('bool', 'isShortPreamble'), param('uint8_t', 'txPower')])
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyRxBegin(ns3::Ptr<ns3::Packet const> packet) [member function]
     cls.add_method('NotifyRxBegin', 
                    'void', 
@@ -6059,16 +6572,51 @@
                    'void', 
                    [param('ns3::WifiPhyListener *', 'listener')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SendPacket(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMode mode, ns3::WifiPreamble preamble, uint8_t txPowerLevel) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SendPacket(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMode mode, ns3::WifiPreamble preamble, ns3::WifiTxVector txvector) [member function]
     cls.add_method('SendPacket', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMode', 'mode'), param('ns3::WifiPreamble', 'preamble'), param('uint8_t', 'txPowerLevel')], 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMode', 'mode'), param('ns3::WifiPreamble', 'preamble'), param('ns3::WifiTxVector', 'txvector')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetChannelBonding(bool channelbonding) [member function]
+    cls.add_method('SetChannelBonding', 
+                   'void', 
+                   [param('bool', 'channelbonding')], 
                    is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetChannelNumber(uint16_t id) [member function]
     cls.add_method('SetChannelNumber', 
                    'void', 
                    [param('uint16_t', 'id')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetFrequency(uint32_t freq) [member function]
+    cls.add_method('SetFrequency', 
+                   'void', 
+                   [param('uint32_t', 'freq')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetGreenfield(bool greenfield) [member function]
+    cls.add_method('SetGreenfield', 
+                   'void', 
+                   [param('bool', 'greenfield')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetGuardInterval(bool GuardInterval) [member function]
+    cls.add_method('SetGuardInterval', 
+                   'void', 
+                   [param('bool', 'GuardInterval')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetLdpc(bool Ldpc) [member function]
+    cls.add_method('SetLdpc', 
+                   'void', 
+                   [param('bool', 'Ldpc')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetNumberOfReceiveAntennas(uint32_t rx) [member function]
+    cls.add_method('SetNumberOfReceiveAntennas', 
+                   'void', 
+                   [param('uint32_t', 'rx')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetNumberOfTransmitAntennas(uint32_t tx) [member function]
+    cls.add_method('SetNumberOfTransmitAntennas', 
+                   'void', 
+                   [param('uint32_t', 'tx')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetReceiveErrorCallback(ns3::Callback<void,ns3::Ptr<const ns3::Packet>,double,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> callback) [member function]
     cls.add_method('SetReceiveErrorCallback', 
                    'void', 
@@ -6079,6 +6627,16 @@
                    'void', 
                    [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiMode, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetStbc(bool stbc) [member function]
+    cls.add_method('SetStbc', 
+                   'void', 
+                   [param('bool', 'stbc')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::WifiModeToMcs(ns3::WifiMode mode) [member function]
+    cls.add_method('WifiModeToMcs', 
+                   'uint32_t', 
+                   [param('ns3::WifiMode', 'mode')], 
+                   is_pure_virtual=True, is_virtual=True)
     return
 
 def register_Ns3WifiRemoteStationManager_methods(root_module, cls):
@@ -6086,36 +6644,75 @@
     cls.add_constructor([param('ns3::WifiRemoteStationManager const &', 'arg0')])
     ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationManager::WifiRemoteStationManager() [constructor]
     cls.add_constructor([])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::AddBasicMcs(uint8_t mcs) [member function]
+    cls.add_method('AddBasicMcs', 
+                   'void', 
+                   [param('uint8_t', 'mcs')])
     ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::AddBasicMode(ns3::WifiMode mode) [member function]
     cls.add_method('AddBasicMode', 
                    'void', 
                    [param('ns3::WifiMode', 'mode')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::AddStationHtCapabilities(ns3::Mac48Address from, ns3::HtCapabilities htcapabilities) [member function]
+    cls.add_method('AddStationHtCapabilities', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'from'), param('ns3::HtCapabilities', 'htcapabilities')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::AddSupportedMcs(ns3::Mac48Address address, uint8_t mcs) [member function]
+    cls.add_method('AddSupportedMcs', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'address'), param('uint8_t', 'mcs')])
     ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::AddSupportedMode(ns3::Mac48Address address, ns3::WifiMode mode) [member function]
     cls.add_method('AddSupportedMode', 
                    'void', 
                    [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'mode')])
-    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiMode ns3::WifiRemoteStationManager::GetAckMode(ns3::Mac48Address address, ns3::WifiMode dataMode) [member function]
-    cls.add_method('GetAckMode', 
-                   'ns3::WifiMode', 
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::DoGetCtsToSelfTxVector() [member function]
+    cls.add_method('DoGetCtsToSelfTxVector', 
+                   'ns3::WifiTxVector', 
+                   [])
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::GetAckTxVector(ns3::Mac48Address address, ns3::WifiMode dataMode) [member function]
+    cls.add_method('GetAckTxVector', 
+                   'ns3::WifiTxVector', 
                    [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'dataMode')])
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::GetBasicMcs(uint32_t i) const [member function]
+    cls.add_method('GetBasicMcs', 
+                   'uint8_t', 
+                   [param('uint32_t', 'i')], 
+                   is_const=True)
     ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiMode ns3::WifiRemoteStationManager::GetBasicMode(uint32_t i) const [member function]
     cls.add_method('GetBasicMode', 
                    'ns3::WifiMode', 
                    [param('uint32_t', 'i')], 
                    is_const=True)
-    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiMode ns3::WifiRemoteStationManager::GetCtsMode(ns3::Mac48Address address, ns3::WifiMode rtsMode) [member function]
-    cls.add_method('GetCtsMode', 
-                   'ns3::WifiMode', 
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::GetBlockAckTxVector(ns3::Mac48Address address, ns3::WifiMode dataMode) [member function]
+    cls.add_method('GetBlockAckTxVector', 
+                   'ns3::WifiTxVector', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'dataMode')])
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::GetCtsToSelfTxVector(ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('GetCtsToSelfTxVector', 
+                   'ns3::WifiTxVector', 
+                   [param('ns3::WifiMacHeader const *', 'header'), param('ns3::Ptr< ns3::Packet const >', 'packet')])
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::GetCtsTxVector(ns3::Mac48Address address, ns3::WifiMode rtsMode) [member function]
+    cls.add_method('GetCtsTxVector', 
+                   'ns3::WifiTxVector', 
                    [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'rtsMode')])
-    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiMode ns3::WifiRemoteStationManager::GetDataMode(ns3::Mac48Address address, ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet, uint32_t fullPacketSize) [member function]
-    cls.add_method('GetDataMode', 
-                   'ns3::WifiMode', 
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::GetDataTxVector(ns3::Mac48Address address, ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet, uint32_t fullPacketSize) [member function]
+    cls.add_method('GetDataTxVector', 
+                   'ns3::WifiTxVector', 
                    [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint32_t', 'fullPacketSize')])
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::GetDefaultMcs() const [member function]
+    cls.add_method('GetDefaultMcs', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
     ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiMode ns3::WifiRemoteStationManager::GetDefaultMode() const [member function]
     cls.add_method('GetDefaultMode', 
                    'ns3::WifiMode', 
                    [], 
                    is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::GetDefaultTxPowerLevel() const [member function]
+    cls.add_method('GetDefaultTxPowerLevel', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
     ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetFragmentOffset(ns3::Mac48Address address, ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet, uint32_t fragmentNumber) [member function]
     cls.add_method('GetFragmentOffset', 
                    'uint32_t', 
@@ -6129,6 +6726,11 @@
                    'uint32_t', 
                    [], 
                    is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::GetGreenfieldSupported(ns3::Mac48Address address) const [member function]
+    cls.add_method('GetGreenfieldSupported', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address')], 
+                   is_const=True)
     ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationInfo ns3::WifiRemoteStationManager::GetInfo(ns3::Mac48Address address) [member function]
     cls.add_method('GetInfo', 
                    'ns3::WifiRemoteStationInfo', 
@@ -6143,6 +6745,11 @@
                    'uint32_t', 
                    [], 
                    is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetNBasicMcs() const [member function]
+    cls.add_method('GetNBasicMcs', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetNBasicModes() const [member function]
     cls.add_method('GetNBasicModes', 
                    'uint32_t', 
@@ -6153,20 +6760,29 @@
                    'ns3::WifiMode', 
                    [], 
                    is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetNumberOfTransmitAntennas() [member function]
+    cls.add_method('GetNumberOfTransmitAntennas', 
+                   'uint32_t', 
+                   [])
     ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetRtsCtsThreshold() const [member function]
     cls.add_method('GetRtsCtsThreshold', 
                    'uint32_t', 
                    [], 
                    is_const=True)
-    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiMode ns3::WifiRemoteStationManager::GetRtsMode(ns3::Mac48Address address, ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet) [member function]
-    cls.add_method('GetRtsMode', 
-                   'ns3::WifiMode', 
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::GetRtsTxVector(ns3::Mac48Address address, ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet) [member function]
+    cls.add_method('GetRtsTxVector', 
+                   'ns3::WifiTxVector', 
                    [param('ns3::Mac48Address', 'address'), param('ns3::WifiMacHeader const *', 'header'), param('ns3::Ptr< ns3::Packet const >', 'packet')])
     ## wifi-remote-station-manager.h (module 'wifi'): static ns3::TypeId ns3::WifiRemoteStationManager::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
                    'ns3::TypeId', 
                    [], 
                    is_static=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::HasHtSupported() const [member function]
+    cls.add_method('HasHtSupported', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::IsAssociated(ns3::Mac48Address address) const [member function]
     cls.add_method('IsAssociated', 
                    'bool', 
@@ -6186,6 +6802,10 @@
                    'bool', 
                    [param('ns3::Mac48Address', 'address')], 
                    is_const=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::NeedCtsToSelf(ns3::WifiTxVector txVector) [member function]
+    cls.add_method('NeedCtsToSelf', 
+                   'bool', 
+                   [param('ns3::WifiTxVector', 'txVector')])
     ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::NeedDataRetransmission(ns3::Mac48Address address, ns3::WifiMacHeader const * header, ns3::Ptr<ns3::Packet const> packet) [member function]
     cls.add_method('NeedDataRetransmission', 
                    'bool', 
@@ -6258,10 +6878,18 @@
     cls.add_method('Reset', 
                    'void', 
                    [param('ns3::Mac48Address', 'address')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::SetDefaultTxPowerLevel(uint8_t txPower) [member function]
+    cls.add_method('SetDefaultTxPowerLevel', 
+                   'void', 
+                   [param('uint8_t', 'txPower')])
     ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::SetFragmentationThreshold(uint32_t threshold) [member function]
     cls.add_method('SetFragmentationThreshold', 
                    'void', 
                    [param('uint32_t', 'threshold')])
+    ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::SetHtSupported(bool enable) [member function]
+    cls.add_method('SetHtSupported', 
+                   'void', 
+                   [param('bool', 'enable')])
     ## wifi-remote-station-manager.h (module 'wifi'): void ns3::WifiRemoteStationManager::SetMaxSlrc(uint32_t maxSlrc) [member function]
     cls.add_method('SetMaxSlrc', 
                    'void', 
@@ -6284,11 +6912,56 @@
                    'void', 
                    [], 
                    visibility='protected', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::GetGreenfield(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetGreenfield', 
+                   'bool', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetLongRetryCount(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetLongRetryCount', 
+                   'uint32_t', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::GetMcsSupported(ns3::WifiRemoteStation const * station, uint32_t i) const [member function]
+    cls.add_method('GetMcsSupported', 
+                   'uint8_t', 
+                   [param('ns3::WifiRemoteStation const *', 'station'), param('uint32_t', 'i')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetNMcsSupported(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetNMcsSupported', 
+                   'uint32_t', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
     ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetNSupported(ns3::WifiRemoteStation const * station) const [member function]
     cls.add_method('GetNSupported', 
                    'uint32_t', 
                    [param('ns3::WifiRemoteStation const *', 'station')], 
                    is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetNumberOfReceiveAntennas(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetNumberOfReceiveAntennas', 
+                   'uint32_t', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetNumberOfTransmitAntennas(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetNumberOfTransmitAntennas', 
+                   'uint32_t', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::GetShortGuardInterval(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetShortGuardInterval', 
+                   'bool', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): uint32_t ns3::WifiRemoteStationManager::GetShortRetryCount(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetShortRetryCount', 
+                   'uint32_t', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::GetStbc(ns3::WifiRemoteStation const * station) const [member function]
+    cls.add_method('GetStbc', 
+                   'bool', 
+                   [param('ns3::WifiRemoteStation const *', 'station')], 
+                   is_const=True, visibility='protected')
     ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiMode ns3::WifiRemoteStationManager::GetSupported(ns3::WifiRemoteStation const * station, uint32_t i) const [member function]
     cls.add_method('GetSupported', 
                    'ns3::WifiMode', 
@@ -6299,14 +6972,89 @@
                    'ns3::WifiRemoteStation *', 
                    [], 
                    is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
-    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiMode ns3::WifiRemoteStationManager::DoGetDataMode(ns3::WifiRemoteStation * station, uint32_t size) [member function]
-    cls.add_method('DoGetDataMode', 
-                   'ns3::WifiMode', 
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoGetAckTxGuardInterval(ns3::Mac48Address address, ns3::WifiMode ackMode) [member function]
+    cls.add_method('DoGetAckTxGuardInterval', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ackMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetAckTxNess(ns3::Mac48Address address, ns3::WifiMode ackMode) [member function]
+    cls.add_method('DoGetAckTxNess', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ackMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetAckTxNss(ns3::Mac48Address address, ns3::WifiMode ackMode) [member function]
+    cls.add_method('DoGetAckTxNss', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ackMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetAckTxPowerLevel(ns3::Mac48Address address, ns3::WifiMode ackMode) [member function]
+    cls.add_method('DoGetAckTxPowerLevel', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ackMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoGetAckTxStbc(ns3::Mac48Address address, ns3::WifiMode ackMode) [member function]
+    cls.add_method('DoGetAckTxStbc', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ackMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoGetBlockAckTxGuardInterval(ns3::Mac48Address address, ns3::WifiMode blockAckMode) [member function]
+    cls.add_method('DoGetBlockAckTxGuardInterval', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'blockAckMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetBlockAckTxNess(ns3::Mac48Address address, ns3::WifiMode blockAckMode) [member function]
+    cls.add_method('DoGetBlockAckTxNess', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'blockAckMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetBlockAckTxNss(ns3::Mac48Address address, ns3::WifiMode blockAckMode) [member function]
+    cls.add_method('DoGetBlockAckTxNss', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'blockAckMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetBlockAckTxPowerLevel(ns3::Mac48Address address, ns3::WifiMode blockAckMode) [member function]
+    cls.add_method('DoGetBlockAckTxPowerLevel', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'blockAckMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoGetBlockAckTxStbc(ns3::Mac48Address address, ns3::WifiMode blockAckMode) [member function]
+    cls.add_method('DoGetBlockAckTxStbc', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'blockAckMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoGetCtsTxGuardInterval(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function]
+    cls.add_method('DoGetCtsTxGuardInterval', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ctsMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetCtsTxNess(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function]
+    cls.add_method('DoGetCtsTxNess', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ctsMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetCtsTxNss(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function]
+    cls.add_method('DoGetCtsTxNss', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ctsMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetCtsTxPowerLevel(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function]
+    cls.add_method('DoGetCtsTxPowerLevel', 
+                   'uint8_t', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ctsMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoGetCtsTxStbc(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function]
+    cls.add_method('DoGetCtsTxStbc', 
+                   'bool', 
+                   [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ctsMode')], 
+                   visibility='private', is_virtual=True)
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::DoGetDataTxVector(ns3::WifiRemoteStation * station, uint32_t size) [member function]
+    cls.add_method('DoGetDataTxVector', 
+                   'ns3::WifiTxVector', 
                    [param('ns3::WifiRemoteStation *', 'station'), param('uint32_t', 'size')], 
                    is_pure_virtual=True, visibility='private', is_virtual=True)
-    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiMode ns3::WifiRemoteStationManager::DoGetRtsMode(ns3::WifiRemoteStation * station) [member function]
-    cls.add_method('DoGetRtsMode', 
-                   'ns3::WifiMode', 
+    ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::DoGetRtsTxVector(ns3::WifiRemoteStation * station) [member function]
+    cls.add_method('DoGetRtsTxVector', 
+                   'ns3::WifiTxVector', 
                    [param('ns3::WifiRemoteStation *', 'station')], 
                    is_pure_virtual=True, visibility='private', is_virtual=True)
     ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::DoNeedDataRetransmission(ns3::WifiRemoteStation * station, ns3::Ptr<ns3::Packet const> packet, bool normally) [member function]
@@ -7056,6 +7804,168 @@
                    is_virtual=True)
     return
 
+def register_Ns3HtCapabilities_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilities::HtCapabilities(ns3::HtCapabilities const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::HtCapabilities const &', 'arg0')])
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilities::HtCapabilities() [constructor]
+    cls.add_constructor([])
+    ## ht-capabilities.h (module 'wifi'): uint8_t ns3::HtCapabilities::DeserializeInformationField(ns3::Buffer::Iterator start, uint8_t length) [member function]
+    cls.add_method('DeserializeInformationField', 
+                   'uint8_t', 
+                   [param('ns3::Buffer::Iterator', 'start'), param('uint8_t', 'length')], 
+                   is_virtual=True)
+    ## ht-capabilities.h (module 'wifi'): ns3::WifiInformationElementId ns3::HtCapabilities::ElementId() const [member function]
+    cls.add_method('ElementId', 
+                   'ns3::WifiInformationElementId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ht-capabilities.h (module 'wifi'): uint8_t ns3::HtCapabilities::GetAmpduParameters() const [member function]
+    cls.add_method('GetAmpduParameters', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): uint8_t ns3::HtCapabilities::GetGreenfield() const [member function]
+    cls.add_method('GetGreenfield', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): uint16_t ns3::HtCapabilities::GetHtCapabilitiesInfo() const [member function]
+    cls.add_method('GetHtCapabilitiesInfo', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): uint8_t ns3::HtCapabilities::GetInformationFieldSize() const [member function]
+    cls.add_method('GetInformationFieldSize', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ht-capabilities.h (module 'wifi'): uint8_t ns3::HtCapabilities::GetLdpc() const [member function]
+    cls.add_method('GetLdpc', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): uint8_t * ns3::HtCapabilities::GetRxMcsBitmask() [member function]
+    cls.add_method('GetRxMcsBitmask', 
+                   'uint8_t *', 
+                   [])
+    ## ht-capabilities.h (module 'wifi'): uint16_t ns3::HtCapabilities::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): uint8_t ns3::HtCapabilities::GetShortGuardInterval20() const [member function]
+    cls.add_method('GetShortGuardInterval20', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): uint8_t ns3::HtCapabilities::GetSupportedChannelWidth() const [member function]
+    cls.add_method('GetSupportedChannelWidth', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): uint64_t ns3::HtCapabilities::GetSupportedMcsSet1() const [member function]
+    cls.add_method('GetSupportedMcsSet1', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): uint64_t ns3::HtCapabilities::GetSupportedMcsSet2() const [member function]
+    cls.add_method('GetSupportedMcsSet2', 
+                   'uint64_t', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): bool ns3::HtCapabilities::IsSupportedMcs(uint8_t mcs) [member function]
+    cls.add_method('IsSupportedMcs', 
+                   'bool', 
+                   [param('uint8_t', 'mcs')])
+    ## ht-capabilities.h (module 'wifi'): ns3::Buffer::Iterator ns3::HtCapabilities::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'ns3::Buffer::Iterator', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SerializeInformationField(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('SerializeInformationField', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetAmpduParameters(uint8_t ctrl) [member function]
+    cls.add_method('SetAmpduParameters', 
+                   'void', 
+                   [param('uint8_t', 'ctrl')])
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetGreenfield(uint8_t greenfield) [member function]
+    cls.add_method('SetGreenfield', 
+                   'void', 
+                   [param('uint8_t', 'greenfield')])
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetHtCapabilitiesInfo(uint16_t ctrl) [member function]
+    cls.add_method('SetHtCapabilitiesInfo', 
+                   'void', 
+                   [param('uint16_t', 'ctrl')])
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetHtSupported(uint8_t htsupported) [member function]
+    cls.add_method('SetHtSupported', 
+                   'void', 
+                   [param('uint8_t', 'htsupported')])
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetLdpc(uint8_t ldpc) [member function]
+    cls.add_method('SetLdpc', 
+                   'void', 
+                   [param('uint8_t', 'ldpc')])
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetRxMcsBitmask(uint8_t index) [member function]
+    cls.add_method('SetRxMcsBitmask', 
+                   'void', 
+                   [param('uint8_t', 'index')])
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetShortGuardInterval20(uint8_t shortguardinterval) [member function]
+    cls.add_method('SetShortGuardInterval20', 
+                   'void', 
+                   [param('uint8_t', 'shortguardinterval')])
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetSupportedChannelWidth(uint8_t supportedchannelwidth) [member function]
+    cls.add_method('SetSupportedChannelWidth', 
+                   'void', 
+                   [param('uint8_t', 'supportedchannelwidth')])
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilities::SetSupportedMcsSet(uint64_t ctrl1, uint64_t ctrl2) [member function]
+    cls.add_method('SetSupportedMcsSet', 
+                   'void', 
+                   [param('uint64_t', 'ctrl1'), param('uint64_t', 'ctrl2')])
+    return
+
+def register_Ns3HtCapabilitiesChecker_methods(root_module, cls):
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilitiesChecker::HtCapabilitiesChecker() [constructor]
+    cls.add_constructor([])
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilitiesChecker::HtCapabilitiesChecker(ns3::HtCapabilitiesChecker const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::HtCapabilitiesChecker const &', 'arg0')])
+    return
+
+def register_Ns3HtCapabilitiesValue_methods(root_module, cls):
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilitiesValue::HtCapabilitiesValue() [constructor]
+    cls.add_constructor([])
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilitiesValue::HtCapabilitiesValue(ns3::HtCapabilitiesValue const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::HtCapabilitiesValue const &', 'arg0')])
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilitiesValue::HtCapabilitiesValue(ns3::HtCapabilities const & value) [constructor]
+    cls.add_constructor([param('ns3::HtCapabilities const &', 'value')])
+    ## ht-capabilities.h (module 'wifi'): ns3::Ptr<ns3::AttributeValue> ns3::HtCapabilitiesValue::Copy() const [member function]
+    cls.add_method('Copy', 
+                   'ns3::Ptr< ns3::AttributeValue >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## ht-capabilities.h (module 'wifi'): bool ns3::HtCapabilitiesValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+    cls.add_method('DeserializeFromString', 
+                   'bool', 
+                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_virtual=True)
+    ## ht-capabilities.h (module 'wifi'): ns3::HtCapabilities ns3::HtCapabilitiesValue::Get() const [member function]
+    cls.add_method('Get', 
+                   'ns3::HtCapabilities', 
+                   [], 
+                   is_const=True)
+    ## ht-capabilities.h (module 'wifi'): std::string ns3::HtCapabilitiesValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+    cls.add_method('SerializeToString', 
+                   'std::string', 
+                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
+                   is_const=True, is_virtual=True)
+    ## ht-capabilities.h (module 'wifi'): void ns3::HtCapabilitiesValue::Set(ns3::HtCapabilities const & value) [member function]
+    cls.add_method('Set', 
+                   'void', 
+                   [param('ns3::HtCapabilities const &', 'value')])
+    return
+
 def register_Ns3IpL4Protocol_methods(root_module, cls):
     ## ip-l4-protocol.h (module 'internet'): ns3::IpL4Protocol::IpL4Protocol() [constructor]
     cls.add_constructor([])
@@ -7223,6 +8133,11 @@
                    'bool', 
                    [param('uint32_t', 'interface'), param('uint32_t', 'addressIndex')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## ipv4.h (module 'internet'): bool ns3::Ipv4::RemoveAddress(uint32_t interface, ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4Address', 'address')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## ipv4.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4::SelectSourceAddress(ns3::Ptr<const ns3::NetDevice> device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function]
     cls.add_method('SelectSourceAddress', 
                    'ns3::Ipv4Address', 
@@ -7385,6 +8300,10 @@
     cls.add_method('RemoveAddress', 
                    'ns3::Ipv4InterfaceAddress', 
                    [param('uint32_t', 'index')])
+    ## ipv4-interface.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4Interface::RemoveAddress(ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'ns3::Ipv4InterfaceAddress', 
+                   [param('ns3::Ipv4Address', 'address')])
     ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::Send(ns3::Ptr<ns3::Packet> p, ns3::Ipv4Address dest) [member function]
     cls.add_method('Send', 
                    'void', 
@@ -7545,6 +8464,11 @@
                    'bool', 
                    [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], 
                    is_virtual=True)
+    ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interface, ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4Address', 'address')], 
+                   is_virtual=True)
     ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr<const ns3::NetDevice> device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function]
     cls.add_method('SelectSourceAddress', 
                    'ns3::Ipv4Address', 
@@ -7937,6 +8861,10 @@
     cls.add_method('RemoveAddress', 
                    'ns3::Ipv6InterfaceAddress', 
                    [param('uint32_t', 'index')])
+    ## ipv6-interface.h (module 'internet'): ns3::Ipv6InterfaceAddress ns3::Ipv6Interface::RemoveAddress(ns3::Ipv6Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'ns3::Ipv6InterfaceAddress', 
+                   [param('ns3::Ipv6Address', 'address')])
     ## ipv6-interface.h (module 'internet'): void ns3::Ipv6Interface::Send(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Address dest) [member function]
     cls.add_method('Send', 
                    'void', 
@@ -8641,6 +9569,10 @@
     cls.add_method('RemoveTrailer', 
                    'uint32_t', 
                    [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('ReplacePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
     cls.add_method('Serialize', 
                    'uint32_t', 
@@ -8917,13 +9849,6 @@
                    visibility='protected', is_virtual=True)
     return
 
-def register_Ns3TimeChecker_methods(root_module, cls):
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor]
-    cls.add_constructor([])
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')])
-    return
-
 def register_Ns3TimeValue_methods(root_module, cls):
     ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
     cls.add_constructor([])
@@ -9329,6 +10254,111 @@
                    visibility='private', is_virtual=True)
     return
 
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_Ns3DsrBlackList_methods(root_module, cls):
     ## dsr-rreq-table.h (module 'dsr'): ns3::dsr::BlackList::BlackList(ns3::dsr::BlackList const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::dsr::BlackList const &', 'arg0')])
@@ -10009,10 +11039,6 @@
                    'void', 
                    [param('std::ostream &', 'os')], 
                    is_const=True, is_virtual=True)
-    ## dsr-option-header.h (module 'dsr'): ns3::Ipv4Address ns3::dsr::DsrOptionRrepHeader::SearchNextHop(ns3::Ipv4Address ipv4Address) [member function]
-    cls.add_method('SearchNextHop', 
-                   'ns3::Ipv4Address', 
-                   [param('ns3::Ipv4Address', 'ipv4Address')])
     ## dsr-option-header.h (module 'dsr'): void ns3::dsr::DsrOptionRrepHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
     cls.add_method('Serialize', 
                    'void', 
@@ -10051,11 +11077,6 @@
                    'ns3::dsr::DsrOptionHeader::Alignment', 
                    [], 
                    is_const=True, is_virtual=True)
-    ## dsr-option-header.h (module 'dsr'): uint32_t ns3::dsr::DsrOptionRreqHeader::GetDataLength() const [member function]
-    cls.add_method('GetDataLength', 
-                   'uint32_t', 
-                   [], 
-                   is_const=True)
     ## dsr-option-header.h (module 'dsr'): uint16_t ns3::dsr::DsrOptionRreqHeader::GetId() const [member function]
     cls.add_method('GetId', 
                    'uint16_t', 
@@ -10105,10 +11126,6 @@
                    'void', 
                    [param('ns3::Buffer::Iterator', 'start')], 
                    is_const=True, is_virtual=True)
-    ## dsr-option-header.h (module 'dsr'): void ns3::dsr::DsrOptionRreqHeader::SetDataLength(uint32_t dataLength) [member function]
-    cls.add_method('SetDataLength', 
-                   'void', 
-                   [param('uint32_t', 'dataLength')])
     ## dsr-option-header.h (module 'dsr'): void ns3::dsr::DsrOptionRreqHeader::SetId(uint16_t identification) [member function]
     cls.add_method('SetId', 
                    'void', 
@@ -10394,11 +11411,6 @@
     cls.add_method('GetElementsFromContext', 
                    'std::vector< std::string >', 
                    [param('std::string', 'context')])
-    ## dsr-routing.h (module 'dsr'): uint8_t ns3::dsr::DsrRouting::GetExtensionNumber() const [member function]
-    cls.add_method('GetExtensionNumber', 
-                   'uint8_t', 
-                   [], 
-                   is_const=True)
     ## dsr-routing.h (module 'dsr'): uint16_t ns3::dsr::DsrRouting::GetIDfromIP(ns3::Ipv4Address address) [member function]
     cls.add_method('GetIDfromIP', 
                    'uint16_t', 
@@ -10603,10 +11615,6 @@
     cls.add_method('SendRequest', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source')])
-    ## dsr-routing.h (module 'dsr'): void ns3::dsr::DsrRouting::SendRequestAndIncrement(ns3::Ptr<ns3::Packet> packet, ns3::Ipv4Address source, ns3::Ipv4Address destination) [member function]
-    cls.add_method('SendRequestAndIncrement', 
-                   'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination')])
     ## dsr-routing.h (module 'dsr'): void ns3::dsr::DsrRouting::SendUnreachError(ns3::Ipv4Address errorHop, ns3::Ipv4Address destination, ns3::Ipv4Address originalDst, uint8_t salvage, uint8_t protocol) [member function]
     cls.add_method('SendUnreachError', 
                    'void', 
@@ -11334,10 +12342,6 @@
     cls.add_method('DeleteRoute', 
                    'bool', 
                    [param('ns3::Ipv4Address', 'dst')])
-    ## dsr-rcache.h (module 'dsr'): void ns3::dsr::RouteCache::DropPathWithDst(ns3::Ipv4Address dst) [member function]
-    cls.add_method('DropPathWithDst', 
-                   'void', 
-                   [param('ns3::Ipv4Address', 'dst')])
     ## dsr-rcache.h (module 'dsr'): bool ns3::dsr::RouteCache::FindSameRoute(ns3::dsr::RouteCacheEntry & rt, std::list<ns3::dsr::RouteCacheEntry, std::allocator<ns3::dsr::RouteCacheEntry> > & rtVector) [member function]
     cls.add_method('FindSameRoute', 
                    'bool', 
@@ -11361,11 +12365,6 @@
                    'ns3::Callback< void, ns3::Ipv4Address, unsigned char, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 
                    [], 
                    is_const=True)
-    ## dsr-rcache.h (module 'dsr'): ns3::Ipv4Address ns3::dsr::RouteCache::GetDestination() const [member function]
-    cls.add_method('GetDestination', 
-                   'ns3::Ipv4Address', 
-                   [], 
-                   is_const=True)
     ## dsr-rcache.h (module 'dsr'): ns3::Time ns3::dsr::RouteCache::GetExpireTime(ns3::Ipv4Address addr) [member function]
     cls.add_method('GetExpireTime', 
                    'ns3::Time', 
@@ -11420,10 +12419,6 @@
                    'ns3::Time', 
                    [], 
                    is_const=True)
-    ## dsr-rcache.h (module 'dsr'): bool ns3::dsr::RouteCache::IsEqual(ns3::dsr::RouteCacheEntry ca) [member function]
-    cls.add_method('IsEqual', 
-                   'bool', 
-                   [param('ns3::dsr::RouteCacheEntry', 'ca')])
     ## dsr-rcache.h (module 'dsr'): bool ns3::dsr::RouteCache::IsLinkCache() [member function]
     cls.add_method('IsLinkCache', 
                    'bool', 
@@ -12182,6 +13177,7 @@
 def register_functions(root_module):
     module = root_module
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     register_functions_ns3_dsr(module.get_submodule('dsr'), root_module)
     register_functions_ns3_internal(module.get_submodule('internal'), root_module)
     return
@@ -12189,6 +13185,13 @@
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def register_functions_ns3_dsr(module, root_module):
     return
 
diff -Naur ns-3.17/src/dsr/model/dsr-errorbuff.cc ns-3.18/src/dsr/model/dsr-errorbuff.cc
--- ns-3.17/src/dsr/model/dsr-errorbuff.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/dsr/model/dsr-errorbuff.cc	2013-10-26 07:07:29.827364387 -0700
@@ -58,7 +58,7 @@
       NS_LOG_INFO ("packet id " << i->GetPacket ()->GetUid () << " " << entry.GetPacket ()->GetUid () << " source " << i->GetSource () << " " << entry.GetSource ()
                                 << " next hop " << i->GetNextHop () << " " << entry.GetNextHop () << " dst " << i->GetDestination () << " " << entry.GetDestination ());
 
-      /// TODO check the source and destination over here
+      /// \todo check the source and destination over here
       if ((i->GetPacket ()->GetUid () == entry.GetPacket ()->GetUid ()) && (i->GetSource () == entry.GetSource ()) && (i->GetNextHop () == entry.GetSource ())
           && (i->GetDestination () == entry.GetDestination ()))
         {
diff -Naur ns-3.17/src/dsr/model/dsr-option-header.h ns-3.18/src/dsr/model/dsr-option-header.h
--- ns-3.17/src/dsr/model/dsr-option-header.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/dsr/model/dsr-option-header.h	2013-10-26 07:07:29.823364388 -0700
@@ -338,16 +338,6 @@
    */
   Ipv4Address GetNodeAddress (uint8_t index) const;
   /**
-   * \brief Set the data length.
-   * \param dataLength the data length
-   */
-  void SetDataLength (uint32_t dataLength);
-  /**
-   * \brief Get the data length.
-   * \return the data length
-   */
-  uint32_t GetDataLength () const;
-  /**
    * \brief Set the request id number.
    * \param the identification number
    */
@@ -512,12 +502,6 @@
    * \return the router IPv4 Address
    */
   Ipv4Address GetNodeAddress (uint8_t index) const;
-  /*
-   * \brief Search the next hop Ipv4 address
-   * \param Our own IP address
-   * \return The next hop address of the route
-   */
-  Ipv4Address SearchNextHop (Ipv4Address ipv4Address);
   /**
    * \brief Print some informations about the packet.
    * \param os output stream
diff -Naur ns-3.17/src/dsr/model/dsr-options.cc ns-3.18/src/dsr/model/dsr-options.cc
--- ns-3.17/src/dsr/model/dsr-options.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/dsr/model/dsr-options.cc	2013-10-26 07:07:29.827364387 -0700
@@ -946,7 +946,7 @@
           return rreq.GetSerializedSize ();
         }
     }
-  return rreq.GetSerializedSize ();
+  //unreachable:  return rreq.GetSerializedSize ();
 }
 
 NS_OBJECT_ENSURE_REGISTERED (DsrOptionRrep);
@@ -1481,7 +1481,7 @@
       p->RemoveHeader (rerrUnsupport);
       rerrSize = rerrUnsupport.GetSerializedSize ();
 
-      // This is for the other two error options, not supporting for now TODO
+      /// \todo This is for the other two error options, not supporting for now
 //      uint32_t serialized = DoSendError (p, rerrUnsupport, rerrSize, ipv4Address, protocol);
       uint32_t serialized = 0;
       return serialized;
diff -Naur ns-3.17/src/dsr/model/dsr-rcache.cc ns-3.18/src/dsr/model/dsr-rcache.cc
--- ns-3.17/src/dsr/model/dsr-rcache.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/dsr/model/dsr-rcache.cc	2013-10-26 07:07:29.823364388 -0700
@@ -502,7 +502,7 @@
   for (std::map<Link, LinkStab>::iterator i = m_linkCache.begin (); i != m_linkCache.end (); ++i)
     {
       // Here the weight is set as 1
-      // May need to set different weight for different link here later TODO
+      /// \todo May need to set different weight for different link here later
       uint32_t weight = 1;
       m_netGraph[i->first.m_low][i->first.m_high] = weight;
       m_netGraph[i->first.m_high][i->first.m_low] = weight;
@@ -523,7 +523,7 @@
     }
   else
     {
-      /// TODO get rid of the debug here
+      /// \todo get rid of the debug here
       NS_LOG_INFO ("The node stability " << i->second.GetNodeStability ().GetSeconds ());
       NS_LOG_INFO ("The stability here " << Time (i->second.GetNodeStability () * m_stabilityIncrFactor).GetSeconds ());
       NodeStab ns (Time (i->second.GetNodeStability () * m_stabilityIncrFactor));
@@ -546,7 +546,7 @@
     }
   else
     {
-      // TODO remove it here
+      /// \todo remove it here
       NS_LOG_INFO ("The stability here " << i->second.GetNodeStability ().GetSeconds ());
       NS_LOG_INFO ("The stability here " << Time (i->second.GetNodeStability () / m_stabilityDecrFactor).GetSeconds ());
       NodeStab ns (Time (i->second.GetNodeStability () / m_stabilityDecrFactor));
@@ -624,7 +624,7 @@
           if (m_linkCache[link].GetLinkStability () < m_useExtends)
             {
               m_linkCache[link].SetLinkStability (m_useExtends);
-              /// TODO remove after debug
+              /// \todo remove after debug
               NS_LOG_INFO ("The time of the link " << m_linkCache[link].GetLinkStability ().GetSeconds ());
             }
         }
@@ -785,7 +785,7 @@
       // erase the two kind of links to make sure the link is removed from the link cache
       NS_LOG_DEBUG ("Erase the route");
       m_linkCache.erase (link1);
-      /// TODO get rid of this one
+      /// \todo get rid of this one
       NS_LOG_DEBUG ("The link cache size " << m_linkCache.size());
       m_linkCache.erase (link2);
       NS_LOG_DEBUG ("The link cache size " << m_linkCache.size());
@@ -1141,14 +1141,18 @@
 RouteCache::AddNeighbor (std::vector<Ipv4Address> nodeList, Ipv4Address ownAddress, Time expire)
 {
   NS_LOG_LOGIC ("Add neighbor number " << nodeList.size ());
-  for (std::vector<Ipv4Address>::iterator j = nodeList.begin (); j != nodeList.end (); ++j)
+  for (std::vector<Ipv4Address>::iterator j = nodeList.begin (); j != nodeList.end ();)
     {
       Ipv4Address addr = *j;
       if (addr == ownAddress)
         {
-          nodeList.erase (j);
+          j = nodeList.erase (j);
           NS_LOG_DEBUG ("The node list size " << nodeList.size ());
         }
+      else
+        {
+          ++j;
+        }
       Neighbor neighbor (addr, LookupMacAddress (addr), expire + Simulator::Now ());
       m_nb.push_back (neighbor);
       PurgeMac ();
@@ -1179,7 +1183,7 @@
           if (pred (*j))
             {
               NS_LOG_LOGIC ("Close link to " << j->m_neighborAddress);
-              // disable temporarily TODO
+              /// \todo disable temporarily
 //              m_handleLinkFailure (j->m_neighborAddress);
             }
         }
diff -Naur ns-3.17/src/dsr/model/dsr-rcache.h ns-3.18/src/dsr/model/dsr-rcache.h
--- ns-3.17/src/dsr/model/dsr-rcache.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/dsr/model/dsr-rcache.h	2013-10-26 07:07:29.823364388 -0700
@@ -327,18 +327,6 @@
    * \brief Define the vector of route entries.
    */
   typedef std::list<RouteCacheEntry::IP_VECTOR> routeVector;
-  /**
-   * \brief Get the destination address of the route.
-   */
-  Ipv4Address GetDestination (void) const;
-  /**
-   * \brief Remove all packets with destination IP address dst
-   */
-  void DropPathWithDst (Ipv4Address dst);
-  /**
-   * \brief To know if the two entries are the same
-   */
-  bool IsEqual (RouteCacheEntry ca);
   // /\name Fields
   // \{
   bool GetSubRoute () const
diff -Naur ns-3.17/src/dsr/model/dsr-routing.cc ns-3.18/src/dsr/model/dsr-routing.cc
--- ns-3.17/src/dsr/model/dsr-routing.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/dsr/model/dsr-routing.cc	2013-10-26 07:07:29.827364387 -0700
@@ -474,7 +474,7 @@
   Ptr<Packet> newP = p->Copy();
   WifiMacHeader hdr;
   newP->RemoveHeader(hdr);
-  /// TODO this is a hard-coded check, need to find a better way to work on this
+  /// \todo this is a hard-coded check, need to find a better way to work on this
   if (newP->GetSize () == 4)
     {
       NS_LOG_WARN ("WifiMacTrailer left, skip this packet");
@@ -489,11 +489,11 @@
     return;
   }
   newP->RemoveHeader(llc);
-  /*
+  /** \internal
    * Tried to use peekheader here, but for ipv4 header here,
    * dsr removes the Ipv4Header and then pass the packet and the header
    * separately to Ipv4L3Protocol. Ipv4L3Protocol then re-adds them
-   * together, which causes the problem.  Check Bug 1479
+   * together, which causes the problem.  Check \bugid{1479}
    */
   ArpHeader arp;
   if(newP->PeekHeader (arp))
@@ -1014,7 +1014,7 @@
           Ptr<Packet> cleanP = packet->Copy ();
           uint8_t protocol = i->GetProtocol ();
 
-          m_sendBuffer.GetBuffer ().erase (i);
+          i = m_sendBuffer.GetBuffer ().erase (i);
 
           DsrRoutingHeader dsrRoutingHeader;
           Ptr<Packet> copyP = packet->Copy ();
@@ -1094,7 +1094,7 @@
 
                   m_downTarget (newPacket, m_mainAddress, nextHop, GetProtocolNumber (), m_ipv4Route);
 
-                  // TODO
+                  /// \todo New DsrNetworkQueueEntry
 //                  DsrNetworkQueueEntry newEntry (newPacket, m_mainAddress, nextHop, Simulator::Now (), m_ipv4Route);
 //
 //                  if (dsrNetworkQueue->Enqueue (newEntry))
@@ -1475,7 +1475,7 @@
 
       m_downTarget (newPacket, m_mainAddress, nextHop, GetProtocolNumber (), m_ipv4Route);
 
-      // TODO
+      /// \todo New DsrNetworkQueueEntry
 //      DsrNetworkQueueEntry newEntry (newPacket, m_mainAddress, nextHop, Simulator::Now (), m_ipv4Route);
 //
 //      if (dsrNetworkQueue->Enqueue (newEntry))
@@ -1520,7 +1520,7 @@
 
   m_downTarget (packet, m_mainAddress, nextHop, GetProtocolNumber (), route);
 
-  // TODO
+  /// \todo New DsrNetworkQueueEntry
 //  DsrNetworkQueueEntry newEntry (packet, m_mainAddress, nextHop, Simulator::Now (), route);
 //
 //  if (dsrNetworkQueue->Enqueue (newEntry))
@@ -1732,7 +1732,7 @@
 
   m_downTarget (packet, source, nextHop, GetProtocolNumber (), m_ipv4Route);
 
-  //TODO
+  /// \todo New DsrNetworkQueueEntry 
 //  DsrNetworkQueueEntry newEntry (packet, source, nextHop, Simulator::Now (), m_ipv4Route);
 //
 //  if (dsrNetworkQueue->Enqueue (newEntry))
@@ -2038,7 +2038,7 @@
 
                   m_downTarget (newPacket, m_mainAddress, nextHop, GetProtocolNumber (), m_ipv4Route);
 
-                  // TODO
+                  /// \todo New DsrNetworkQueueEntry
 //                  DsrNetworkQueueEntry newEntry (newPacket, m_mainAddress, nextHop, Simulator::Now (), m_ipv4Route);
 //
 //                  if (dsrNetworkQueue->Enqueue (newEntry))
@@ -2390,7 +2390,7 @@
 
       m_downTarget (p, m_mainAddress, nextHop, GetProtocolNumber (), m_ipv4Route);
 
-      // TODO
+      /// \todo New DsrNetworkQueueEntry
 //      DsrNetworkQueueEntry newEntry (p, m_mainAddress, nextHop, Simulator::Now (), m_ipv4Route);
 //
 //      if (dsrNetworkQueue->Enqueue (newEntry))
@@ -2513,7 +2513,10 @@
       networkKey.m_destination = newEntry.GetDst ();
 
       m_addressForwardCnt[networkKey] = 0;
-      m_maintainBuffer.Enqueue (newEntry);
+      if (! m_maintainBuffer.Enqueue (newEntry))
+        {
+          NS_LOG_ERROR ("Failed to enqueue packet retry");
+        }
 
       if (m_addressForwardTimer.find (networkKey) == m_addressForwardTimer.end ())
         {
@@ -3224,7 +3227,7 @@
 
   m_downTarget (packet, source, m_broadcast, GetProtocolNumber (), 0);
 
-  // TODO
+  /// \todo New DsrNetworkQueueEntry
 //  DsrNetworkQueueEntry newEntry (packet, source, m_broadcast, Simulator::Now (), 0);
 //  if (dsrNetworkQueue->Enqueue (newEntry))
 //    {
@@ -3330,7 +3333,7 @@
 
   m_downTarget (packet, source, nextHop, GetProtocolNumber (), route);
 
-  // TODO
+  /// \todo New DsrNetworkQueueEntry
 //  DsrNetworkQueueEntry newEntry (packet, source, nextHop, Simulator::Now (), route);
 //  if (dsrNetworkQueue->Enqueue (newEntry))
 //    {
@@ -3407,7 +3410,7 @@
 
   m_downTarget (packet, m_mainAddress, destination, GetProtocolNumber (), route);
 
-  // TODO
+  /// \todo New DsrNetworkQueueEntry
 //  DsrNetworkQueueEntry newEntry (packet, m_mainAddress, destination, Simulator::Now (), route);
 //  if (dsrNetworkQueue->Enqueue (newEntry))
 //    {
diff -Naur ns-3.17/src/dsr/model/dsr-routing.h ns-3.18/src/dsr/model/dsr-routing.h
--- ns-3.17/src/dsr/model/dsr-routing.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/dsr/model/dsr-routing.h	2013-10-26 07:07:29.827364387 -0700
@@ -383,15 +383,6 @@
    */
   void SendErrorRequest (DsrOptionRerrUnreachHeader &rerr, uint8_t protocol);
   /**
-   * \brief Send the route request and increment the request count
-   * \param the original packet
-   * \param source address
-   * \param destination address
-   */
-  void SendRequestAndIncrement (Ptr<Packet> packet,
-                                Ipv4Address source,
-                                Ipv4Address destination);
-  /**
    * \brief Forward the route request if the node is not the destination
    * \param the original packet
    * \param source address
@@ -475,11 +466,6 @@
   IpL4Protocol::DownTargetCallback GetDownTarget (void) const;
   IpL4Protocol::DownTargetCallback6 GetDownTarget6 (void) const;
   /**
-   * \brief Get the extension number.
-   * \return extension number
-   */
-  uint8_t GetExtensionNumber () const;
-  /**
    * \brief Process method
    * Called from Ipv4L3Protocol::Receive.
    *
diff -Naur ns-3.17/src/dsr/model/dsr-rreq-table.cc ns-3.18/src/dsr/model/dsr-rreq-table.cc
--- ns-3.17/src/dsr/model/dsr-rreq-table.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/dsr/model/dsr-rreq-table.cc	2013-10-26 07:07:29.827364387 -0700
@@ -225,7 +225,7 @@
 RreqTable::MarkLinkAsUnidirectional (Ipv4Address neighbor, Time blacklistTimeout)
 {
   NS_LOG_LOGIC ("Add neighbor address in blacklist " << m_blackList.size ());
-  for (std::vector<BlackList>::iterator i = m_blackList.begin (); i != m_blackList.end (); ++i)
+  for (std::vector<BlackList>::iterator i = m_blackList.begin (); i != m_blackList.end (); i++)
     {
       if (i->m_neighborAddress == neighbor)
         {
diff -Naur ns-3.17/src/emu/bindings/modulegen__gcc_ILP32.py ns-3.18/src/emu/bindings/modulegen__gcc_ILP32.py
--- ns-3.17/src/emu/bindings/modulegen__gcc_ILP32.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/emu/bindings/modulegen__gcc_ILP32.py	2013-10-26 07:07:30.559364407 -0700
@@ -54,6 +54,8 @@
     module.add_class('DataRate', import_from_module='ns.network')
     ## event-id.h (module 'core'): ns3::EventId [class]
     module.add_class('EventId', import_from_module='ns.core')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
     ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
     module.add_class('Ipv4Address', import_from_module='ns.network')
     ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
@@ -96,6 +98,8 @@
     module.add_class('PacketTagList', import_from_module='ns.network')
     ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct]
     module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration]
+    module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network')
     ## pcap-file.h (module 'network'): ns3::PcapFile [class]
     module.add_class('PcapFile', import_from_module='ns.network')
     ## trace-helper.h (module 'network'): ns3::PcapHelper [class]
@@ -148,6 +152,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::NixVector', 'ns3::empty', 'ns3::DefaultDeleter<ns3::NixVector>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> > [class]
@@ -226,8 +232,6 @@
     module.add_class('OutputStreamWrapper', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> >'])
     ## packet.h (module 'network'): ns3::Packet [class]
     module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
-    ## nstime.h (module 'core'): ns3::TimeChecker [class]
-    module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
     module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
@@ -248,11 +252,47 @@
     nested_module = module.add_cpp_namespace('FatalImpl')
     register_types_ns3_FatalImpl(nested_module)
     
+    
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
 
 def register_types_ns3_FatalImpl(module):
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_methods(root_module):
     register_Ns3Address_methods(root_module, root_module['ns3::Address'])
     register_Ns3AsciiTraceHelper_methods(root_module, root_module['ns3::AsciiTraceHelper'])
@@ -270,6 +310,7 @@
     register_Ns3CriticalSection_methods(root_module, root_module['ns3::CriticalSection'])
     register_Ns3DataRate_methods(root_module, root_module['ns3::DataRate'])
     register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3Ipv4Address_methods(root_module, root_module['ns3::Ipv4Address'])
     register_Ns3Ipv4Mask_methods(root_module, root_module['ns3::Ipv4Mask'])
     register_Ns3Ipv6Address_methods(root_module, root_module['ns3::Ipv6Address'])
@@ -311,6 +352,7 @@
     register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
     register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
     register_Ns3SimpleRefCount__Ns3OutputStreamWrapper_Ns3Empty_Ns3DefaultDeleter__lt__ns3OutputStreamWrapper__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> >'])
     register_Ns3SimpleRefCount__Ns3Packet_Ns3Empty_Ns3DefaultDeleter__lt__ns3Packet__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
@@ -347,13 +389,17 @@
     register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue'])
     register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper'])
     register_Ns3Packet_methods(root_module, root_module['ns3::Packet'])
-    register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
     register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
     register_Ns3AddressChecker_methods(root_module, root_module['ns3::AddressChecker'])
     register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue'])
     register_Ns3EmuNetDevice_methods(root_module, root_module['ns3::EmuNetDevice'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     return
 
 def register_Ns3Address_methods(root_module, cls):
@@ -1033,6 +1079,35 @@
                    is_const=True)
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3Ipv4Address_methods(root_module, cls):
     cls.add_binary_comparison_operator('<')
     cls.add_binary_comparison_operator('!=')
@@ -1298,6 +1373,11 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
     cls.add_method('IsEqual', 
                    'bool', 
@@ -1337,16 +1417,36 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
     cls.add_method('MakeAutoconfiguredAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
     cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'mac')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
     cls.add_method('MakeIpv4MappedAddress', 
                    'ns3::Ipv6Address', 
@@ -1895,6 +1995,10 @@
     cls.add_method('RemoveAll', 
                    'void', 
                    [])
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function]
+    cls.add_method('Replace', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     return
 
 def register_Ns3PacketTagListTagData_methods(root_module, cls):
@@ -2305,6 +2409,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -2364,6 +2473,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -2842,6 +2961,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -3061,11 +3192,26 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
     cls.add_method('SetResolution', 
                    'void', 
                    [param('ns3::Time::Unit', 'resolution')], 
                    is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
     cls.add_method('To', 
                    'ns3::int64x64_t', 
@@ -4049,6 +4195,10 @@
     cls.add_method('RemoveTrailer', 
                    'uint32_t', 
                    [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('ReplacePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
     cls.add_method('Serialize', 
                    'uint32_t', 
@@ -4060,13 +4210,6 @@
                    [param('ns3::Ptr< ns3::NixVector >', 'arg0')])
     return
 
-def register_Ns3TimeChecker_methods(root_module, cls):
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor]
-    cls.add_constructor([])
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')])
-    return
-
 def register_Ns3TimeValue_methods(root_module, cls):
     ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
     cls.add_constructor([])
@@ -4345,14 +4488,127 @@
                    visibility='private', is_virtual=True)
     return
 
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_functions(root_module):
     module = root_module
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     return
 
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def main():
     out = FileCodeSink(sys.stdout)
     root_module = module_init()
diff -Naur ns-3.17/src/emu/bindings/modulegen__gcc_LP64.py ns-3.18/src/emu/bindings/modulegen__gcc_LP64.py
--- ns-3.17/src/emu/bindings/modulegen__gcc_LP64.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/emu/bindings/modulegen__gcc_LP64.py	2013-10-26 07:07:30.559364407 -0700
@@ -54,6 +54,8 @@
     module.add_class('DataRate', import_from_module='ns.network')
     ## event-id.h (module 'core'): ns3::EventId [class]
     module.add_class('EventId', import_from_module='ns.core')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
     ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
     module.add_class('Ipv4Address', import_from_module='ns.network')
     ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
@@ -96,6 +98,8 @@
     module.add_class('PacketTagList', import_from_module='ns.network')
     ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct]
     module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration]
+    module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network')
     ## pcap-file.h (module 'network'): ns3::PcapFile [class]
     module.add_class('PcapFile', import_from_module='ns.network')
     ## trace-helper.h (module 'network'): ns3::PcapHelper [class]
@@ -148,6 +152,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::NixVector', 'ns3::empty', 'ns3::DefaultDeleter<ns3::NixVector>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> > [class]
@@ -226,8 +232,6 @@
     module.add_class('OutputStreamWrapper', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> >'])
     ## packet.h (module 'network'): ns3::Packet [class]
     module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
-    ## nstime.h (module 'core'): ns3::TimeChecker [class]
-    module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
     module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
@@ -248,11 +252,47 @@
     nested_module = module.add_cpp_namespace('FatalImpl')
     register_types_ns3_FatalImpl(nested_module)
     
+    
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
 
 def register_types_ns3_FatalImpl(module):
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_methods(root_module):
     register_Ns3Address_methods(root_module, root_module['ns3::Address'])
     register_Ns3AsciiTraceHelper_methods(root_module, root_module['ns3::AsciiTraceHelper'])
@@ -270,6 +310,7 @@
     register_Ns3CriticalSection_methods(root_module, root_module['ns3::CriticalSection'])
     register_Ns3DataRate_methods(root_module, root_module['ns3::DataRate'])
     register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3Ipv4Address_methods(root_module, root_module['ns3::Ipv4Address'])
     register_Ns3Ipv4Mask_methods(root_module, root_module['ns3::Ipv4Mask'])
     register_Ns3Ipv6Address_methods(root_module, root_module['ns3::Ipv6Address'])
@@ -311,6 +352,7 @@
     register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
     register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
     register_Ns3SimpleRefCount__Ns3OutputStreamWrapper_Ns3Empty_Ns3DefaultDeleter__lt__ns3OutputStreamWrapper__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> >'])
     register_Ns3SimpleRefCount__Ns3Packet_Ns3Empty_Ns3DefaultDeleter__lt__ns3Packet__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
@@ -347,13 +389,17 @@
     register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue'])
     register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper'])
     register_Ns3Packet_methods(root_module, root_module['ns3::Packet'])
-    register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
     register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
     register_Ns3AddressChecker_methods(root_module, root_module['ns3::AddressChecker'])
     register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue'])
     register_Ns3EmuNetDevice_methods(root_module, root_module['ns3::EmuNetDevice'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     return
 
 def register_Ns3Address_methods(root_module, cls):
@@ -1033,6 +1079,35 @@
                    is_const=True)
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3Ipv4Address_methods(root_module, cls):
     cls.add_binary_comparison_operator('<')
     cls.add_binary_comparison_operator('!=')
@@ -1298,6 +1373,11 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
     cls.add_method('IsEqual', 
                    'bool', 
@@ -1337,16 +1417,36 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
     cls.add_method('MakeAutoconfiguredAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
     cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'mac')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
     cls.add_method('MakeIpv4MappedAddress', 
                    'ns3::Ipv6Address', 
@@ -1895,6 +1995,10 @@
     cls.add_method('RemoveAll', 
                    'void', 
                    [])
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function]
+    cls.add_method('Replace', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     return
 
 def register_Ns3PacketTagListTagData_methods(root_module, cls):
@@ -2305,6 +2409,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -2364,6 +2473,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -2842,6 +2961,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -3061,11 +3192,26 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
     cls.add_method('SetResolution', 
                    'void', 
                    [param('ns3::Time::Unit', 'resolution')], 
                    is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
     cls.add_method('To', 
                    'ns3::int64x64_t', 
@@ -4049,6 +4195,10 @@
     cls.add_method('RemoveTrailer', 
                    'uint32_t', 
                    [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('ReplacePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
     cls.add_method('Serialize', 
                    'uint32_t', 
@@ -4060,13 +4210,6 @@
                    [param('ns3::Ptr< ns3::NixVector >', 'arg0')])
     return
 
-def register_Ns3TimeChecker_methods(root_module, cls):
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor]
-    cls.add_constructor([])
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')])
-    return
-
 def register_Ns3TimeValue_methods(root_module, cls):
     ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
     cls.add_constructor([])
@@ -4345,14 +4488,127 @@
                    visibility='private', is_virtual=True)
     return
 
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_functions(root_module):
     module = root_module
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     return
 
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def main():
     out = FileCodeSink(sys.stdout)
     root_module = module_init()
diff -Naur ns-3.17/src/emu/model/emu-net-device.h ns-3.18/src/emu/model/emu-net-device.h
--- ns-3.17/src/emu/model/emu-net-device.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/emu/model/emu-net-device.h	2013-10-26 07:07:30.555364406 -0700
@@ -146,7 +146,7 @@
    * \brief Make and return a MAC multicast address using the provided
    *        multicast group
    *
-   * RFC 1112 says that an Ipv4 host group address is mapped to an Ethernet 
+   * \RFC{1112} says that an Ipv4 host group address is mapped to an Ethernet 
    * multicast address by placing the low-order 23-bits of the IP address into 
    * the low-order 23 bits of the Ethernet multicast address 
    * 01-00-5E-00-00-00 (hex).
diff -Naur ns-3.17/src/energy/bindings/modulegen__gcc_ILP32.py ns-3.18/src/energy/bindings/modulegen__gcc_ILP32.py
--- ns-3.17/src/energy/bindings/modulegen__gcc_ILP32.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/energy/bindings/modulegen__gcc_ILP32.py	2013-10-26 07:07:29.595364381 -0700
@@ -21,11 +21,11 @@
     root_module = module.get_root()
     
     ## wifi-mode.h (module 'wifi'): ns3::WifiCodeRate [enumeration]
-    module.add_enum('WifiCodeRate', ['WIFI_CODE_RATE_UNDEFINED', 'WIFI_CODE_RATE_3_4', 'WIFI_CODE_RATE_2_3', 'WIFI_CODE_RATE_1_2'], import_from_module='ns.wifi')
+    module.add_enum('WifiCodeRate', ['WIFI_CODE_RATE_UNDEFINED', 'WIFI_CODE_RATE_3_4', 'WIFI_CODE_RATE_2_3', 'WIFI_CODE_RATE_1_2', 'WIFI_CODE_RATE_5_6'], import_from_module='ns.wifi')
     ## wifi-preamble.h (module 'wifi'): ns3::WifiPreamble [enumeration]
-    module.add_enum('WifiPreamble', ['WIFI_PREAMBLE_LONG', 'WIFI_PREAMBLE_SHORT'], import_from_module='ns.wifi')
+    module.add_enum('WifiPreamble', ['WIFI_PREAMBLE_LONG', 'WIFI_PREAMBLE_SHORT', 'WIFI_PREAMBLE_HT_MF', 'WIFI_PREAMBLE_HT_GF'], import_from_module='ns.wifi')
     ## wifi-phy-standard.h (module 'wifi'): ns3::WifiPhyStandard [enumeration]
-    module.add_enum('WifiPhyStandard', ['WIFI_PHY_STANDARD_80211a', 'WIFI_PHY_STANDARD_80211b', 'WIFI_PHY_STANDARD_80211g', 'WIFI_PHY_STANDARD_80211_10MHZ', 'WIFI_PHY_STANDARD_80211_5MHZ', 'WIFI_PHY_STANDARD_holland', 'WIFI_PHY_STANDARD_80211p_CCH', 'WIFI_PHY_STANDARD_80211p_SCH'], import_from_module='ns.wifi')
+    module.add_enum('WifiPhyStandard', ['WIFI_PHY_STANDARD_80211a', 'WIFI_PHY_STANDARD_80211b', 'WIFI_PHY_STANDARD_80211g', 'WIFI_PHY_STANDARD_80211_10MHZ', 'WIFI_PHY_STANDARD_80211_5MHZ', 'WIFI_PHY_STANDARD_holland', 'WIFI_PHY_STANDARD_80211p_CCH', 'WIFI_PHY_STANDARD_80211p_SCH', 'WIFI_PHY_STANDARD_80211n_2_4GHZ', 'WIFI_PHY_STANDARD_80211n_5GHZ'], import_from_module='ns.wifi')
     ## wifi-mode.h (module 'wifi'): ns3::WifiModulationClass [enumeration]
     module.add_enum('WifiModulationClass', ['WIFI_MOD_CLASS_UNKNOWN', 'WIFI_MOD_CLASS_IR', 'WIFI_MOD_CLASS_FHSS', 'WIFI_MOD_CLASS_DSSS', 'WIFI_MOD_CLASS_ERP_PBCC', 'WIFI_MOD_CLASS_DSSS_OFDM', 'WIFI_MOD_CLASS_ERP_OFDM', 'WIFI_MOD_CLASS_OFDM', 'WIFI_MOD_CLASS_HT'], import_from_module='ns.wifi')
     ## address.h (module 'network'): ns3::Address [class]
@@ -60,6 +60,8 @@
     module.add_class('EnergySourceHelper', allow_subclassing=True)
     ## event-id.h (module 'core'): ns3::EventId [class]
     module.add_class('EventId', import_from_module='ns.core')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
     ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
     module.add_class('Ipv4Address', import_from_module='ns.network')
     ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
@@ -98,6 +100,8 @@
     module.add_class('PacketTagList', import_from_module='ns.network')
     ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct]
     module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration]
+    module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network')
     ## rv-battery-model-helper.h (module 'energy'): ns3::RvBatteryModelHelper [class]
     module.add_class('RvBatteryModelHelper', parent=root_module['ns3::EnergySourceHelper'])
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter> [class]
@@ -126,6 +130,8 @@
     module.add_class('WifiRadioEnergyModelHelper', parent=root_module['ns3::DeviceEnergyModelHelper'])
     ## wifi-radio-energy-model.h (module 'energy'): ns3::WifiRadioEnergyModelPhyListener [class]
     module.add_class('WifiRadioEnergyModelPhyListener', parent=root_module['ns3::WifiPhyListener'])
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector [class]
+    module.add_class('WifiTxVector', import_from_module='ns.wifi')
     ## empty.h (module 'core'): ns3::empty [class]
     module.add_class('empty', import_from_module='ns.core')
     ## int64x64-double.h (module 'core'): ns3::int64x64_t [class]
@@ -150,6 +156,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::NixVector', 'ns3::empty', 'ns3::DefaultDeleter<ns3::NixVector>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> > [class]
@@ -244,8 +252,6 @@
     module.add_class('RvBatteryModel', parent=root_module['ns3::EnergySource'])
     ## simple-device-energy-model.h (module 'energy'): ns3::SimpleDeviceEnergyModel [class]
     module.add_class('SimpleDeviceEnergyModel', parent=root_module['ns3::DeviceEnergyModel'])
-    ## nstime.h (module 'core'): ns3::TimeChecker [class]
-    module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
     module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
@@ -266,12 +272,19 @@
     module.add_class('AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
     ## basic-energy-source.h (module 'energy'): ns3::BasicEnergySource [class]
     module.add_class('BasicEnergySource', parent=root_module['ns3::EnergySource'])
+    module.add_container('ns3::WifiModeList', 'ns3::WifiMode', container_type='vector')
+    typehandlers.add_type_alias('std::vector< unsigned char, std::allocator< unsigned char > >', 'ns3::WifiMcsList')
+    typehandlers.add_type_alias('std::vector< unsigned char, std::allocator< unsigned char > >*', 'ns3::WifiMcsList*')
+    typehandlers.add_type_alias('std::vector< unsigned char, std::allocator< unsigned char > >&', 'ns3::WifiMcsList&')
     typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >', 'ns3::WifiModeList')
     typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >*', 'ns3::WifiModeList*')
     typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >&', 'ns3::WifiModeList&')
     typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >', 'ns3::WifiModeListIterator')
     typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >*', 'ns3::WifiModeListIterator*')
     typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >&', 'ns3::WifiModeListIterator&')
+    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< unsigned char const *, std::vector< unsigned char, std::allocator< unsigned char > > >', 'ns3::WifiMcsListIterator')
+    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< unsigned char const *, std::vector< unsigned char, std::allocator< unsigned char > > >*', 'ns3::WifiMcsListIterator*')
+    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< unsigned char const *, std::vector< unsigned char, std::allocator< unsigned char > > >&', 'ns3::WifiMcsListIterator&')
     
     ## Register a nested module for the namespace FatalImpl
     
@@ -279,6 +292,12 @@
     register_types_ns3_FatalImpl(nested_module)
     
     
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
+    
     ## Register a nested module for the namespace internal
     
     nested_module = module.add_cpp_namespace('internal')
@@ -289,6 +308,36 @@
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_types_ns3_internal(module):
     root_module = module.get_root()
     
@@ -309,6 +358,7 @@
     register_Ns3DeviceEnergyModelHelper_methods(root_module, root_module['ns3::DeviceEnergyModelHelper'])
     register_Ns3EnergySourceHelper_methods(root_module, root_module['ns3::EnergySourceHelper'])
     register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3Ipv4Address_methods(root_module, root_module['ns3::Ipv4Address'])
     register_Ns3Ipv4Mask_methods(root_module, root_module['ns3::Ipv4Mask'])
     register_Ns3Ipv6Address_methods(root_module, root_module['ns3::Ipv6Address'])
@@ -338,6 +388,7 @@
     register_Ns3WifiPhyListener_methods(root_module, root_module['ns3::WifiPhyListener'])
     register_Ns3WifiRadioEnergyModelHelper_methods(root_module, root_module['ns3::WifiRadioEnergyModelHelper'])
     register_Ns3WifiRadioEnergyModelPhyListener_methods(root_module, root_module['ns3::WifiRadioEnergyModelPhyListener'])
+    register_Ns3WifiTxVector_methods(root_module, root_module['ns3::WifiTxVector'])
     register_Ns3Empty_methods(root_module, root_module['ns3::empty'])
     register_Ns3Int64x64_t_methods(root_module, root_module['ns3::int64x64_t'])
     register_Ns3BasicEnergySourceHelper_methods(root_module, root_module['ns3::BasicEnergySourceHelper'])
@@ -350,6 +401,7 @@
     register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
     register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
     register_Ns3SimpleRefCount__Ns3Packet_Ns3Empty_Ns3DefaultDeleter__lt__ns3Packet__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
     register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >'])
@@ -392,7 +444,6 @@
     register_Ns3Packet_methods(root_module, root_module['ns3::Packet'])
     register_Ns3RvBatteryModel_methods(root_module, root_module['ns3::RvBatteryModel'])
     register_Ns3SimpleDeviceEnergyModel_methods(root_module, root_module['ns3::SimpleDeviceEnergyModel'])
-    register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
     register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
@@ -403,6 +454,11 @@
     register_Ns3AddressChecker_methods(root_module, root_module['ns3::AddressChecker'])
     register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue'])
     register_Ns3BasicEnergySource_methods(root_module, root_module['ns3::BasicEnergySource'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     return
 
 def register_Ns3Address_methods(root_module, cls):
@@ -1041,6 +1097,35 @@
                    is_const=True)
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3Ipv4Address_methods(root_module, cls):
     cls.add_binary_comparison_operator('<')
     cls.add_binary_comparison_operator('!=')
@@ -1306,6 +1391,11 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
     cls.add_method('IsEqual', 
                    'bool', 
@@ -1345,16 +1435,36 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
     cls.add_method('MakeAutoconfiguredAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
     cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'mac')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
     cls.add_method('MakeIpv4MappedAddress', 
                    'ns3::Ipv6Address', 
@@ -1831,6 +1941,10 @@
     cls.add_method('RemoveAll', 
                    'void', 
                    [])
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function]
+    cls.add_method('Replace', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     return
 
 def register_Ns3PacketTagListTagData_methods(root_module, cls):
@@ -2054,6 +2168,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -2113,6 +2232,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -2345,6 +2474,79 @@
                    [param('ns3::Callback< void, int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')])
     return
 
+def register_Ns3WifiTxVector_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiTxVector const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiTxVector const &', 'arg0')])
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector() [constructor]
+    cls.add_constructor([])
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiMode m, uint8_t l, uint8_t r, bool sg, uint8_t ns, uint8_t ne, bool Stbc) [constructor]
+    cls.add_constructor([param('ns3::WifiMode', 'm'), param('uint8_t', 'l'), param('uint8_t', 'r'), param('bool', 'sg'), param('uint8_t', 'ns'), param('uint8_t', 'ne'), param('bool', 'Stbc')])
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiMode ns3::WifiTxVector::GetMode() const [member function]
+    cls.add_method('GetMode', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): uint8_t ns3::WifiTxVector::GetNess() const [member function]
+    cls.add_method('GetNess', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): uint8_t ns3::WifiTxVector::GetNss() const [member function]
+    cls.add_method('GetNss', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): uint8_t ns3::WifiTxVector::GetRetries() const [member function]
+    cls.add_method('GetRetries', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): uint8_t ns3::WifiTxVector::GetTxPowerLevel() const [member function]
+    cls.add_method('GetTxPowerLevel', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): bool ns3::WifiTxVector::IsShortGuardInterval() const [member function]
+    cls.add_method('IsShortGuardInterval', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): bool ns3::WifiTxVector::IsStbc() const [member function]
+    cls.add_method('IsStbc', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetMode(ns3::WifiMode mode) [member function]
+    cls.add_method('SetMode', 
+                   'void', 
+                   [param('ns3::WifiMode', 'mode')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetNess(uint8_t ness) [member function]
+    cls.add_method('SetNess', 
+                   'void', 
+                   [param('uint8_t', 'ness')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetNss(uint8_t nss) [member function]
+    cls.add_method('SetNss', 
+                   'void', 
+                   [param('uint8_t', 'nss')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetRetries(uint8_t retries) [member function]
+    cls.add_method('SetRetries', 
+                   'void', 
+                   [param('uint8_t', 'retries')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetShortGuardInterval(bool guardinterval) [member function]
+    cls.add_method('SetShortGuardInterval', 
+                   'void', 
+                   [param('bool', 'guardinterval')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetStbc(bool stbcsatuts) [member function]
+    cls.add_method('SetStbc', 
+                   'void', 
+                   [param('bool', 'stbcsatuts')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetTxPowerLevel(uint8_t powerlevel) [member function]
+    cls.add_method('SetTxPowerLevel', 
+                   'void', 
+                   [param('uint8_t', 'powerlevel')])
+    return
+
 def register_Ns3Empty_methods(root_module, cls):
     ## empty.h (module 'core'): ns3::empty::empty() [constructor]
     cls.add_constructor([])
@@ -2657,6 +2859,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -2827,11 +3041,26 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
     cls.add_method('SetResolution', 
                    'void', 
                    [param('ns3::Time::Unit', 'resolution')], 
                    is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
     cls.add_method('To', 
                    'ns3::int64x64_t', 
@@ -2958,21 +3187,31 @@
                    'double', 
                    [param('ns3::WifiMode', 'txMode'), param('double', 'ber')], 
                    is_pure_virtual=True, is_const=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::CalculateTxDuration(uint32_t size, ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
+    ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::CalculateTxDuration(uint32_t size, ns3::WifiTxVector txvector, ns3::WifiPreamble preamble) [member function]
     cls.add_method('CalculateTxDuration', 
                    'ns3::Time', 
-                   [param('uint32_t', 'size'), param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
+                   [param('uint32_t', 'size'), param('ns3::WifiTxVector', 'txvector'), param('ns3::WifiPreamble', 'preamble')], 
                    is_static=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::ConfigureStandard(ns3::WifiPhyStandard standard) [member function]
     cls.add_method('ConfigureStandard', 
                    'void', 
                    [param('ns3::WifiPhyStandard', 'standard')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetBssMembershipSelector(uint32_t selector) const [member function]
+    cls.add_method('GetBssMembershipSelector', 
+                   'uint32_t', 
+                   [param('uint32_t', 'selector')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): ns3::Ptr<ns3::WifiChannel> ns3::WifiPhy::GetChannel() const [member function]
     cls.add_method('GetChannel', 
                    'ns3::Ptr< ns3::WifiChannel >', 
                    [], 
                    is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::GetChannelBonding() const [member function]
+    cls.add_method('GetChannelBonding', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): uint16_t ns3::WifiPhy::GetChannelNumber() const [member function]
     cls.add_method('GetChannelNumber', 
                    'uint16_t', 
@@ -3043,16 +3282,61 @@
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetFrequency() const [member function]
+    cls.add_method('GetFrequency', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::GetGreenfield() const [member function]
+    cls.add_method('GetGreenfield', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::GetGuardInterval() const [member function]
+    cls.add_method('GetGuardInterval', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): ns3::Time ns3::WifiPhy::GetLastRxStartTime() const [member function]
     cls.add_method('GetLastRxStartTime', 
                    'ns3::Time', 
                    [], 
                    is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::GetLdpc() const [member function]
+    cls.add_method('GetLdpc', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetMFPlcpHeaderMode(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
+    cls.add_method('GetMFPlcpHeaderMode', 
+                   'ns3::WifiMode', 
+                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): uint8_t ns3::WifiPhy::GetMcs(uint8_t mcs) const [member function]
+    cls.add_method('GetMcs', 
+                   'uint8_t', 
+                   [param('uint8_t', 'mcs')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): ns3::WifiModeList ns3::WifiPhy::GetMembershipSelectorModes(uint32_t selector) [member function]
+    cls.add_method('GetMembershipSelectorModes', 
+                   'ns3::WifiModeList', 
+                   [param('uint32_t', 'selector')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): ns3::WifiMode ns3::WifiPhy::GetMode(uint32_t mode) const [member function]
     cls.add_method('GetMode', 
                    'ns3::WifiMode', 
                    [param('uint32_t', 'mode')], 
                    is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetNBssMembershipSelectors() const [member function]
+    cls.add_method('GetNBssMembershipSelectors', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint8_t ns3::WifiPhy::GetNMcs() const [member function]
+    cls.add_method('GetNMcs', 
+                   'uint8_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetNModes() const [member function]
     cls.add_method('GetNModes', 
                    'uint32_t', 
@@ -3063,6 +3347,31 @@
                    'uint32_t', 
                    [], 
                    is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetNumberOfReceiveAntennas() const [member function]
+    cls.add_method('GetNumberOfReceiveAntennas', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetNumberOfTransmitAntennas() const [member function]
+    cls.add_method('GetNumberOfTransmitAntennas', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate108MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate108MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate120MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate120MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate121_5MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate121_5MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate12Mbps() [member function]
     cls.add_method('GetOfdmRate12Mbps', 
                    'ns3::WifiMode', 
@@ -3078,11 +3387,46 @@
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate135MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate135MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate135MbpsBW40MHzShGi() [member function]
+    cls.add_method('GetOfdmRate135MbpsBW40MHzShGi', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate13MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate13MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate13_5MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate13_5MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate13_5MbpsBW5MHz() [member function]
     cls.add_method('GetOfdmRate13_5MbpsBW5MHz', 
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate14_4MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate14_4MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate150MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate150MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate15MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate15MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate18Mbps() [member function]
     cls.add_method('GetOfdmRate18Mbps', 
                    'ns3::WifiMode', 
@@ -3093,11 +3437,21 @@
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate19_5MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate19_5MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate1_5MbpsBW5MHz() [member function]
     cls.add_method('GetOfdmRate1_5MbpsBW5MHz', 
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate21_7MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate21_7MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate24Mbps() [member function]
     cls.add_method('GetOfdmRate24Mbps', 
                    'ns3::WifiMode', 
@@ -3108,21 +3462,46 @@
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate26MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate26MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate27MbpsBW10MHz() [member function]
     cls.add_method('GetOfdmRate27MbpsBW10MHz', 
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate27MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate27MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate28_9MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate28_9MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate2_25MbpsBW5MHz() [member function]
     cls.add_method('GetOfdmRate2_25MbpsBW5MHz', 
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate30MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate30MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate36Mbps() [member function]
     cls.add_method('GetOfdmRate36Mbps', 
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate39MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate39MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate3MbpsBW10MHz() [member function]
     cls.add_method('GetOfdmRate3MbpsBW10MHz', 
                    'ns3::WifiMode', 
@@ -3133,6 +3512,21 @@
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate40_5MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate40_5MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate43_3MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate43_3MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate45MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate45MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate48Mbps() [member function]
     cls.add_method('GetOfdmRate48Mbps', 
                    'ns3::WifiMode', 
@@ -3148,11 +3542,46 @@
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate52MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate52MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate54Mbps() [member function]
     cls.add_method('GetOfdmRate54Mbps', 
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate54MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate54MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate57_8MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate57_8MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate58_5MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate58_5MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate60MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate60MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate65MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate65MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate65MbpsBW20MHzShGi() [member function]
+    cls.add_method('GetOfdmRate65MbpsBW20MHzShGi', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate6Mbps() [member function]
     cls.add_method('GetOfdmRate6Mbps', 
                    'ns3::WifiMode', 
@@ -3168,6 +3597,31 @@
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate6_5MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate6_5MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate72_2MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate72_2MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate7_2MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate7_2MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate81MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate81MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate90MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate90MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate9Mbps() [member function]
     cls.add_method('GetOfdmRate9Mbps', 
                    'ns3::WifiMode', 
@@ -3183,10 +3637,10 @@
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
-    ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPayloadDurationMicroSeconds(uint32_t size, ns3::WifiMode payloadMode) [member function]
+    ## wifi-phy.h (module 'wifi'): static double ns3::WifiPhy::GetPayloadDurationMicroSeconds(uint32_t size, ns3::WifiTxVector txvector) [member function]
     cls.add_method('GetPayloadDurationMicroSeconds', 
-                   'uint32_t', 
-                   [param('uint32_t', 'size'), param('ns3::WifiMode', 'payloadMode')], 
+                   'double', 
+                   [param('uint32_t', 'size'), param('ns3::WifiTxVector', 'txvector')], 
                    is_static=True)
     ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPlcpHeaderDurationMicroSeconds(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
     cls.add_method('GetPlcpHeaderDurationMicroSeconds', 
@@ -3198,6 +3652,16 @@
                    'ns3::WifiMode', 
                    [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPlcpHtSigHeaderDurationMicroSeconds(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
+    cls.add_method('GetPlcpHtSigHeaderDurationMicroSeconds', 
+                   'uint32_t', 
+                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPlcpHtTrainingSymbolDurationMicroSeconds(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble, ns3::WifiTxVector txvector) [member function]
+    cls.add_method('GetPlcpHtTrainingSymbolDurationMicroSeconds', 
+                   'uint32_t', 
+                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble'), param('ns3::WifiTxVector', 'txvector')], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPlcpPreambleDurationMicroSeconds(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
     cls.add_method('GetPlcpPreambleDurationMicroSeconds', 
                    'uint32_t', 
@@ -3208,6 +3672,11 @@
                    'ns3::Time', 
                    [], 
                    is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::GetStbc() const [member function]
+    cls.add_method('GetStbc', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): double ns3::WifiPhy::GetTxPowerEnd() const [member function]
     cls.add_method('GetTxPowerEnd', 
                    'double', 
@@ -3253,14 +3722,19 @@
                    'bool', 
                    [], 
                    is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): ns3::WifiMode ns3::WifiPhy::McsToWifiMode(uint8_t mcs) [member function]
+    cls.add_method('McsToWifiMode', 
+                   'ns3::WifiMode', 
+                   [param('uint8_t', 'mcs')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyMonitorSniffRx(ns3::Ptr<const ns3::Packet> packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble, double signalDbm, double noiseDbm) [member function]
     cls.add_method('NotifyMonitorSniffRx', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'channelFreqMhz'), param('uint16_t', 'channelNumber'), param('uint32_t', 'rate'), param('bool', 'isShortPreamble'), param('double', 'signalDbm'), param('double', 'noiseDbm')])
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyMonitorSniffTx(ns3::Ptr<const ns3::Packet> packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyMonitorSniffTx(ns3::Ptr<const ns3::Packet> packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble, uint8_t txPower) [member function]
     cls.add_method('NotifyMonitorSniffTx', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'channelFreqMhz'), param('uint16_t', 'channelNumber'), param('uint32_t', 'rate'), param('bool', 'isShortPreamble')])
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'channelFreqMhz'), param('uint16_t', 'channelNumber'), param('uint32_t', 'rate'), param('bool', 'isShortPreamble'), param('uint8_t', 'txPower')])
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyRxBegin(ns3::Ptr<const ns3::Packet> packet) [member function]
     cls.add_method('NotifyRxBegin', 
                    'void', 
@@ -3290,16 +3764,51 @@
                    'void', 
                    [param('ns3::WifiPhyListener *', 'listener')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SendPacket(ns3::Ptr<const ns3::Packet> packet, ns3::WifiMode mode, ns3::WifiPreamble preamble, uint8_t txPowerLevel) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SendPacket(ns3::Ptr<const ns3::Packet> packet, ns3::WifiMode mode, ns3::WifiPreamble preamble, ns3::WifiTxVector txvector) [member function]
     cls.add_method('SendPacket', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMode', 'mode'), param('ns3::WifiPreamble', 'preamble'), param('uint8_t', 'txPowerLevel')], 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMode', 'mode'), param('ns3::WifiPreamble', 'preamble'), param('ns3::WifiTxVector', 'txvector')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetChannelBonding(bool channelbonding) [member function]
+    cls.add_method('SetChannelBonding', 
+                   'void', 
+                   [param('bool', 'channelbonding')], 
                    is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetChannelNumber(uint16_t id) [member function]
     cls.add_method('SetChannelNumber', 
                    'void', 
                    [param('uint16_t', 'id')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetFrequency(uint32_t freq) [member function]
+    cls.add_method('SetFrequency', 
+                   'void', 
+                   [param('uint32_t', 'freq')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetGreenfield(bool greenfield) [member function]
+    cls.add_method('SetGreenfield', 
+                   'void', 
+                   [param('bool', 'greenfield')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetGuardInterval(bool GuardInterval) [member function]
+    cls.add_method('SetGuardInterval', 
+                   'void', 
+                   [param('bool', 'GuardInterval')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetLdpc(bool Ldpc) [member function]
+    cls.add_method('SetLdpc', 
+                   'void', 
+                   [param('bool', 'Ldpc')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetNumberOfReceiveAntennas(uint32_t rx) [member function]
+    cls.add_method('SetNumberOfReceiveAntennas', 
+                   'void', 
+                   [param('uint32_t', 'rx')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetNumberOfTransmitAntennas(uint32_t tx) [member function]
+    cls.add_method('SetNumberOfTransmitAntennas', 
+                   'void', 
+                   [param('uint32_t', 'tx')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetReceiveErrorCallback(ns3::Callback<void,ns3::Ptr<const ns3::Packet>,double,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> callback) [member function]
     cls.add_method('SetReceiveErrorCallback', 
                    'void', 
@@ -3310,6 +3819,16 @@
                    'void', 
                    [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiMode, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetStbc(bool stbc) [member function]
+    cls.add_method('SetStbc', 
+                   'void', 
+                   [param('bool', 'stbc')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::WifiModeToMcs(ns3::WifiMode mode) [member function]
+    cls.add_method('WifiModeToMcs', 
+                   'uint32_t', 
+                   [param('ns3::WifiMode', 'mode')], 
+                   is_pure_virtual=True, is_virtual=True)
     return
 
 def register_Ns3AttributeAccessor_methods(root_module, cls):
@@ -4572,6 +5091,10 @@
     cls.add_method('RemoveTrailer', 
                    'uint32_t', 
                    [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('ReplacePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
     cls.add_method('Serialize', 
                    'uint32_t', 
@@ -4749,13 +5272,6 @@
                    is_const=True, visibility='private', is_virtual=True)
     return
 
-def register_Ns3TimeChecker_methods(root_module, cls):
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor]
-    cls.add_constructor([])
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')])
-    return
-
 def register_Ns3TimeValue_methods(root_module, cls):
     ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
     cls.add_constructor([])
@@ -5106,15 +5622,128 @@
                    visibility='private', is_virtual=True)
     return
 
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_functions(root_module):
     module = root_module
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     register_functions_ns3_internal(module.get_submodule('internal'), root_module)
     return
 
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def register_functions_ns3_internal(module, root_module):
     return
 
diff -Naur ns-3.17/src/energy/bindings/modulegen__gcc_LP64.py ns-3.18/src/energy/bindings/modulegen__gcc_LP64.py
--- ns-3.17/src/energy/bindings/modulegen__gcc_LP64.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/energy/bindings/modulegen__gcc_LP64.py	2013-10-26 07:07:29.591364381 -0700
@@ -21,11 +21,11 @@
     root_module = module.get_root()
     
     ## wifi-mode.h (module 'wifi'): ns3::WifiCodeRate [enumeration]
-    module.add_enum('WifiCodeRate', ['WIFI_CODE_RATE_UNDEFINED', 'WIFI_CODE_RATE_3_4', 'WIFI_CODE_RATE_2_3', 'WIFI_CODE_RATE_1_2'], import_from_module='ns.wifi')
+    module.add_enum('WifiCodeRate', ['WIFI_CODE_RATE_UNDEFINED', 'WIFI_CODE_RATE_3_4', 'WIFI_CODE_RATE_2_3', 'WIFI_CODE_RATE_1_2', 'WIFI_CODE_RATE_5_6'], import_from_module='ns.wifi')
     ## wifi-preamble.h (module 'wifi'): ns3::WifiPreamble [enumeration]
-    module.add_enum('WifiPreamble', ['WIFI_PREAMBLE_LONG', 'WIFI_PREAMBLE_SHORT'], import_from_module='ns.wifi')
+    module.add_enum('WifiPreamble', ['WIFI_PREAMBLE_LONG', 'WIFI_PREAMBLE_SHORT', 'WIFI_PREAMBLE_HT_MF', 'WIFI_PREAMBLE_HT_GF'], import_from_module='ns.wifi')
     ## wifi-phy-standard.h (module 'wifi'): ns3::WifiPhyStandard [enumeration]
-    module.add_enum('WifiPhyStandard', ['WIFI_PHY_STANDARD_80211a', 'WIFI_PHY_STANDARD_80211b', 'WIFI_PHY_STANDARD_80211g', 'WIFI_PHY_STANDARD_80211_10MHZ', 'WIFI_PHY_STANDARD_80211_5MHZ', 'WIFI_PHY_STANDARD_holland', 'WIFI_PHY_STANDARD_80211p_CCH', 'WIFI_PHY_STANDARD_80211p_SCH'], import_from_module='ns.wifi')
+    module.add_enum('WifiPhyStandard', ['WIFI_PHY_STANDARD_80211a', 'WIFI_PHY_STANDARD_80211b', 'WIFI_PHY_STANDARD_80211g', 'WIFI_PHY_STANDARD_80211_10MHZ', 'WIFI_PHY_STANDARD_80211_5MHZ', 'WIFI_PHY_STANDARD_holland', 'WIFI_PHY_STANDARD_80211p_CCH', 'WIFI_PHY_STANDARD_80211p_SCH', 'WIFI_PHY_STANDARD_80211n_2_4GHZ', 'WIFI_PHY_STANDARD_80211n_5GHZ'], import_from_module='ns.wifi')
     ## wifi-mode.h (module 'wifi'): ns3::WifiModulationClass [enumeration]
     module.add_enum('WifiModulationClass', ['WIFI_MOD_CLASS_UNKNOWN', 'WIFI_MOD_CLASS_IR', 'WIFI_MOD_CLASS_FHSS', 'WIFI_MOD_CLASS_DSSS', 'WIFI_MOD_CLASS_ERP_PBCC', 'WIFI_MOD_CLASS_DSSS_OFDM', 'WIFI_MOD_CLASS_ERP_OFDM', 'WIFI_MOD_CLASS_OFDM', 'WIFI_MOD_CLASS_HT'], import_from_module='ns.wifi')
     ## address.h (module 'network'): ns3::Address [class]
@@ -60,6 +60,8 @@
     module.add_class('EnergySourceHelper', allow_subclassing=True)
     ## event-id.h (module 'core'): ns3::EventId [class]
     module.add_class('EventId', import_from_module='ns.core')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
     ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
     module.add_class('Ipv4Address', import_from_module='ns.network')
     ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
@@ -98,6 +100,8 @@
     module.add_class('PacketTagList', import_from_module='ns.network')
     ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct]
     module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration]
+    module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network')
     ## rv-battery-model-helper.h (module 'energy'): ns3::RvBatteryModelHelper [class]
     module.add_class('RvBatteryModelHelper', parent=root_module['ns3::EnergySourceHelper'])
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter> [class]
@@ -126,6 +130,8 @@
     module.add_class('WifiRadioEnergyModelHelper', parent=root_module['ns3::DeviceEnergyModelHelper'])
     ## wifi-radio-energy-model.h (module 'energy'): ns3::WifiRadioEnergyModelPhyListener [class]
     module.add_class('WifiRadioEnergyModelPhyListener', parent=root_module['ns3::WifiPhyListener'])
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector [class]
+    module.add_class('WifiTxVector', import_from_module='ns.wifi')
     ## empty.h (module 'core'): ns3::empty [class]
     module.add_class('empty', import_from_module='ns.core')
     ## int64x64-double.h (module 'core'): ns3::int64x64_t [class]
@@ -150,6 +156,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::NixVector', 'ns3::empty', 'ns3::DefaultDeleter<ns3::NixVector>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> > [class]
@@ -244,8 +252,6 @@
     module.add_class('RvBatteryModel', parent=root_module['ns3::EnergySource'])
     ## simple-device-energy-model.h (module 'energy'): ns3::SimpleDeviceEnergyModel [class]
     module.add_class('SimpleDeviceEnergyModel', parent=root_module['ns3::DeviceEnergyModel'])
-    ## nstime.h (module 'core'): ns3::TimeChecker [class]
-    module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
     module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
@@ -266,12 +272,19 @@
     module.add_class('AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
     ## basic-energy-source.h (module 'energy'): ns3::BasicEnergySource [class]
     module.add_class('BasicEnergySource', parent=root_module['ns3::EnergySource'])
+    module.add_container('ns3::WifiModeList', 'ns3::WifiMode', container_type='vector')
+    typehandlers.add_type_alias('std::vector< unsigned char, std::allocator< unsigned char > >', 'ns3::WifiMcsList')
+    typehandlers.add_type_alias('std::vector< unsigned char, std::allocator< unsigned char > >*', 'ns3::WifiMcsList*')
+    typehandlers.add_type_alias('std::vector< unsigned char, std::allocator< unsigned char > >&', 'ns3::WifiMcsList&')
     typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >', 'ns3::WifiModeList')
     typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >*', 'ns3::WifiModeList*')
     typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >&', 'ns3::WifiModeList&')
     typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >', 'ns3::WifiModeListIterator')
     typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >*', 'ns3::WifiModeListIterator*')
     typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >&', 'ns3::WifiModeListIterator&')
+    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< unsigned char const *, std::vector< unsigned char, std::allocator< unsigned char > > >', 'ns3::WifiMcsListIterator')
+    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< unsigned char const *, std::vector< unsigned char, std::allocator< unsigned char > > >*', 'ns3::WifiMcsListIterator*')
+    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< unsigned char const *, std::vector< unsigned char, std::allocator< unsigned char > > >&', 'ns3::WifiMcsListIterator&')
     
     ## Register a nested module for the namespace FatalImpl
     
@@ -279,6 +292,12 @@
     register_types_ns3_FatalImpl(nested_module)
     
     
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
+    
     ## Register a nested module for the namespace internal
     
     nested_module = module.add_cpp_namespace('internal')
@@ -289,6 +308,36 @@
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_types_ns3_internal(module):
     root_module = module.get_root()
     
@@ -309,6 +358,7 @@
     register_Ns3DeviceEnergyModelHelper_methods(root_module, root_module['ns3::DeviceEnergyModelHelper'])
     register_Ns3EnergySourceHelper_methods(root_module, root_module['ns3::EnergySourceHelper'])
     register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3Ipv4Address_methods(root_module, root_module['ns3::Ipv4Address'])
     register_Ns3Ipv4Mask_methods(root_module, root_module['ns3::Ipv4Mask'])
     register_Ns3Ipv6Address_methods(root_module, root_module['ns3::Ipv6Address'])
@@ -338,6 +388,7 @@
     register_Ns3WifiPhyListener_methods(root_module, root_module['ns3::WifiPhyListener'])
     register_Ns3WifiRadioEnergyModelHelper_methods(root_module, root_module['ns3::WifiRadioEnergyModelHelper'])
     register_Ns3WifiRadioEnergyModelPhyListener_methods(root_module, root_module['ns3::WifiRadioEnergyModelPhyListener'])
+    register_Ns3WifiTxVector_methods(root_module, root_module['ns3::WifiTxVector'])
     register_Ns3Empty_methods(root_module, root_module['ns3::empty'])
     register_Ns3Int64x64_t_methods(root_module, root_module['ns3::int64x64_t'])
     register_Ns3BasicEnergySourceHelper_methods(root_module, root_module['ns3::BasicEnergySourceHelper'])
@@ -350,6 +401,7 @@
     register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
     register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
     register_Ns3SimpleRefCount__Ns3Packet_Ns3Empty_Ns3DefaultDeleter__lt__ns3Packet__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
     register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter<ns3::TraceSourceAccessor> >'])
@@ -392,7 +444,6 @@
     register_Ns3Packet_methods(root_module, root_module['ns3::Packet'])
     register_Ns3RvBatteryModel_methods(root_module, root_module['ns3::RvBatteryModel'])
     register_Ns3SimpleDeviceEnergyModel_methods(root_module, root_module['ns3::SimpleDeviceEnergyModel'])
-    register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
     register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
@@ -403,6 +454,11 @@
     register_Ns3AddressChecker_methods(root_module, root_module['ns3::AddressChecker'])
     register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue'])
     register_Ns3BasicEnergySource_methods(root_module, root_module['ns3::BasicEnergySource'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     return
 
 def register_Ns3Address_methods(root_module, cls):
@@ -1041,6 +1097,35 @@
                    is_const=True)
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3Ipv4Address_methods(root_module, cls):
     cls.add_binary_comparison_operator('<')
     cls.add_binary_comparison_operator('!=')
@@ -1306,6 +1391,11 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
     cls.add_method('IsEqual', 
                    'bool', 
@@ -1345,16 +1435,36 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
     cls.add_method('MakeAutoconfiguredAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
     cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'mac')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
     cls.add_method('MakeIpv4MappedAddress', 
                    'ns3::Ipv6Address', 
@@ -1831,6 +1941,10 @@
     cls.add_method('RemoveAll', 
                    'void', 
                    [])
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function]
+    cls.add_method('Replace', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     return
 
 def register_Ns3PacketTagListTagData_methods(root_module, cls):
@@ -2054,6 +2168,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -2113,6 +2232,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -2345,6 +2474,79 @@
                    [param('ns3::Callback< void, int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')])
     return
 
+def register_Ns3WifiTxVector_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiTxVector const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::WifiTxVector const &', 'arg0')])
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector() [constructor]
+    cls.add_constructor([])
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiMode m, uint8_t l, uint8_t r, bool sg, uint8_t ns, uint8_t ne, bool Stbc) [constructor]
+    cls.add_constructor([param('ns3::WifiMode', 'm'), param('uint8_t', 'l'), param('uint8_t', 'r'), param('bool', 'sg'), param('uint8_t', 'ns'), param('uint8_t', 'ne'), param('bool', 'Stbc')])
+    ## wifi-tx-vector.h (module 'wifi'): ns3::WifiMode ns3::WifiTxVector::GetMode() const [member function]
+    cls.add_method('GetMode', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): uint8_t ns3::WifiTxVector::GetNess() const [member function]
+    cls.add_method('GetNess', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): uint8_t ns3::WifiTxVector::GetNss() const [member function]
+    cls.add_method('GetNss', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): uint8_t ns3::WifiTxVector::GetRetries() const [member function]
+    cls.add_method('GetRetries', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): uint8_t ns3::WifiTxVector::GetTxPowerLevel() const [member function]
+    cls.add_method('GetTxPowerLevel', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): bool ns3::WifiTxVector::IsShortGuardInterval() const [member function]
+    cls.add_method('IsShortGuardInterval', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): bool ns3::WifiTxVector::IsStbc() const [member function]
+    cls.add_method('IsStbc', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetMode(ns3::WifiMode mode) [member function]
+    cls.add_method('SetMode', 
+                   'void', 
+                   [param('ns3::WifiMode', 'mode')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetNess(uint8_t ness) [member function]
+    cls.add_method('SetNess', 
+                   'void', 
+                   [param('uint8_t', 'ness')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetNss(uint8_t nss) [member function]
+    cls.add_method('SetNss', 
+                   'void', 
+                   [param('uint8_t', 'nss')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetRetries(uint8_t retries) [member function]
+    cls.add_method('SetRetries', 
+                   'void', 
+                   [param('uint8_t', 'retries')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetShortGuardInterval(bool guardinterval) [member function]
+    cls.add_method('SetShortGuardInterval', 
+                   'void', 
+                   [param('bool', 'guardinterval')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetStbc(bool stbcsatuts) [member function]
+    cls.add_method('SetStbc', 
+                   'void', 
+                   [param('bool', 'stbcsatuts')])
+    ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetTxPowerLevel(uint8_t powerlevel) [member function]
+    cls.add_method('SetTxPowerLevel', 
+                   'void', 
+                   [param('uint8_t', 'powerlevel')])
+    return
+
 def register_Ns3Empty_methods(root_module, cls):
     ## empty.h (module 'core'): ns3::empty::empty() [constructor]
     cls.add_constructor([])
@@ -2657,6 +2859,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -2827,11 +3041,26 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
     cls.add_method('SetResolution', 
                    'void', 
                    [param('ns3::Time::Unit', 'resolution')], 
                    is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
     cls.add_method('To', 
                    'ns3::int64x64_t', 
@@ -2958,21 +3187,31 @@
                    'double', 
                    [param('ns3::WifiMode', 'txMode'), param('double', 'ber')], 
                    is_pure_virtual=True, is_const=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::CalculateTxDuration(uint32_t size, ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
+    ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::CalculateTxDuration(uint32_t size, ns3::WifiTxVector txvector, ns3::WifiPreamble preamble) [member function]
     cls.add_method('CalculateTxDuration', 
                    'ns3::Time', 
-                   [param('uint32_t', 'size'), param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
+                   [param('uint32_t', 'size'), param('ns3::WifiTxVector', 'txvector'), param('ns3::WifiPreamble', 'preamble')], 
                    is_static=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::ConfigureStandard(ns3::WifiPhyStandard standard) [member function]
     cls.add_method('ConfigureStandard', 
                    'void', 
                    [param('ns3::WifiPhyStandard', 'standard')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetBssMembershipSelector(uint32_t selector) const [member function]
+    cls.add_method('GetBssMembershipSelector', 
+                   'uint32_t', 
+                   [param('uint32_t', 'selector')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): ns3::Ptr<ns3::WifiChannel> ns3::WifiPhy::GetChannel() const [member function]
     cls.add_method('GetChannel', 
                    'ns3::Ptr< ns3::WifiChannel >', 
                    [], 
                    is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::GetChannelBonding() const [member function]
+    cls.add_method('GetChannelBonding', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): uint16_t ns3::WifiPhy::GetChannelNumber() const [member function]
     cls.add_method('GetChannelNumber', 
                    'uint16_t', 
@@ -3043,16 +3282,61 @@
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetFrequency() const [member function]
+    cls.add_method('GetFrequency', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::GetGreenfield() const [member function]
+    cls.add_method('GetGreenfield', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::GetGuardInterval() const [member function]
+    cls.add_method('GetGuardInterval', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): ns3::Time ns3::WifiPhy::GetLastRxStartTime() const [member function]
     cls.add_method('GetLastRxStartTime', 
                    'ns3::Time', 
                    [], 
                    is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::GetLdpc() const [member function]
+    cls.add_method('GetLdpc', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetMFPlcpHeaderMode(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
+    cls.add_method('GetMFPlcpHeaderMode', 
+                   'ns3::WifiMode', 
+                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): uint8_t ns3::WifiPhy::GetMcs(uint8_t mcs) const [member function]
+    cls.add_method('GetMcs', 
+                   'uint8_t', 
+                   [param('uint8_t', 'mcs')], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): ns3::WifiModeList ns3::WifiPhy::GetMembershipSelectorModes(uint32_t selector) [member function]
+    cls.add_method('GetMembershipSelectorModes', 
+                   'ns3::WifiModeList', 
+                   [param('uint32_t', 'selector')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): ns3::WifiMode ns3::WifiPhy::GetMode(uint32_t mode) const [member function]
     cls.add_method('GetMode', 
                    'ns3::WifiMode', 
                    [param('uint32_t', 'mode')], 
                    is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetNBssMembershipSelectors() const [member function]
+    cls.add_method('GetNBssMembershipSelectors', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint8_t ns3::WifiPhy::GetNMcs() const [member function]
+    cls.add_method('GetNMcs', 
+                   'uint8_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetNModes() const [member function]
     cls.add_method('GetNModes', 
                    'uint32_t', 
@@ -3063,6 +3347,31 @@
                    'uint32_t', 
                    [], 
                    is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetNumberOfReceiveAntennas() const [member function]
+    cls.add_method('GetNumberOfReceiveAntennas', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::GetNumberOfTransmitAntennas() const [member function]
+    cls.add_method('GetNumberOfTransmitAntennas', 
+                   'uint32_t', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate108MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate108MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate120MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate120MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate121_5MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate121_5MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate12Mbps() [member function]
     cls.add_method('GetOfdmRate12Mbps', 
                    'ns3::WifiMode', 
@@ -3078,11 +3387,46 @@
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate135MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate135MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate135MbpsBW40MHzShGi() [member function]
+    cls.add_method('GetOfdmRate135MbpsBW40MHzShGi', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate13MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate13MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate13_5MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate13_5MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate13_5MbpsBW5MHz() [member function]
     cls.add_method('GetOfdmRate13_5MbpsBW5MHz', 
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate14_4MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate14_4MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate150MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate150MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate15MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate15MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate18Mbps() [member function]
     cls.add_method('GetOfdmRate18Mbps', 
                    'ns3::WifiMode', 
@@ -3093,11 +3437,21 @@
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate19_5MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate19_5MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate1_5MbpsBW5MHz() [member function]
     cls.add_method('GetOfdmRate1_5MbpsBW5MHz', 
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate21_7MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate21_7MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate24Mbps() [member function]
     cls.add_method('GetOfdmRate24Mbps', 
                    'ns3::WifiMode', 
@@ -3108,21 +3462,46 @@
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate26MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate26MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate27MbpsBW10MHz() [member function]
     cls.add_method('GetOfdmRate27MbpsBW10MHz', 
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate27MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate27MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate28_9MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate28_9MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate2_25MbpsBW5MHz() [member function]
     cls.add_method('GetOfdmRate2_25MbpsBW5MHz', 
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate30MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate30MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate36Mbps() [member function]
     cls.add_method('GetOfdmRate36Mbps', 
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate39MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate39MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate3MbpsBW10MHz() [member function]
     cls.add_method('GetOfdmRate3MbpsBW10MHz', 
                    'ns3::WifiMode', 
@@ -3133,6 +3512,21 @@
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate40_5MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate40_5MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate43_3MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate43_3MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate45MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate45MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate48Mbps() [member function]
     cls.add_method('GetOfdmRate48Mbps', 
                    'ns3::WifiMode', 
@@ -3148,11 +3542,46 @@
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate52MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate52MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate54Mbps() [member function]
     cls.add_method('GetOfdmRate54Mbps', 
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate54MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate54MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate57_8MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate57_8MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate58_5MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate58_5MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate60MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate60MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate65MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate65MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate65MbpsBW20MHzShGi() [member function]
+    cls.add_method('GetOfdmRate65MbpsBW20MHzShGi', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate6Mbps() [member function]
     cls.add_method('GetOfdmRate6Mbps', 
                    'ns3::WifiMode', 
@@ -3168,6 +3597,31 @@
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate6_5MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate6_5MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate72_2MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate72_2MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate7_2MbpsBW20MHz() [member function]
+    cls.add_method('GetOfdmRate7_2MbpsBW20MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate81MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate81MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate90MbpsBW40MHz() [member function]
+    cls.add_method('GetOfdmRate90MbpsBW40MHz', 
+                   'ns3::WifiMode', 
+                   [], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetOfdmRate9Mbps() [member function]
     cls.add_method('GetOfdmRate9Mbps', 
                    'ns3::WifiMode', 
@@ -3183,10 +3637,10 @@
                    'ns3::WifiMode', 
                    [], 
                    is_static=True)
-    ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPayloadDurationMicroSeconds(uint32_t size, ns3::WifiMode payloadMode) [member function]
+    ## wifi-phy.h (module 'wifi'): static double ns3::WifiPhy::GetPayloadDurationMicroSeconds(uint32_t size, ns3::WifiTxVector txvector) [member function]
     cls.add_method('GetPayloadDurationMicroSeconds', 
-                   'uint32_t', 
-                   [param('uint32_t', 'size'), param('ns3::WifiMode', 'payloadMode')], 
+                   'double', 
+                   [param('uint32_t', 'size'), param('ns3::WifiTxVector', 'txvector')], 
                    is_static=True)
     ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPlcpHeaderDurationMicroSeconds(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
     cls.add_method('GetPlcpHeaderDurationMicroSeconds', 
@@ -3198,6 +3652,16 @@
                    'ns3::WifiMode', 
                    [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
                    is_static=True)
+    ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPlcpHtSigHeaderDurationMicroSeconds(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
+    cls.add_method('GetPlcpHtSigHeaderDurationMicroSeconds', 
+                   'uint32_t', 
+                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
+                   is_static=True)
+    ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPlcpHtTrainingSymbolDurationMicroSeconds(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble, ns3::WifiTxVector txvector) [member function]
+    cls.add_method('GetPlcpHtTrainingSymbolDurationMicroSeconds', 
+                   'uint32_t', 
+                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble'), param('ns3::WifiTxVector', 'txvector')], 
+                   is_static=True)
     ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPlcpPreambleDurationMicroSeconds(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
     cls.add_method('GetPlcpPreambleDurationMicroSeconds', 
                    'uint32_t', 
@@ -3208,6 +3672,11 @@
                    'ns3::Time', 
                    [], 
                    is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::GetStbc() const [member function]
+    cls.add_method('GetStbc', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): double ns3::WifiPhy::GetTxPowerEnd() const [member function]
     cls.add_method('GetTxPowerEnd', 
                    'double', 
@@ -3253,14 +3722,19 @@
                    'bool', 
                    [], 
                    is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): ns3::WifiMode ns3::WifiPhy::McsToWifiMode(uint8_t mcs) [member function]
+    cls.add_method('McsToWifiMode', 
+                   'ns3::WifiMode', 
+                   [param('uint8_t', 'mcs')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyMonitorSniffRx(ns3::Ptr<const ns3::Packet> packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble, double signalDbm, double noiseDbm) [member function]
     cls.add_method('NotifyMonitorSniffRx', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'channelFreqMhz'), param('uint16_t', 'channelNumber'), param('uint32_t', 'rate'), param('bool', 'isShortPreamble'), param('double', 'signalDbm'), param('double', 'noiseDbm')])
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyMonitorSniffTx(ns3::Ptr<const ns3::Packet> packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyMonitorSniffTx(ns3::Ptr<const ns3::Packet> packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble, uint8_t txPower) [member function]
     cls.add_method('NotifyMonitorSniffTx', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'channelFreqMhz'), param('uint16_t', 'channelNumber'), param('uint32_t', 'rate'), param('bool', 'isShortPreamble')])
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'channelFreqMhz'), param('uint16_t', 'channelNumber'), param('uint32_t', 'rate'), param('bool', 'isShortPreamble'), param('uint8_t', 'txPower')])
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyRxBegin(ns3::Ptr<const ns3::Packet> packet) [member function]
     cls.add_method('NotifyRxBegin', 
                    'void', 
@@ -3290,16 +3764,51 @@
                    'void', 
                    [param('ns3::WifiPhyListener *', 'listener')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SendPacket(ns3::Ptr<const ns3::Packet> packet, ns3::WifiMode mode, ns3::WifiPreamble preamble, uint8_t txPowerLevel) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SendPacket(ns3::Ptr<const ns3::Packet> packet, ns3::WifiMode mode, ns3::WifiPreamble preamble, ns3::WifiTxVector txvector) [member function]
     cls.add_method('SendPacket', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMode', 'mode'), param('ns3::WifiPreamble', 'preamble'), param('uint8_t', 'txPowerLevel')], 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMode', 'mode'), param('ns3::WifiPreamble', 'preamble'), param('ns3::WifiTxVector', 'txvector')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetChannelBonding(bool channelbonding) [member function]
+    cls.add_method('SetChannelBonding', 
+                   'void', 
+                   [param('bool', 'channelbonding')], 
                    is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetChannelNumber(uint16_t id) [member function]
     cls.add_method('SetChannelNumber', 
                    'void', 
                    [param('uint16_t', 'id')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetFrequency(uint32_t freq) [member function]
+    cls.add_method('SetFrequency', 
+                   'void', 
+                   [param('uint32_t', 'freq')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetGreenfield(bool greenfield) [member function]
+    cls.add_method('SetGreenfield', 
+                   'void', 
+                   [param('bool', 'greenfield')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetGuardInterval(bool GuardInterval) [member function]
+    cls.add_method('SetGuardInterval', 
+                   'void', 
+                   [param('bool', 'GuardInterval')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetLdpc(bool Ldpc) [member function]
+    cls.add_method('SetLdpc', 
+                   'void', 
+                   [param('bool', 'Ldpc')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetNumberOfReceiveAntennas(uint32_t rx) [member function]
+    cls.add_method('SetNumberOfReceiveAntennas', 
+                   'void', 
+                   [param('uint32_t', 'rx')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetNumberOfTransmitAntennas(uint32_t tx) [member function]
+    cls.add_method('SetNumberOfTransmitAntennas', 
+                   'void', 
+                   [param('uint32_t', 'tx')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetReceiveErrorCallback(ns3::Callback<void,ns3::Ptr<const ns3::Packet>,double,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> callback) [member function]
     cls.add_method('SetReceiveErrorCallback', 
                    'void', 
@@ -3310,6 +3819,16 @@
                    'void', 
                    [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiMode, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetStbc(bool stbc) [member function]
+    cls.add_method('SetStbc', 
+                   'void', 
+                   [param('bool', 'stbc')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): uint32_t ns3::WifiPhy::WifiModeToMcs(ns3::WifiMode mode) [member function]
+    cls.add_method('WifiModeToMcs', 
+                   'uint32_t', 
+                   [param('ns3::WifiMode', 'mode')], 
+                   is_pure_virtual=True, is_virtual=True)
     return
 
 def register_Ns3AttributeAccessor_methods(root_module, cls):
@@ -4572,6 +5091,10 @@
     cls.add_method('RemoveTrailer', 
                    'uint32_t', 
                    [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('ReplacePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
     cls.add_method('Serialize', 
                    'uint32_t', 
@@ -4749,13 +5272,6 @@
                    is_const=True, visibility='private', is_virtual=True)
     return
 
-def register_Ns3TimeChecker_methods(root_module, cls):
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor]
-    cls.add_constructor([])
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')])
-    return
-
 def register_Ns3TimeValue_methods(root_module, cls):
     ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
     cls.add_constructor([])
@@ -5106,15 +5622,128 @@
                    visibility='private', is_virtual=True)
     return
 
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_functions(root_module):
     module = root_module
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     register_functions_ns3_internal(module.get_submodule('internal'), root_module)
     return
 
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def register_functions_ns3_internal(module, root_module):
     return
 
diff -Naur ns-3.17/src/fd-net-device/bindings/callbacks_list.py ns-3.18/src/fd-net-device/bindings/callbacks_list.py
--- ns-3.17/src/fd-net-device/bindings/callbacks_list.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/fd-net-device/bindings/callbacks_list.py	2013-10-26 07:07:29.507364380 -0700
@@ -2,6 +2,6 @@
     ['bool', 'ns3::Ptr<ns3::NetDevice>', 'ns3::Ptr<ns3::Packet const>', 'unsigned short', 'ns3::Address const&', 'ns3::Address const&', 'ns3::NetDevice::PacketType', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['bool', 'ns3::Ptr<ns3::NetDevice>', 'ns3::Ptr<ns3::Packet const>', 'unsigned short', 'ns3::Address const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
-    ['void', 'unsigned char*', 'int', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
+    ['void', 'unsigned char*', 'long', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'ns3::Ptr<ns3::NetDevice>', 'ns3::Ptr<ns3::Packet const>', 'unsigned short', 'ns3::Address const&', 'ns3::Address const&', 'ns3::NetDevice::PacketType', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
 ]
diff -Naur ns-3.17/src/fd-net-device/bindings/modulegen__gcc_ILP32.py ns-3.18/src/fd-net-device/bindings/modulegen__gcc_ILP32.py
--- ns-3.17/src/fd-net-device/bindings/modulegen__gcc_ILP32.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/fd-net-device/bindings/modulegen__gcc_ILP32.py	2013-10-26 07:07:29.507364380 -0700
@@ -54,6 +54,8 @@
     module.add_class('DataRate', import_from_module='ns.network')
     ## event-id.h (module 'core'): ns3::EventId [class]
     module.add_class('EventId', import_from_module='ns.core')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
     ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
     module.add_class('Ipv4Address', import_from_module='ns.network')
     ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
@@ -96,6 +98,8 @@
     module.add_class('PacketTagList', import_from_module='ns.network')
     ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct]
     module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration]
+    module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network')
     ## pcap-file.h (module 'network'): ns3::PcapFile [class]
     module.add_class('PcapFile', import_from_module='ns.network')
     ## trace-helper.h (module 'network'): ns3::PcapHelper [class]
@@ -152,6 +156,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::FdReader, ns3::empty, ns3::DefaultDeleter<ns3::FdReader> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::FdReader', 'ns3::empty', 'ns3::DefaultDeleter<ns3::FdReader>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::NixVector', 'ns3::empty', 'ns3::DefaultDeleter<ns3::NixVector>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> > [class]
@@ -234,12 +240,8 @@
     module.add_class('OutputStreamWrapper', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> >'])
     ## packet.h (module 'network'): ns3::Packet [class]
     module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
-    ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): ns3::PlanetLabFdNetDeviceHelper [class]
-    module.add_class('PlanetLabFdNetDeviceHelper', parent=root_module['ns3::EmuFdNetDeviceHelper'])
     ## tap-fd-net-device-helper.h (module 'fd-net-device'): ns3::TapFdNetDeviceHelper [class]
     module.add_class('TapFdNetDeviceHelper', parent=root_module['ns3::EmuFdNetDeviceHelper'])
-    ## nstime.h (module 'core'): ns3::TimeChecker [class]
-    module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
     module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
@@ -262,11 +264,47 @@
     nested_module = module.add_cpp_namespace('FatalImpl')
     register_types_ns3_FatalImpl(nested_module)
     
+    
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
 
 def register_types_ns3_FatalImpl(module):
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_methods(root_module):
     register_Ns3Address_methods(root_module, root_module['ns3::Address'])
     register_Ns3AsciiTraceHelper_methods(root_module, root_module['ns3::AsciiTraceHelper'])
@@ -284,6 +322,7 @@
     register_Ns3CriticalSection_methods(root_module, root_module['ns3::CriticalSection'])
     register_Ns3DataRate_methods(root_module, root_module['ns3::DataRate'])
     register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3Ipv4Address_methods(root_module, root_module['ns3::Ipv4Address'])
     register_Ns3Ipv4Mask_methods(root_module, root_module['ns3::Ipv4Mask'])
     register_Ns3Ipv6Address_methods(root_module, root_module['ns3::Ipv6Address'])
@@ -327,6 +366,7 @@
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
     register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
     register_Ns3SimpleRefCount__Ns3FdReader_Ns3Empty_Ns3DefaultDeleter__lt__ns3FdReader__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::FdReader, ns3::empty, ns3::DefaultDeleter<ns3::FdReader> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
     register_Ns3SimpleRefCount__Ns3OutputStreamWrapper_Ns3Empty_Ns3DefaultDeleter__lt__ns3OutputStreamWrapper__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> >'])
     register_Ns3SimpleRefCount__Ns3Packet_Ns3Empty_Ns3DefaultDeleter__lt__ns3Packet__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
@@ -365,9 +405,7 @@
     register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue'])
     register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper'])
     register_Ns3Packet_methods(root_module, root_module['ns3::Packet'])
-    register_Ns3PlanetLabFdNetDeviceHelper_methods(root_module, root_module['ns3::PlanetLabFdNetDeviceHelper'])
     register_Ns3TapFdNetDeviceHelper_methods(root_module, root_module['ns3::TapFdNetDeviceHelper'])
-    register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
     register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
@@ -375,6 +413,11 @@
     register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue'])
     register_Ns3FdNetDevice_methods(root_module, root_module['ns3::FdNetDevice'])
     register_Ns3FdNetDeviceFdReader_methods(root_module, root_module['ns3::FdNetDeviceFdReader'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     return
 
 def register_Ns3Address_methods(root_module, cls):
@@ -1054,6 +1097,35 @@
                    is_const=True)
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3Ipv4Address_methods(root_module, cls):
     cls.add_binary_comparison_operator('<')
     cls.add_binary_comparison_operator('!=')
@@ -1319,6 +1391,11 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
     cls.add_method('IsEqual', 
                    'bool', 
@@ -1358,16 +1435,36 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
     cls.add_method('MakeAutoconfiguredAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
     cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'mac')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
     cls.add_method('MakeIpv4MappedAddress', 
                    'ns3::Ipv6Address', 
@@ -1916,6 +2013,10 @@
     cls.add_method('RemoveAll', 
                    'void', 
                    [])
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function]
+    cls.add_method('Replace', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     return
 
 def register_Ns3PacketTagListTagData_methods(root_module, cls):
@@ -2357,6 +2458,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -2416,6 +2522,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -2907,6 +3023,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -3126,11 +3254,26 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
     cls.add_method('SetResolution', 
                    'void', 
                    [param('ns3::Time::Unit', 'resolution')], 
                    is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
     cls.add_method('To', 
                    'ns3::int64x64_t', 
@@ -4164,6 +4307,10 @@
     cls.add_method('RemoveTrailer', 
                    'uint32_t', 
                    [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('ReplacePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
     cls.add_method('Serialize', 
                    'uint32_t', 
@@ -4175,36 +4322,6 @@
                    [param('ns3::Ptr< ns3::NixVector >', 'arg0')])
     return
 
-def register_Ns3PlanetLabFdNetDeviceHelper_methods(root_module, cls):
-    ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): ns3::PlanetLabFdNetDeviceHelper::PlanetLabFdNetDeviceHelper(ns3::PlanetLabFdNetDeviceHelper const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::PlanetLabFdNetDeviceHelper const &', 'arg0')])
-    ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): ns3::PlanetLabFdNetDeviceHelper::PlanetLabFdNetDeviceHelper() [constructor]
-    cls.add_constructor([])
-    ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): void ns3::PlanetLabFdNetDeviceHelper::SetTapIpAddress(ns3::Ipv4Address address) [member function]
-    cls.add_method('SetTapIpAddress', 
-                   'void', 
-                   [param('ns3::Ipv4Address', 'address')])
-    ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): void ns3::PlanetLabFdNetDeviceHelper::SetTapMask(ns3::Ipv4Mask mask) [member function]
-    cls.add_method('SetTapMask', 
-                   'void', 
-                   [param('ns3::Ipv4Mask', 'mask')])
-    ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): int ns3::PlanetLabFdNetDeviceHelper::CreateFileDescriptor() const [member function]
-    cls.add_method('CreateFileDescriptor', 
-                   'int', 
-                   [], 
-                   is_const=True, visibility='protected', is_virtual=True)
-    ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): ns3::Ptr<ns3::NetDevice> ns3::PlanetLabFdNetDeviceHelper::InstallPriv(ns3::Ptr<ns3::Node> node) const [member function]
-    cls.add_method('InstallPriv', 
-                   'ns3::Ptr< ns3::NetDevice >', 
-                   [param('ns3::Ptr< ns3::Node >', 'node')], 
-                   is_const=True, visibility='protected', is_virtual=True)
-    ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): void ns3::PlanetLabFdNetDeviceHelper::SetFileDescriptor(ns3::Ptr<ns3::FdNetDevice> device) const [member function]
-    cls.add_method('SetFileDescriptor', 
-                   'void', 
-                   [param('ns3::Ptr< ns3::FdNetDevice >', 'device')], 
-                   is_const=True, visibility='protected', is_virtual=True)
-    return
-
 def register_Ns3TapFdNetDeviceHelper_methods(root_module, cls):
     ## tap-fd-net-device-helper.h (module 'fd-net-device'): ns3::TapFdNetDeviceHelper::TapFdNetDeviceHelper(ns3::TapFdNetDeviceHelper const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::TapFdNetDeviceHelper const &', 'arg0')])
@@ -4251,13 +4368,6 @@
                    is_const=True, visibility='protected', is_virtual=True)
     return
 
-def register_Ns3TimeChecker_methods(root_module, cls):
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor]
-    cls.add_constructor([])
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')])
-    return
-
 def register_Ns3TimeValue_methods(root_module, cls):
     ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
     cls.add_constructor([])
@@ -4553,14 +4663,127 @@
                    visibility='private', is_virtual=True)
     return
 
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_functions(root_module):
     module = root_module
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     return
 
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def main():
     out = FileCodeSink(sys.stdout)
     root_module = module_init()
diff -Naur ns-3.17/src/fd-net-device/bindings/modulegen__gcc_LP64.py ns-3.18/src/fd-net-device/bindings/modulegen__gcc_LP64.py
--- ns-3.17/src/fd-net-device/bindings/modulegen__gcc_LP64.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/fd-net-device/bindings/modulegen__gcc_LP64.py	2013-10-26 07:07:29.507364380 -0700
@@ -54,6 +54,8 @@
     module.add_class('DataRate', import_from_module='ns.network')
     ## event-id.h (module 'core'): ns3::EventId [class]
     module.add_class('EventId', import_from_module='ns.core')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
     ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
     module.add_class('Ipv4Address', import_from_module='ns.network')
     ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
@@ -96,6 +98,8 @@
     module.add_class('PacketTagList', import_from_module='ns.network')
     ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct]
     module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration]
+    module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network')
     ## pcap-file.h (module 'network'): ns3::PcapFile [class]
     module.add_class('PcapFile', import_from_module='ns.network')
     ## trace-helper.h (module 'network'): ns3::PcapHelper [class]
@@ -152,6 +156,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::FdReader, ns3::empty, ns3::DefaultDeleter<ns3::FdReader> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::FdReader', 'ns3::empty', 'ns3::DefaultDeleter<ns3::FdReader>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::NixVector', 'ns3::empty', 'ns3::DefaultDeleter<ns3::NixVector>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> > [class]
@@ -234,12 +240,8 @@
     module.add_class('OutputStreamWrapper', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> >'])
     ## packet.h (module 'network'): ns3::Packet [class]
     module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
-    ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): ns3::PlanetLabFdNetDeviceHelper [class]
-    module.add_class('PlanetLabFdNetDeviceHelper', parent=root_module['ns3::EmuFdNetDeviceHelper'])
     ## tap-fd-net-device-helper.h (module 'fd-net-device'): ns3::TapFdNetDeviceHelper [class]
     module.add_class('TapFdNetDeviceHelper', parent=root_module['ns3::EmuFdNetDeviceHelper'])
-    ## nstime.h (module 'core'): ns3::TimeChecker [class]
-    module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
     module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
@@ -262,11 +264,47 @@
     nested_module = module.add_cpp_namespace('FatalImpl')
     register_types_ns3_FatalImpl(nested_module)
     
+    
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
 
 def register_types_ns3_FatalImpl(module):
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_methods(root_module):
     register_Ns3Address_methods(root_module, root_module['ns3::Address'])
     register_Ns3AsciiTraceHelper_methods(root_module, root_module['ns3::AsciiTraceHelper'])
@@ -284,6 +322,7 @@
     register_Ns3CriticalSection_methods(root_module, root_module['ns3::CriticalSection'])
     register_Ns3DataRate_methods(root_module, root_module['ns3::DataRate'])
     register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3Ipv4Address_methods(root_module, root_module['ns3::Ipv4Address'])
     register_Ns3Ipv4Mask_methods(root_module, root_module['ns3::Ipv4Mask'])
     register_Ns3Ipv6Address_methods(root_module, root_module['ns3::Ipv6Address'])
@@ -327,6 +366,7 @@
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
     register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
     register_Ns3SimpleRefCount__Ns3FdReader_Ns3Empty_Ns3DefaultDeleter__lt__ns3FdReader__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::FdReader, ns3::empty, ns3::DefaultDeleter<ns3::FdReader> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
     register_Ns3SimpleRefCount__Ns3OutputStreamWrapper_Ns3Empty_Ns3DefaultDeleter__lt__ns3OutputStreamWrapper__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> >'])
     register_Ns3SimpleRefCount__Ns3Packet_Ns3Empty_Ns3DefaultDeleter__lt__ns3Packet__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
@@ -365,9 +405,7 @@
     register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue'])
     register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper'])
     register_Ns3Packet_methods(root_module, root_module['ns3::Packet'])
-    register_Ns3PlanetLabFdNetDeviceHelper_methods(root_module, root_module['ns3::PlanetLabFdNetDeviceHelper'])
     register_Ns3TapFdNetDeviceHelper_methods(root_module, root_module['ns3::TapFdNetDeviceHelper'])
-    register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
     register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
@@ -375,6 +413,11 @@
     register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue'])
     register_Ns3FdNetDevice_methods(root_module, root_module['ns3::FdNetDevice'])
     register_Ns3FdNetDeviceFdReader_methods(root_module, root_module['ns3::FdNetDeviceFdReader'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     return
 
 def register_Ns3Address_methods(root_module, cls):
@@ -1054,6 +1097,35 @@
                    is_const=True)
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3Ipv4Address_methods(root_module, cls):
     cls.add_binary_comparison_operator('<')
     cls.add_binary_comparison_operator('!=')
@@ -1319,6 +1391,11 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
     cls.add_method('IsEqual', 
                    'bool', 
@@ -1358,16 +1435,36 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
     cls.add_method('MakeAutoconfiguredAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
     cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'mac')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
     cls.add_method('MakeIpv4MappedAddress', 
                    'ns3::Ipv6Address', 
@@ -1916,6 +2013,10 @@
     cls.add_method('RemoveAll', 
                    'void', 
                    [])
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function]
+    cls.add_method('Replace', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     return
 
 def register_Ns3PacketTagListTagData_methods(root_module, cls):
@@ -2357,6 +2458,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -2416,6 +2522,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -2907,6 +3023,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -3126,11 +3254,26 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
     cls.add_method('SetResolution', 
                    'void', 
                    [param('ns3::Time::Unit', 'resolution')], 
                    is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
     cls.add_method('To', 
                    'ns3::int64x64_t', 
@@ -4164,6 +4307,10 @@
     cls.add_method('RemoveTrailer', 
                    'uint32_t', 
                    [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('ReplacePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
     cls.add_method('Serialize', 
                    'uint32_t', 
@@ -4175,36 +4322,6 @@
                    [param('ns3::Ptr< ns3::NixVector >', 'arg0')])
     return
 
-def register_Ns3PlanetLabFdNetDeviceHelper_methods(root_module, cls):
-    ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): ns3::PlanetLabFdNetDeviceHelper::PlanetLabFdNetDeviceHelper(ns3::PlanetLabFdNetDeviceHelper const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::PlanetLabFdNetDeviceHelper const &', 'arg0')])
-    ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): ns3::PlanetLabFdNetDeviceHelper::PlanetLabFdNetDeviceHelper() [constructor]
-    cls.add_constructor([])
-    ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): void ns3::PlanetLabFdNetDeviceHelper::SetTapIpAddress(ns3::Ipv4Address address) [member function]
-    cls.add_method('SetTapIpAddress', 
-                   'void', 
-                   [param('ns3::Ipv4Address', 'address')])
-    ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): void ns3::PlanetLabFdNetDeviceHelper::SetTapMask(ns3::Ipv4Mask mask) [member function]
-    cls.add_method('SetTapMask', 
-                   'void', 
-                   [param('ns3::Ipv4Mask', 'mask')])
-    ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): int ns3::PlanetLabFdNetDeviceHelper::CreateFileDescriptor() const [member function]
-    cls.add_method('CreateFileDescriptor', 
-                   'int', 
-                   [], 
-                   is_const=True, visibility='protected', is_virtual=True)
-    ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): ns3::Ptr<ns3::NetDevice> ns3::PlanetLabFdNetDeviceHelper::InstallPriv(ns3::Ptr<ns3::Node> node) const [member function]
-    cls.add_method('InstallPriv', 
-                   'ns3::Ptr< ns3::NetDevice >', 
-                   [param('ns3::Ptr< ns3::Node >', 'node')], 
-                   is_const=True, visibility='protected', is_virtual=True)
-    ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): void ns3::PlanetLabFdNetDeviceHelper::SetFileDescriptor(ns3::Ptr<ns3::FdNetDevice> device) const [member function]
-    cls.add_method('SetFileDescriptor', 
-                   'void', 
-                   [param('ns3::Ptr< ns3::FdNetDevice >', 'device')], 
-                   is_const=True, visibility='protected', is_virtual=True)
-    return
-
 def register_Ns3TapFdNetDeviceHelper_methods(root_module, cls):
     ## tap-fd-net-device-helper.h (module 'fd-net-device'): ns3::TapFdNetDeviceHelper::TapFdNetDeviceHelper(ns3::TapFdNetDeviceHelper const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::TapFdNetDeviceHelper const &', 'arg0')])
@@ -4251,13 +4368,6 @@
                    is_const=True, visibility='protected', is_virtual=True)
     return
 
-def register_Ns3TimeChecker_methods(root_module, cls):
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor]
-    cls.add_constructor([])
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')])
-    return
-
 def register_Ns3TimeValue_methods(root_module, cls):
     ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
     cls.add_constructor([])
@@ -4553,14 +4663,127 @@
                    visibility='private', is_virtual=True)
     return
 
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_functions(root_module):
     module = root_module
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     return
 
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def main():
     out = FileCodeSink(sys.stdout)
     root_module = module_init()
diff -Naur ns-3.17/src/fd-net-device/doc/fd-net-device.rst ns-3.18/src/fd-net-device/doc/fd-net-device.rst
--- ns-3.17/src/fd-net-device/doc/fd-net-device.rst	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/fd-net-device/doc/fd-net-device.rst	2013-10-26 07:07:29.499364379 -0700
@@ -273,7 +273,7 @@
 on your network and won't conflict with anything else (including another
 simulation using such devices) on your network. If you are using the emulated
 FdNetDevice configuration in separate simulations,
- you must consider global MAC address
+you must consider global MAC address
 assignment issues and ensure that MAC addresses are unique across all
 simulations. The emulated net device respects the MAC address provided in the
 ``Address`` attribute so you can do this manually. For larger simulations, you
diff -Naur ns-3.17/src/fd-net-device/examples/fd-tap-ping6.cc ns-3.18/src/fd-net-device/examples/fd-tap-ping6.cc
--- ns-3.17/src/fd-net-device/examples/fd-tap-ping6.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/fd-net-device/examples/fd-tap-ping6.cc	2013-10-26 07:07:29.499364379 -0700
@@ -102,7 +102,8 @@
  
   ipv6.SetBase (Ipv6Address ("2001:0DB8:1::"), Ipv6Prefix (64));
   Ipv6InterfaceContainer i1 = ipv6.Assign (devs);
-  i1.SetRouter (1, true);
+  i1.SetForwarding (1, true);
+  i1.SetDefaultRouteInAllNodes (1);
   
   ipv6.SetBase (Ipv6Address ("2001:0DB8:2::"), Ipv6Prefix (64));
   Ipv6Address tapAddr = ipv6.NewAddress ();
@@ -124,7 +125,8 @@
   Ptr<FdNetDevice> fdevice = device->GetObject<FdNetDevice> ();
   fdevice-> SetIsMulticast (true);
   Ipv6InterfaceContainer i2 = ipv6.Assign (fdevs);
-  i2.SetRouter (0, true);
+  i2.SetForwarding (0, true);
+  i2.SetDefaultRouteInAllNodes (0);
 
   //
   // Create the Ping6 application.
diff -Naur ns-3.17/src/fd-net-device/helper/creator-utils.cc ns-3.18/src/fd-net-device/helper/creator-utils.cc
--- ns-3.17/src/fd-net-device/helper/creator-utils.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/fd-net-device/helper/creator-utils.cc	2013-10-26 07:07:29.499364379 -0700
@@ -18,6 +18,7 @@
 
 #include <unistd.h>
 #include <string>
+#include <cstring>
 #include <iostream>
 #include <iomanip>
 #include <sstream>
diff -Naur ns-3.17/src/fd-net-device/model/fd-net-device.cc ns-3.18/src/fd-net-device/model/fd-net-device.cc
--- ns-3.17/src/fd-net-device/model/fd-net-device.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/fd-net-device/model/fd-net-device.cc	2013-10-26 07:07:29.503364379 -0700
@@ -284,9 +284,9 @@
    }
 }
 
-// XXX: Consider having a instance member m_packetBuffer and using memmove
-//	instead of memcpy to add the PI header.
-//      It might be faster in this case to use memmove and avoid the extra mallocs.
+/// \todo Consider having a instance member m_packetBuffer and using memmove
+///  instead of memcpy to add the PI header.
+///  It might be faster in this case to use memmove and avoid the extra mallocs.
 static void
 AddPIHeader (uint8_t *&buf, ssize_t &len)
 {
diff -Naur ns-3.17/src/fd-net-device/wscript ns-3.18/src/fd-net-device/wscript
--- ns-3.17/src/fd-net-device/wscript	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/fd-net-device/wscript	2013-10-26 07:07:29.499364379 -0700
@@ -20,12 +20,20 @@
             define_name = 'HAVE_IF_NETS_H')
 
         # Enable the FdNetDevice module. 
-        # Our only requirement is threading support.
-        conf.env['ENABLE_FDNETDEV'] = True
-        conf.report_optional_feature("FdNetDevice", 
-            "File descriptor NetDevice",
-            True,
-            "FdNetDevice module enabled")
+        # Besides threading support, we also require ethernet.h
+        conf.env['ENABLE_FDNETDEV'] = conf.check_nonfatal(header_name='net/ethernet.h',
+                                                          define_name='HAVE_NET_ETHERNET_H')
+        if conf.env['ENABLE_FDNETDEV']:
+            conf.report_optional_feature("FdNetDevice", 
+                                         "File descriptor NetDevice",
+                                         True,
+                                         "FdNetDevice module enabled")
+        else:
+            conf.report_optional_feature("FdNetDevice", 
+                                         "File descriptor NetDevice",
+                                         False,
+                                         "<net/ethernet.h> include not detected")
+
     else:
         conf.report_optional_feature("FdNetDevice", 
             "File descriptor NetDevice",
diff -Naur ns-3.17/src/flow-monitor/bindings/modulegen__gcc_ILP32.py ns-3.18/src/flow-monitor/bindings/modulegen__gcc_ILP32.py
--- ns-3.17/src/flow-monitor/bindings/modulegen__gcc_ILP32.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/flow-monitor/bindings/modulegen__gcc_ILP32.py	2013-10-26 07:07:29.819364388 -0700
@@ -48,6 +48,8 @@
     module.add_class('EventId', import_from_module='ns.core')
     ## flow-monitor-helper.h (module 'flow-monitor'): ns3::FlowMonitorHelper [class]
     module.add_class('FlowMonitorHelper')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
     ## histogram.h (module 'flow-monitor'): ns3::Histogram [class]
     module.add_class('Histogram')
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress [class]
@@ -132,6 +134,8 @@
     module.add_class('PacketTagList', import_from_module='ns.network')
     ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct]
     module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration]
+    module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network')
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter> [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simulator.h (module 'core'): ns3::Simulator [class]
@@ -167,9 +171,9 @@
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header [class]
     module.add_class('Ipv4Header', import_from_module='ns.internet', parent=root_module['ns3::Header'])
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType [enumeration]
-    module.add_enum('DscpType', ['DscpDefault', 'CS1', 'AF11', 'AF12', 'AF13', 'CS2', 'AF21', 'AF22', 'AF23', 'CS3', 'AF31', 'AF32', 'AF33', 'CS4', 'AF41', 'AF42', 'AF43', 'CS5', 'EF', 'CS6', 'CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
+    module.add_enum('DscpType', ['DscpDefault', 'DSCP_CS1', 'DSCP_AF11', 'DSCP_AF12', 'DSCP_AF13', 'DSCP_CS2', 'DSCP_AF21', 'DSCP_AF22', 'DSCP_AF23', 'DSCP_CS3', 'DSCP_AF31', 'DSCP_AF32', 'DSCP_AF33', 'DSCP_CS4', 'DSCP_AF41', 'DSCP_AF42', 'DSCP_AF43', 'DSCP_CS5', 'DSCP_EF', 'DSCP_CS6', 'DSCP_CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType [enumeration]
-    module.add_enum('EcnType', ['NotECT', 'ECT1', 'ECT0', 'CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
+    module.add_enum('EcnType', ['ECN_NotECT', 'ECN_ECT1', 'ECN_ECT0', 'ECN_CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
     ## ipv6-header.h (module 'internet'): ns3::Ipv6Header [class]
     module.add_class('Ipv6Header', import_from_module='ns.internet', parent=root_module['ns3::Header'])
     ## ipv6-header.h (module 'internet'): ns3::Ipv6Header::NextHeader_e [enumeration]
@@ -190,6 +194,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::FlowClassifier, ns3::empty, ns3::DefaultDeleter<ns3::FlowClassifier> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, template_parameters=['ns3::FlowClassifier', 'ns3::empty', 'ns3::DefaultDeleter<ns3::FlowClassifier>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Ipv4MulticastRoute', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Ipv4MulticastRoute>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> > [class]
@@ -314,8 +320,6 @@
     module.add_class('OutputStreamWrapper', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> >'])
     ## packet.h (module 'network'): ns3::Packet [class]
     module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
-    ## nstime.h (module 'core'): ns3::TimeChecker [class]
-    module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
     module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
@@ -344,11 +348,47 @@
     nested_module = module.add_cpp_namespace('FatalImpl')
     register_types_ns3_FatalImpl(nested_module)
     
+    
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
 
 def register_types_ns3_FatalImpl(module):
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_methods(root_module):
     register_Ns3Address_methods(root_module, root_module['ns3::Address'])
     register_Ns3AttributeConstructionList_methods(root_module, root_module['ns3::AttributeConstructionList'])
@@ -363,6 +403,7 @@
     register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase'])
     register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
     register_Ns3FlowMonitorHelper_methods(root_module, root_module['ns3::FlowMonitorHelper'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3Histogram_methods(root_module, root_module['ns3::Histogram'])
     register_Ns3Inet6SocketAddress_methods(root_module, root_module['ns3::Inet6SocketAddress'])
     register_Ns3InetSocketAddress_methods(root_module, root_module['ns3::InetSocketAddress'])
@@ -413,6 +454,7 @@
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
     register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
     register_Ns3SimpleRefCount__Ns3FlowClassifier_Ns3Empty_Ns3DefaultDeleter__lt__ns3FlowClassifier__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::FlowClassifier, ns3::empty, ns3::DefaultDeleter<ns3::FlowClassifier> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3Ipv4MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4MulticastRoute__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> >'])
     register_Ns3SimpleRefCount__Ns3Ipv4Route_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4Route__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> >'])
     register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
@@ -467,12 +509,16 @@
     register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue'])
     register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper'])
     register_Ns3Packet_methods(root_module, root_module['ns3::Packet'])
-    register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
     register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
     register_Ns3AddressChecker_methods(root_module, root_module['ns3::AddressChecker'])
     register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     return
 
 def register_Ns3Address_methods(root_module, cls):
@@ -1029,6 +1075,35 @@
                    [param('std::string', 'n1'), param('ns3::AttributeValue const &', 'v1')])
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3Histogram_methods(root_module, cls):
     ## histogram.h (module 'flow-monitor'): ns3::Histogram::Histogram(ns3::Histogram const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::Histogram const &', 'arg0')])
@@ -1534,6 +1609,11 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
     cls.add_method('IsEqual', 
                    'bool', 
@@ -1573,16 +1653,36 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
     cls.add_method('MakeAutoconfiguredAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
     cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'mac')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
     cls.add_method('MakeIpv4MappedAddress', 
                    'ns3::Ipv6Address', 
@@ -2069,6 +2169,10 @@
     cls.add_method('RemoveAll', 
                    'void', 
                    [])
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function]
+    cls.add_method('Replace', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     return
 
 def register_Ns3PacketTagListTagData_methods(root_module, cls):
@@ -2405,6 +2509,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -2464,6 +2573,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -3110,6 +3229,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3Ipv4MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4MulticastRoute__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -3927,11 +4058,26 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
     cls.add_method('SetResolution', 
                    'void', 
                    [param('ns3::Time::Unit', 'resolution')], 
                    is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
     cls.add_method('To', 
                    'ns3::int64x64_t', 
@@ -4563,6 +4709,11 @@
                    'bool', 
                    [param('uint32_t', 'interface'), param('uint32_t', 'addressIndex')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## ipv4.h (module 'internet'): bool ns3::Ipv4::RemoveAddress(uint32_t interface, ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4Address', 'address')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## ipv4.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4::SelectSourceAddress(ns3::Ptr<const ns3::NetDevice> device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function]
     cls.add_method('SelectSourceAddress', 
                    'ns3::Ipv4Address', 
@@ -4836,6 +4987,11 @@
                    'bool', 
                    [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], 
                    is_virtual=True)
+    ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interface, ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4Address', 'address')], 
+                   is_virtual=True)
     ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr<const ns3::NetDevice> device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function]
     cls.add_method('SelectSourceAddress', 
                    'ns3::Ipv4Address', 
@@ -5228,6 +5384,10 @@
     cls.add_method('RemoveAddress', 
                    'ns3::Ipv6InterfaceAddress', 
                    [param('uint32_t', 'index')])
+    ## ipv6-interface.h (module 'internet'): ns3::Ipv6InterfaceAddress ns3::Ipv6Interface::RemoveAddress(ns3::Ipv6Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'ns3::Ipv6InterfaceAddress', 
+                   [param('ns3::Ipv6Address', 'address')])
     ## ipv6-interface.h (module 'internet'): void ns3::Ipv6Interface::Send(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Address dest) [member function]
     cls.add_method('Send', 
                    'void', 
@@ -5809,6 +5969,10 @@
     cls.add_method('RemoveTrailer', 
                    'uint32_t', 
                    [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('ReplacePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
     cls.add_method('Serialize', 
                    'uint32_t', 
@@ -5820,13 +5984,6 @@
                    [param('ns3::Ptr< ns3::NixVector >', 'arg0')])
     return
 
-def register_Ns3TimeChecker_methods(root_module, cls):
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor]
-    cls.add_constructor([])
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')])
-    return
-
 def register_Ns3TimeValue_methods(root_module, cls):
     ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
     cls.add_constructor([])
@@ -5940,14 +6097,127 @@
                    [param('ns3::Address const &', 'value')])
     return
 
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_functions(root_module):
     module = root_module
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     return
 
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def main():
     out = FileCodeSink(sys.stdout)
     root_module = module_init()
diff -Naur ns-3.17/src/flow-monitor/bindings/modulegen__gcc_LP64.py ns-3.18/src/flow-monitor/bindings/modulegen__gcc_LP64.py
--- ns-3.17/src/flow-monitor/bindings/modulegen__gcc_LP64.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/flow-monitor/bindings/modulegen__gcc_LP64.py	2013-10-26 07:07:29.815364387 -0700
@@ -48,6 +48,8 @@
     module.add_class('EventId', import_from_module='ns.core')
     ## flow-monitor-helper.h (module 'flow-monitor'): ns3::FlowMonitorHelper [class]
     module.add_class('FlowMonitorHelper')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
     ## histogram.h (module 'flow-monitor'): ns3::Histogram [class]
     module.add_class('Histogram')
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress [class]
@@ -132,6 +134,8 @@
     module.add_class('PacketTagList', import_from_module='ns.network')
     ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct]
     module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration]
+    module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network')
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter> [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simulator.h (module 'core'): ns3::Simulator [class]
@@ -167,9 +171,9 @@
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header [class]
     module.add_class('Ipv4Header', import_from_module='ns.internet', parent=root_module['ns3::Header'])
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType [enumeration]
-    module.add_enum('DscpType', ['DscpDefault', 'CS1', 'AF11', 'AF12', 'AF13', 'CS2', 'AF21', 'AF22', 'AF23', 'CS3', 'AF31', 'AF32', 'AF33', 'CS4', 'AF41', 'AF42', 'AF43', 'CS5', 'EF', 'CS6', 'CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
+    module.add_enum('DscpType', ['DscpDefault', 'DSCP_CS1', 'DSCP_AF11', 'DSCP_AF12', 'DSCP_AF13', 'DSCP_CS2', 'DSCP_AF21', 'DSCP_AF22', 'DSCP_AF23', 'DSCP_CS3', 'DSCP_AF31', 'DSCP_AF32', 'DSCP_AF33', 'DSCP_CS4', 'DSCP_AF41', 'DSCP_AF42', 'DSCP_AF43', 'DSCP_CS5', 'DSCP_EF', 'DSCP_CS6', 'DSCP_CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType [enumeration]
-    module.add_enum('EcnType', ['NotECT', 'ECT1', 'ECT0', 'CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
+    module.add_enum('EcnType', ['ECN_NotECT', 'ECN_ECT1', 'ECN_ECT0', 'ECN_CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
     ## ipv6-header.h (module 'internet'): ns3::Ipv6Header [class]
     module.add_class('Ipv6Header', import_from_module='ns.internet', parent=root_module['ns3::Header'])
     ## ipv6-header.h (module 'internet'): ns3::Ipv6Header::NextHeader_e [enumeration]
@@ -190,6 +194,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::FlowClassifier, ns3::empty, ns3::DefaultDeleter<ns3::FlowClassifier> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, template_parameters=['ns3::FlowClassifier', 'ns3::empty', 'ns3::DefaultDeleter<ns3::FlowClassifier>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Ipv4MulticastRoute', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Ipv4MulticastRoute>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> > [class]
@@ -314,8 +320,6 @@
     module.add_class('OutputStreamWrapper', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> >'])
     ## packet.h (module 'network'): ns3::Packet [class]
     module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
-    ## nstime.h (module 'core'): ns3::TimeChecker [class]
-    module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
     module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
@@ -344,11 +348,47 @@
     nested_module = module.add_cpp_namespace('FatalImpl')
     register_types_ns3_FatalImpl(nested_module)
     
+    
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
 
 def register_types_ns3_FatalImpl(module):
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_methods(root_module):
     register_Ns3Address_methods(root_module, root_module['ns3::Address'])
     register_Ns3AttributeConstructionList_methods(root_module, root_module['ns3::AttributeConstructionList'])
@@ -363,6 +403,7 @@
     register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase'])
     register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
     register_Ns3FlowMonitorHelper_methods(root_module, root_module['ns3::FlowMonitorHelper'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3Histogram_methods(root_module, root_module['ns3::Histogram'])
     register_Ns3Inet6SocketAddress_methods(root_module, root_module['ns3::Inet6SocketAddress'])
     register_Ns3InetSocketAddress_methods(root_module, root_module['ns3::InetSocketAddress'])
@@ -413,6 +454,7 @@
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
     register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
     register_Ns3SimpleRefCount__Ns3FlowClassifier_Ns3Empty_Ns3DefaultDeleter__lt__ns3FlowClassifier__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::FlowClassifier, ns3::empty, ns3::DefaultDeleter<ns3::FlowClassifier> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3Ipv4MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4MulticastRoute__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> >'])
     register_Ns3SimpleRefCount__Ns3Ipv4Route_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4Route__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> >'])
     register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter<ns3::NixVector> >'])
@@ -467,12 +509,16 @@
     register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue'])
     register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper'])
     register_Ns3Packet_methods(root_module, root_module['ns3::Packet'])
-    register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
     register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
     register_Ns3AddressChecker_methods(root_module, root_module['ns3::AddressChecker'])
     register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     return
 
 def register_Ns3Address_methods(root_module, cls):
@@ -1029,6 +1075,35 @@
                    [param('std::string', 'n1'), param('ns3::AttributeValue const &', 'v1')])
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3Histogram_methods(root_module, cls):
     ## histogram.h (module 'flow-monitor'): ns3::Histogram::Histogram(ns3::Histogram const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::Histogram const &', 'arg0')])
@@ -1534,6 +1609,11 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
     cls.add_method('IsEqual', 
                    'bool', 
@@ -1573,16 +1653,36 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
     cls.add_method('MakeAutoconfiguredAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
     cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'mac')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
     cls.add_method('MakeIpv4MappedAddress', 
                    'ns3::Ipv6Address', 
@@ -2069,6 +2169,10 @@
     cls.add_method('RemoveAll', 
                    'void', 
                    [])
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function]
+    cls.add_method('Replace', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     return
 
 def register_Ns3PacketTagListTagData_methods(root_module, cls):
@@ -2405,6 +2509,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -2464,6 +2573,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -3110,6 +3229,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3Ipv4MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4MulticastRoute__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -3927,11 +4058,26 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
     cls.add_method('SetResolution', 
                    'void', 
                    [param('ns3::Time::Unit', 'resolution')], 
                    is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
     cls.add_method('To', 
                    'ns3::int64x64_t', 
@@ -4563,6 +4709,11 @@
                    'bool', 
                    [param('uint32_t', 'interface'), param('uint32_t', 'addressIndex')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## ipv4.h (module 'internet'): bool ns3::Ipv4::RemoveAddress(uint32_t interface, ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4Address', 'address')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## ipv4.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4::SelectSourceAddress(ns3::Ptr<const ns3::NetDevice> device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function]
     cls.add_method('SelectSourceAddress', 
                    'ns3::Ipv4Address', 
@@ -4836,6 +4987,11 @@
                    'bool', 
                    [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], 
                    is_virtual=True)
+    ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interface, ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4Address', 'address')], 
+                   is_virtual=True)
     ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr<const ns3::NetDevice> device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function]
     cls.add_method('SelectSourceAddress', 
                    'ns3::Ipv4Address', 
@@ -5228,6 +5384,10 @@
     cls.add_method('RemoveAddress', 
                    'ns3::Ipv6InterfaceAddress', 
                    [param('uint32_t', 'index')])
+    ## ipv6-interface.h (module 'internet'): ns3::Ipv6InterfaceAddress ns3::Ipv6Interface::RemoveAddress(ns3::Ipv6Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'ns3::Ipv6InterfaceAddress', 
+                   [param('ns3::Ipv6Address', 'address')])
     ## ipv6-interface.h (module 'internet'): void ns3::Ipv6Interface::Send(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Address dest) [member function]
     cls.add_method('Send', 
                    'void', 
@@ -5809,6 +5969,10 @@
     cls.add_method('RemoveTrailer', 
                    'uint32_t', 
                    [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('ReplacePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
     cls.add_method('Serialize', 
                    'uint32_t', 
@@ -5820,13 +5984,6 @@
                    [param('ns3::Ptr< ns3::NixVector >', 'arg0')])
     return
 
-def register_Ns3TimeChecker_methods(root_module, cls):
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor]
-    cls.add_constructor([])
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')])
-    return
-
 def register_Ns3TimeValue_methods(root_module, cls):
     ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
     cls.add_constructor([])
@@ -5940,14 +6097,127 @@
                    [param('ns3::Address const &', 'value')])
     return
 
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_functions(root_module):
     module = root_module
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     return
 
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def main():
     out = FileCodeSink(sys.stdout)
     root_module = module_init()
diff -Naur ns-3.17/src/flow-monitor/model/flow-monitor.h ns-3.18/src/flow-monitor/model/flow-monitor.h
--- ns-3.17/src/flow-monitor/model/flow-monitor.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/flow-monitor/model/flow-monitor.h	2013-10-26 07:07:29.811364387 -0700
@@ -74,7 +74,7 @@
     /// relatively to the last packet of the stream,
     /// i.e. \f$Jitter\left\{P_N\right\} = \left|Delay\left\{P_N\right\} - Delay\left\{P_{N-1}\right\}\right|\f$.
     /// This definition is in accordance with the Type-P-One-way-ipdv
-    /// as defined in IETF RFC 3393.
+    /// as defined in IETF \RFC{3393}.
     Time     jitterSum; // jitterCount == rxPackets - 1
 
     Time     lastDelay;
diff -Naur ns-3.17/src/flow-monitor/model/histogram.h ns-3.18/src/flow-monitor/model/histogram.h
--- ns-3.17/src/flow-monitor/model/histogram.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/flow-monitor/model/histogram.h	2013-10-26 07:07:29.811364387 -0700
@@ -49,8 +49,8 @@
 
   void SerializeToXmlStream (std::ostream &os, int indent, std::string elementName) const;
 
-  // TODO: add method(s) to estimate N, µ, and s² from the histogram,
-  // see http://www.dspguide.com/ch2/4.htm
+  /// \todo add method(s) to estimate N, µ, and s² from the histogram,
+  /// see http://www.dspguide.com/ch2/4.htm
 
 private:
   std::vector<uint32_t> m_histogram;
diff -Naur ns-3.17/src/flow-monitor/wscript ns-3.18/src/flow-monitor/wscript
--- ns-3.17/src/flow-monitor/wscript	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/flow-monitor/wscript	2013-10-26 07:07:29.811364387 -0700
@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    obj = bld.create_ns3_module('flow-monitor', ['internet', 'config-store', 'tools'])
+    obj = bld.create_ns3_module('flow-monitor', ['internet', 'config-store'])
     obj.source = ["model/%s" % s for s in [
        'flow-monitor.cc',
        'flow-classifier.cc',
diff -Naur ns-3.17/src/internet/bindings/modulegen__gcc_ILP32.py ns-3.18/src/internet/bindings/modulegen__gcc_ILP32.py
--- ns-3.17/src/internet/bindings/modulegen__gcc_ILP32.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/bindings/modulegen__gcc_ILP32.py	2013-10-26 07:07:29.959364391 -0700
@@ -74,6 +74,8 @@
     module.add_class('GlobalRoutingLinkRecord')
     ## global-router-interface.h (module 'internet'): ns3::GlobalRoutingLinkRecord::LinkType [enumeration]
     module.add_enum('LinkType', ['Unknown', 'PointToPoint', 'TransitNetwork', 'StubNetwork', 'VirtualLink'], outer_class=root_module['ns3::GlobalRoutingLinkRecord'])
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress [class]
     module.add_class('Inet6SocketAddress', import_from_module='ns.network')
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress [class]
@@ -194,6 +196,8 @@
     module.add_class('PacketTagList', import_from_module='ns.network')
     ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct]
     module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration]
+    module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network')
     ## pcap-file.h (module 'network'): ns3::PcapFile [class]
     module.add_class('PcapFile', import_from_module='ns.network')
     ## trace-helper.h (module 'network'): ns3::PcapHelper [class]
@@ -315,9 +319,9 @@
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header [class]
     module.add_class('Ipv4Header', parent=root_module['ns3::Header'])
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType [enumeration]
-    module.add_enum('DscpType', ['DscpDefault', 'CS1', 'AF11', 'AF12', 'AF13', 'CS2', 'AF21', 'AF22', 'AF23', 'CS3', 'AF31', 'AF32', 'AF33', 'CS4', 'AF41', 'AF42', 'AF43', 'CS5', 'EF', 'CS6', 'CS7'], outer_class=root_module['ns3::Ipv4Header'])
+    module.add_enum('DscpType', ['DscpDefault', 'DSCP_CS1', 'DSCP_AF11', 'DSCP_AF12', 'DSCP_AF13', 'DSCP_CS2', 'DSCP_AF21', 'DSCP_AF22', 'DSCP_AF23', 'DSCP_CS3', 'DSCP_AF31', 'DSCP_AF32', 'DSCP_AF33', 'DSCP_CS4', 'DSCP_AF41', 'DSCP_AF42', 'DSCP_AF43', 'DSCP_CS5', 'DSCP_EF', 'DSCP_CS6', 'DSCP_CS7'], outer_class=root_module['ns3::Ipv4Header'])
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType [enumeration]
-    module.add_enum('EcnType', ['NotECT', 'ECT1', 'ECT0', 'CE'], outer_class=root_module['ns3::Ipv4Header'])
+    module.add_enum('EcnType', ['ECN_NotECT', 'ECN_ECT1', 'ECN_ECT0', 'ECN_CE'], outer_class=root_module['ns3::Ipv4Header'])
     ## ipv4-list-routing-helper.h (module 'internet'): ns3::Ipv4ListRoutingHelper [class]
     module.add_class('Ipv4ListRoutingHelper', parent=root_module['ns3::Ipv4RoutingHelper'])
     ## ipv4-packet-info-tag.h (module 'internet'): ns3::Ipv4PacketInfoTag [class]
@@ -372,6 +376,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, template_parameters=['ns3::Ipv4MulticastRoute', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Ipv4MulticastRoute>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> > [class]
@@ -490,6 +496,8 @@
     module.add_class('Channel', import_from_module='ns.network', parent=root_module['ns3::Object'])
     ## random-variable-stream.h (module 'core'): ns3::ConstantRandomVariable [class]
     module.add_class('ConstantRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## data-collection-object.h (module 'stats'): ns3::DataCollectionObject [class]
+    module.add_class('DataCollectionObject', import_from_module='ns.stats', parent=root_module['ns3::Object'])
     ## random-variable-stream.h (module 'core'): ns3::DeterministicRandomVariable [class]
     module.add_class('DeterministicRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
     ## double.h (module 'core'): ns3::DoubleValue [class]
@@ -592,6 +600,8 @@
     module.add_enum('DropReason', ['DROP_TTL_EXPIRED', 'DROP_NO_ROUTE', 'DROP_INTERFACE_DOWN', 'DROP_ROUTE_ERROR', 'DROP_UNKNOWN_PROTOCOL'], outer_class=root_module['ns3::Ipv6L3Protocol'])
     ## ipv6-route.h (module 'internet'): ns3::Ipv6MulticastRoute [class]
     module.add_class('Ipv6MulticastRoute', parent=root_module['ns3::SimpleRefCount< ns3::Ipv6MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv6MulticastRoute> >'])
+    ## ipv6-pmtu-cache.h (module 'internet'): ns3::Ipv6PmtuCache [class]
+    module.add_class('Ipv6PmtuCache', parent=root_module['ns3::Object'])
     ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixChecker [class]
     module.add_class('Ipv6PrefixChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
     ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixValue [class]
@@ -634,6 +644,8 @@
     module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
     ## random-variable-stream.h (module 'core'): ns3::ParetoRandomVariable [class]
     module.add_class('ParetoRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## probe.h (module 'stats'): ns3::Probe [class]
+    module.add_class('Probe', import_from_module='ns.stats', parent=root_module['ns3::DataCollectionObject'])
     ## tcp-l4-protocol.h (module 'internet'): ns3::TcpL4Protocol [class]
     module.add_class('TcpL4Protocol', parent=root_module['ns3::IpL4Protocol'])
     ## tcp-newreno.h (module 'internet'): ns3::TcpNewReno [class]
@@ -642,8 +654,6 @@
     module.add_class('TcpReno', parent=root_module['ns3::TcpSocketBase'])
     ## tcp-rfc793.h (module 'internet'): ns3::TcpRfc793 [class]
     module.add_class('TcpRfc793', parent=root_module['ns3::TcpSocketBase'])
-    ## nstime.h (module 'core'): ns3::TimeChecker [class]
-    module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
     module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
@@ -670,10 +680,14 @@
     module.add_class('Ipv4GlobalRouting', parent=root_module['ns3::Ipv4RoutingProtocol'])
     ## ipv4-list-routing.h (module 'internet'): ns3::Ipv4ListRouting [class]
     module.add_class('Ipv4ListRouting', parent=root_module['ns3::Ipv4RoutingProtocol'])
+    ## ipv4-packet-probe.h (module 'internet'): ns3::Ipv4PacketProbe [class]
+    module.add_class('Ipv4PacketProbe', parent=root_module['ns3::Probe'])
     ## ipv6-extension.h (module 'internet'): ns3::Ipv6ExtensionLooseRouting [class]
     module.add_class('Ipv6ExtensionLooseRouting', parent=root_module['ns3::Ipv6ExtensionRouting'])
     ## ipv6-list-routing.h (module 'internet'): ns3::Ipv6ListRouting [class]
     module.add_class('Ipv6ListRouting', parent=root_module['ns3::Ipv6RoutingProtocol'])
+    ## ipv6-packet-probe.h (module 'internet'): ns3::Ipv6PacketProbe [class]
+    module.add_class('Ipv6PacketProbe', parent=root_module['ns3::Probe'])
     ## loopback-net-device.h (module 'internet'): ns3::LoopbackNetDevice [class]
     module.add_class('LoopbackNetDevice', parent=root_module['ns3::NetDevice'])
     module.add_container('std::vector< unsigned int >', 'unsigned int', container_type='vector')
@@ -698,6 +712,12 @@
     register_types_ns3_FatalImpl(nested_module)
     
     
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
+    
     ## Register a nested module for the namespace internal
     
     nested_module = module.add_cpp_namespace('internal')
@@ -708,6 +728,36 @@
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_types_ns3_internal(module):
     root_module = module.get_root()
     
@@ -735,6 +785,7 @@
     register_Ns3GlobalRouteManagerLSDB_methods(root_module, root_module['ns3::GlobalRouteManagerLSDB'])
     register_Ns3GlobalRoutingLSA_methods(root_module, root_module['ns3::GlobalRoutingLSA'])
     register_Ns3GlobalRoutingLinkRecord_methods(root_module, root_module['ns3::GlobalRoutingLinkRecord'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3Inet6SocketAddress_methods(root_module, root_module['ns3::Inet6SocketAddress'])
     register_Ns3InetSocketAddress_methods(root_module, root_module['ns3::InetSocketAddress'])
     register_Ns3IntToType__0_methods(root_module, root_module['ns3::IntToType< 0 >'])
@@ -851,6 +902,7 @@
     register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
     register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3Ipv4MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4MulticastRoute__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> >'])
     register_Ns3SimpleRefCount__Ns3Ipv4Route_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4Route__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> >'])
     register_Ns3SimpleRefCount__Ns3Ipv6MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv6MulticastRoute__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv6MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv6MulticastRoute> >'])
@@ -901,6 +953,7 @@
     register_Ns3CallbackValue_methods(root_module, root_module['ns3::CallbackValue'])
     register_Ns3Channel_methods(root_module, root_module['ns3::Channel'])
     register_Ns3ConstantRandomVariable_methods(root_module, root_module['ns3::ConstantRandomVariable'])
+    register_Ns3DataCollectionObject_methods(root_module, root_module['ns3::DataCollectionObject'])
     register_Ns3DeterministicRandomVariable_methods(root_module, root_module['ns3::DeterministicRandomVariable'])
     register_Ns3DoubleValue_methods(root_module, root_module['ns3::DoubleValue'])
     register_Ns3EmpiricalRandomVariable_methods(root_module, root_module['ns3::EmpiricalRandomVariable'])
@@ -949,6 +1002,7 @@
     register_Ns3Ipv6Interface_methods(root_module, root_module['ns3::Ipv6Interface'])
     register_Ns3Ipv6L3Protocol_methods(root_module, root_module['ns3::Ipv6L3Protocol'])
     register_Ns3Ipv6MulticastRoute_methods(root_module, root_module['ns3::Ipv6MulticastRoute'])
+    register_Ns3Ipv6PmtuCache_methods(root_module, root_module['ns3::Ipv6PmtuCache'])
     register_Ns3Ipv6PrefixChecker_methods(root_module, root_module['ns3::Ipv6PrefixChecker'])
     register_Ns3Ipv6PrefixValue_methods(root_module, root_module['ns3::Ipv6PrefixValue'])
     register_Ns3Ipv6RawSocketFactory_methods(root_module, root_module['ns3::Ipv6RawSocketFactory'])
@@ -969,11 +1023,11 @@
     register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper'])
     register_Ns3Packet_methods(root_module, root_module['ns3::Packet'])
     register_Ns3ParetoRandomVariable_methods(root_module, root_module['ns3::ParetoRandomVariable'])
+    register_Ns3Probe_methods(root_module, root_module['ns3::Probe'])
     register_Ns3TcpL4Protocol_methods(root_module, root_module['ns3::TcpL4Protocol'])
     register_Ns3TcpNewReno_methods(root_module, root_module['ns3::TcpNewReno'])
     register_Ns3TcpReno_methods(root_module, root_module['ns3::TcpReno'])
     register_Ns3TcpRfc793_methods(root_module, root_module['ns3::TcpRfc793'])
-    register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
     register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
@@ -987,9 +1041,16 @@
     register_Ns3Icmpv6L4Protocol_methods(root_module, root_module['ns3::Icmpv6L4Protocol'])
     register_Ns3Ipv4GlobalRouting_methods(root_module, root_module['ns3::Ipv4GlobalRouting'])
     register_Ns3Ipv4ListRouting_methods(root_module, root_module['ns3::Ipv4ListRouting'])
+    register_Ns3Ipv4PacketProbe_methods(root_module, root_module['ns3::Ipv4PacketProbe'])
     register_Ns3Ipv6ExtensionLooseRouting_methods(root_module, root_module['ns3::Ipv6ExtensionLooseRouting'])
     register_Ns3Ipv6ListRouting_methods(root_module, root_module['ns3::Ipv6ListRouting'])
+    register_Ns3Ipv6PacketProbe_methods(root_module, root_module['ns3::Ipv6PacketProbe'])
     register_Ns3LoopbackNetDevice_methods(root_module, root_module['ns3::LoopbackNetDevice'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     return
 
 def register_Ns3Address_methods(root_module, cls):
@@ -1071,42 +1132,42 @@
     cls.add_method('CreateFileStream', 
                    'ns3::Ptr< ns3::OutputStreamWrapper >', 
                    [param('std::string', 'filename'), param('std::_Ios_Openmode', 'filemode', default_value='std::ios_base::out')])
-    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('DefaultDequeueSinkWithContext', 
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
                    is_static=True)
-    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('DefaultDequeueSinkWithoutContext', 
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
                    is_static=True)
-    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDropSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDropSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('DefaultDropSinkWithContext', 
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
                    is_static=True)
-    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDropSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDropSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('DefaultDropSinkWithoutContext', 
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
                    is_static=True)
-    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultEnqueueSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultEnqueueSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('DefaultEnqueueSinkWithContext', 
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
                    is_static=True)
-    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultEnqueueSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultEnqueueSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('DefaultEnqueueSinkWithoutContext', 
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
                    is_static=True)
-    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultReceiveSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultReceiveSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('DefaultReceiveSinkWithContext', 
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
                    is_static=True)
-    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultReceiveSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultReceiveSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('DefaultReceiveSinkWithoutContext', 
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
@@ -2035,6 +2096,35 @@
                    [param('uint16_t', 'metric')])
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3Inet6SocketAddress_methods(root_module, cls):
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress::Inet6SocketAddress(ns3::Inet6SocketAddress const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::Inet6SocketAddress const &', 'arg0')])
@@ -2900,6 +2990,11 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
     cls.add_method('IsEqual', 
                    'bool', 
@@ -2939,16 +3034,36 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
     cls.add_method('MakeAutoconfiguredAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
     cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'mac')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
     cls.add_method('MakeIpv4MappedAddress', 
                    'ns3::Ipv6Address', 
@@ -3165,6 +3280,14 @@
                    'uint32_t', 
                    [param('uint32_t', 'i')], 
                    is_const=True)
+    ## ipv6-interface-container.h (module 'internet'): ns3::Ipv6Address ns3::Ipv6InterfaceContainer::GetLinkLocalAddress(uint32_t i) [member function]
+    cls.add_method('GetLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('uint32_t', 'i')])
+    ## ipv6-interface-container.h (module 'internet'): ns3::Ipv6Address ns3::Ipv6InterfaceContainer::GetLinkLocalAddress(ns3::Ipv6Address address) [member function]
+    cls.add_method('GetLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Ipv6Address', 'address')])
     ## ipv6-interface-container.h (module 'internet'): uint32_t ns3::Ipv6InterfaceContainer::GetN() const [member function]
     cls.add_method('GetN', 
                    'uint32_t', 
@@ -3174,10 +3297,27 @@
     cls.add_method('SetDefaultRoute', 
                    'void', 
                    [param('uint32_t', 'i'), param('uint32_t', 'router')])
+    ## ipv6-interface-container.h (module 'internet'): void ns3::Ipv6InterfaceContainer::SetDefaultRoute(uint32_t i, ns3::Ipv6Address routerAddr) [member function]
+    cls.add_method('SetDefaultRoute', 
+                   'void', 
+                   [param('uint32_t', 'i'), param('ns3::Ipv6Address', 'routerAddr')])
+    ## ipv6-interface-container.h (module 'internet'): void ns3::Ipv6InterfaceContainer::SetDefaultRouteInAllNodes(uint32_t router) [member function]
+    cls.add_method('SetDefaultRouteInAllNodes', 
+                   'void', 
+                   [param('uint32_t', 'router')])
+    ## ipv6-interface-container.h (module 'internet'): void ns3::Ipv6InterfaceContainer::SetDefaultRouteInAllNodes(ns3::Ipv6Address routerAddr) [member function]
+    cls.add_method('SetDefaultRouteInAllNodes', 
+                   'void', 
+                   [param('ns3::Ipv6Address', 'routerAddr')])
+    ## ipv6-interface-container.h (module 'internet'): void ns3::Ipv6InterfaceContainer::SetForwarding(uint32_t i, bool state) [member function]
+    cls.add_method('SetForwarding', 
+                   'void', 
+                   [param('uint32_t', 'i'), param('bool', 'state')])
     ## ipv6-interface-container.h (module 'internet'): void ns3::Ipv6InterfaceContainer::SetRouter(uint32_t i, bool router) [member function]
     cls.add_method('SetRouter', 
                    'void', 
-                   [param('uint32_t', 'i'), param('bool', 'router')])
+                   [param('uint32_t', 'i'), param('bool', 'router')], 
+                   deprecated=True)
     return
 
 def register_Ns3Ipv6MulticastRoutingTableEntry_methods(root_module, cls):
@@ -3945,6 +4085,10 @@
     cls.add_method('RemoveAll', 
                    'void', 
                    [])
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function]
+    cls.add_method('Replace', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     return
 
 def register_Ns3PacketTagListTagData_methods(root_module, cls):
@@ -4036,11 +4180,11 @@
     cls.add_method('Write', 
                    'void', 
                    [param('uint32_t', 'tsSec'), param('uint32_t', 'tsUsec'), param('uint8_t const * const', 'data'), param('uint32_t', 'totalLen')])
-    ## pcap-file.h (module 'network'): void ns3::PcapFile::Write(uint32_t tsSec, uint32_t tsUsec, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## pcap-file.h (module 'network'): void ns3::PcapFile::Write(uint32_t tsSec, uint32_t tsUsec, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('Write', 
                    'void', 
                    [param('uint32_t', 'tsSec'), param('uint32_t', 'tsUsec'), param('ns3::Ptr< ns3::Packet const >', 'p')])
-    ## pcap-file.h (module 'network'): void ns3::PcapFile::Write(uint32_t tsSec, uint32_t tsUsec, ns3::Header & header, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## pcap-file.h (module 'network'): void ns3::PcapFile::Write(uint32_t tsSec, uint32_t tsUsec, ns3::Header & header, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('Write', 
                    'void', 
                    [param('uint32_t', 'tsSec'), param('uint32_t', 'tsUsec'), param('ns3::Header &', 'header'), param('ns3::Ptr< ns3::Packet const >', 'p')])
@@ -4786,6 +4930,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -4845,6 +4994,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -5106,7 +5265,7 @@
                    'ns3::TypeId', 
                    [], 
                    is_static=True)
-    ## icmpv4.h (module 'internet'): void ns3::Icmpv4DestinationUnreachable::SetData(ns3::Ptr<const ns3::Packet> data) [member function]
+    ## icmpv4.h (module 'internet'): void ns3::Icmpv4DestinationUnreachable::SetData(ns3::Ptr<ns3::Packet const> data) [member function]
     cls.add_method('SetData', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet const >', 'data')])
@@ -5200,7 +5359,7 @@
                    'void', 
                    [param('ns3::Buffer::Iterator', 'start')], 
                    is_const=True, is_virtual=True)
-    ## icmpv4.h (module 'internet'): void ns3::Icmpv4Echo::SetData(ns3::Ptr<const ns3::Packet> data) [member function]
+    ## icmpv4.h (module 'internet'): void ns3::Icmpv4Echo::SetData(ns3::Ptr<ns3::Packet const> data) [member function]
     cls.add_method('SetData', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet const >', 'data')])
@@ -5318,7 +5477,7 @@
                    'void', 
                    [param('ns3::Buffer::Iterator', 'start')], 
                    is_const=True, is_virtual=True)
-    ## icmpv4.h (module 'internet'): void ns3::Icmpv4TimeExceeded::SetData(ns3::Ptr<const ns3::Packet> data) [member function]
+    ## icmpv4.h (module 'internet'): void ns3::Icmpv4TimeExceeded::SetData(ns3::Ptr<ns3::Packet const> data) [member function]
     cls.add_method('SetData', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet const >', 'data')])
@@ -6244,10 +6403,18 @@
     cls.add_method('Reset', 
                    'void', 
                    [])
+    ## internet-stack-helper.h (module 'internet'): void ns3::InternetStackHelper::SetIpv4ArpJitter(bool enable) [member function]
+    cls.add_method('SetIpv4ArpJitter', 
+                   'void', 
+                   [param('bool', 'enable')])
     ## internet-stack-helper.h (module 'internet'): void ns3::InternetStackHelper::SetIpv4StackInstall(bool enable) [member function]
     cls.add_method('SetIpv4StackInstall', 
                    'void', 
                    [param('bool', 'enable')])
+    ## internet-stack-helper.h (module 'internet'): void ns3::InternetStackHelper::SetIpv6NsRsJitter(bool enable) [member function]
+    cls.add_method('SetIpv6NsRsJitter', 
+                   'void', 
+                   [param('bool', 'enable')])
     ## internet-stack-helper.h (module 'internet'): void ns3::InternetStackHelper::SetIpv6StackInstall(bool enable) [member function]
     cls.add_method('SetIpv6StackInstall', 
                    'void', 
@@ -7271,11 +7438,11 @@
     cls.add_method('Init', 
                    'void', 
                    [param('uint32_t', 'dataLinkType'), param('uint32_t', 'snapLen', default_value='std::numeric_limits<unsigned int>::max()'), param('int32_t', 'tzCorrection', default_value='ns3::PcapFile::ZONE_DEFAULT')])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::Write(ns3::Time t, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::Write(ns3::Time t, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('Write', 
                    'void', 
                    [param('ns3::Time', 't'), param('ns3::Ptr< ns3::Packet const >', 'p')])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::Write(ns3::Time t, ns3::Header & header, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::Write(ns3::Time t, ns3::Header & header, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('Write', 
                    'void', 
                    [param('ns3::Time', 't'), param('ns3::Header &', 'header'), param('ns3::Ptr< ns3::Packet const >', 'p')])
@@ -7577,6 +7744,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3Ipv4MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4MulticastRoute__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -9498,11 +9677,26 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
     cls.add_method('SetResolution', 
                    'void', 
                    [param('ns3::Time::Unit', 'resolution')], 
                    is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
     cls.add_method('To', 
                    'ns3::int64x64_t', 
@@ -10215,7 +10409,7 @@
     cls.add_method('CreateCache', 
                    'ns3::Ptr< ns3::ArpCache >', 
                    [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Ipv4Interface >', 'interface')])
-    ## arp-l3-protocol.h (module 'internet'): void ns3::ArpL3Protocol::Receive(ns3::Ptr<ns3::NetDevice> device, ns3::Ptr<const ns3::Packet> p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function]
+    ## arp-l3-protocol.h (module 'internet'): void ns3::ArpL3Protocol::Receive(ns3::Ptr<ns3::NetDevice> device, ns3::Ptr<ns3::Packet const> p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function]
     cls.add_method('Receive', 
                    'void', 
                    [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'from'), param('ns3::Address const &', 'to'), param('ns3::NetDevice::PacketType', 'packetType')])
@@ -10223,6 +10417,10 @@
     cls.add_method('Lookup', 
                    'bool', 
                    [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv4Address', 'destination'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::ArpCache >', 'cache'), param('ns3::Address *', 'hardwareDestination')])
+    ## arp-l3-protocol.h (module 'internet'): int64_t ns3::ArpL3Protocol::AssignStreams(int64_t stream) [member function]
+    cls.add_method('AssignStreams', 
+                   'int64_t', 
+                   [param('int64_t', 'stream')])
     ## arp-l3-protocol.h (module 'internet'): void ns3::ArpL3Protocol::DoDispose() [member function]
     cls.add_method('DoDispose', 
                    'void', 
@@ -10474,6 +10672,40 @@
                    is_virtual=True)
     return
 
+def register_Ns3DataCollectionObject_methods(root_module, cls):
+    ## data-collection-object.h (module 'stats'): ns3::DataCollectionObject::DataCollectionObject(ns3::DataCollectionObject const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::DataCollectionObject const &', 'arg0')])
+    ## data-collection-object.h (module 'stats'): ns3::DataCollectionObject::DataCollectionObject() [constructor]
+    cls.add_constructor([])
+    ## data-collection-object.h (module 'stats'): void ns3::DataCollectionObject::Disable() [member function]
+    cls.add_method('Disable', 
+                   'void', 
+                   [])
+    ## data-collection-object.h (module 'stats'): void ns3::DataCollectionObject::Enable() [member function]
+    cls.add_method('Enable', 
+                   'void', 
+                   [])
+    ## data-collection-object.h (module 'stats'): std::string ns3::DataCollectionObject::GetName() const [member function]
+    cls.add_method('GetName', 
+                   'std::string', 
+                   [], 
+                   is_const=True)
+    ## data-collection-object.h (module 'stats'): static ns3::TypeId ns3::DataCollectionObject::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## data-collection-object.h (module 'stats'): bool ns3::DataCollectionObject::IsEnabled() const [member function]
+    cls.add_method('IsEnabled', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## data-collection-object.h (module 'stats'): void ns3::DataCollectionObject::SetName(std::string name) [member function]
+    cls.add_method('SetName', 
+                   'void', 
+                   [param('std::string', 'name')])
+    return
+
 def register_Ns3DeterministicRandomVariable_methods(root_module, cls):
     ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::DeterministicRandomVariable::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
@@ -11168,6 +11400,11 @@
                    'bool', 
                    [param('uint32_t', 'interface'), param('uint32_t', 'addressIndex')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## ipv4.h (module 'internet'): bool ns3::Ipv4::RemoveAddress(uint32_t interface, ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4Address', 'address')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## ipv4.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4::SelectSourceAddress(ns3::Ptr<const ns3::NetDevice> device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function]
     cls.add_method('SelectSourceAddress', 
                    'ns3::Ipv4Address', 
@@ -11330,6 +11567,10 @@
     cls.add_method('RemoveAddress', 
                    'ns3::Ipv4InterfaceAddress', 
                    [param('uint32_t', 'index')])
+    ## ipv4-interface.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4Interface::RemoveAddress(ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'ns3::Ipv4InterfaceAddress', 
+                   [param('ns3::Ipv4Address', 'address')])
     ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::Send(ns3::Ptr<ns3::Packet> p, ns3::Ipv4Address dest) [member function]
     cls.add_method('Send', 
                    'void', 
@@ -11477,7 +11718,7 @@
                    'bool', 
                    [param('uint32_t', 'i')], 
                    is_const=True, is_virtual=True)
-    ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Receive(ns3::Ptr<ns3::NetDevice> device, ns3::Ptr<const ns3::Packet> p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function]
+    ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Receive(ns3::Ptr<ns3::NetDevice> device, ns3::Ptr<ns3::Packet const> p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function]
     cls.add_method('Receive', 
                    'void', 
                    [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'from'), param('ns3::Address const &', 'to'), param('ns3::NetDevice::PacketType', 'packetType')])
@@ -11490,6 +11731,11 @@
                    'bool', 
                    [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], 
                    is_virtual=True)
+    ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interface, ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4Address', 'address')], 
+                   is_virtual=True)
     ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr<const ns3::NetDevice> device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function]
     cls.add_method('SelectSourceAddress', 
                    'ns3::Ipv4Address', 
@@ -11706,7 +11952,7 @@
                    'int', 
                    [param('ns3::Address const &', 'address')], 
                    is_virtual=True)
-    ## ipv4-raw-socket-impl.h (module 'internet'): bool ns3::Ipv4RawSocketImpl::ForwardUp(ns3::Ptr<const ns3::Packet> p, ns3::Ipv4Header ipHeader, ns3::Ptr<ns3::Ipv4Interface> incomingInterface) [member function]
+    ## ipv4-raw-socket-impl.h (module 'internet'): bool ns3::Ipv4RawSocketImpl::ForwardUp(ns3::Ptr<ns3::Packet const> p, ns3::Ipv4Header ipHeader, ns3::Ptr<ns3::Ipv4Interface> incomingInterface) [member function]
     cls.add_method('ForwardUp', 
                    'bool', 
                    [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv4Header', 'ipHeader'), param('ns3::Ptr< ns3::Ipv4Interface >', 'incomingInterface')])
@@ -11884,7 +12130,7 @@
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], 
                    is_pure_virtual=True, is_const=True, is_virtual=True)
-    ## ipv4-routing-protocol.h (module 'internet'): bool ns3::Ipv4RoutingProtocol::RouteInput(ns3::Ptr<const ns3::Packet> p, ns3::Ipv4Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void,ns3::Ptr<ns3::Ipv4Route>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<ns3::Ipv4MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function]
+    ## ipv4-routing-protocol.h (module 'internet'): bool ns3::Ipv4RoutingProtocol::RouteInput(ns3::Ptr<ns3::Packet const> p, ns3::Ipv4Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void,ns3::Ptr<ns3::Ipv4Route>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<ns3::Ipv4MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function]
     cls.add_method('RouteInput', 
                    'bool', 
                    [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv4Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], 
@@ -11997,7 +12243,7 @@
     cls.add_method('RemoveRoute', 
                    'void', 
                    [param('uint32_t', 'i')])
-    ## ipv4-static-routing.h (module 'internet'): bool ns3::Ipv4StaticRouting::RouteInput(ns3::Ptr<const ns3::Packet> p, ns3::Ipv4Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void,ns3::Ptr<ns3::Ipv4Route>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<ns3::Ipv4MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function]
+    ## ipv4-static-routing.h (module 'internet'): bool ns3::Ipv4StaticRouting::RouteInput(ns3::Ptr<ns3::Packet const> p, ns3::Ipv4Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void,ns3::Ptr<ns3::Ipv4Route>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<ns3::Ipv4MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function]
     cls.add_method('RouteInput', 
                    'bool', 
                    [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv4Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], 
@@ -12122,6 +12368,11 @@
                    'bool', 
                    [param('uint32_t', 'interface'), param('uint32_t', 'addressIndex')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## ipv6.h (module 'internet'): bool ns3::Ipv6::RemoveAddress(uint32_t interface, ns3::Ipv6Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv6Address', 'address')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## ipv6.h (module 'internet'): void ns3::Ipv6::SetDown(uint32_t interface) [member function]
     cls.add_method('SetDown', 
                    'void', 
@@ -12137,6 +12388,11 @@
                    'void', 
                    [param('uint32_t', 'interface'), param('uint16_t', 'metric')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## ipv6.h (module 'internet'): void ns3::Ipv6::SetPmtu(ns3::Ipv6Address dst, uint32_t pmtu) [member function]
+    cls.add_method('SetPmtu', 
+                   'void', 
+                   [param('ns3::Ipv6Address', 'dst'), param('uint32_t', 'pmtu')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## ipv6.h (module 'internet'): void ns3::Ipv6::SetRoutingProtocol(ns3::Ptr<ns3::Ipv6RoutingProtocol> routingProtocol) [member function]
     cls.add_method('SetRoutingProtocol', 
                    'void', 
@@ -12154,11 +12410,21 @@
                    'bool', 
                    [], 
                    is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
+    ## ipv6.h (module 'internet'): bool ns3::Ipv6::GetMtuDiscover() const [member function]
+    cls.add_method('GetMtuDiscover', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
     ## ipv6.h (module 'internet'): void ns3::Ipv6::SetIpForward(bool forward) [member function]
     cls.add_method('SetIpForward', 
                    'void', 
                    [param('bool', 'forward')], 
                    is_pure_virtual=True, visibility='private', is_virtual=True)
+    ## ipv6.h (module 'internet'): void ns3::Ipv6::SetMtuDiscover(bool mtuDiscover) [member function]
+    cls.add_method('SetMtuDiscover', 
+                   'void', 
+                   [param('bool', 'mtuDiscover')], 
+                   is_pure_virtual=True, visibility='private', is_virtual=True)
     return
 
 def register_Ns3Ipv6AddressChecker_methods(root_module, cls):
@@ -12781,6 +13047,10 @@
     cls.add_method('RemoveAddress', 
                    'ns3::Ipv6InterfaceAddress', 
                    [param('uint32_t', 'index')])
+    ## ipv6-interface.h (module 'internet'): ns3::Ipv6InterfaceAddress ns3::Ipv6Interface::RemoveAddress(ns3::Ipv6Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'ns3::Ipv6InterfaceAddress', 
+                   [param('ns3::Ipv6Address', 'address')])
     ## ipv6-interface.h (module 'internet'): void ns3::Ipv6Interface::Send(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Address dest) [member function]
     cls.add_method('Send', 
                    'void', 
@@ -12883,7 +13153,7 @@
     cls.add_method('SetDefaultTclass', 
                    'void', 
                    [param('uint8_t', 'tclass')])
-    ## ipv6-l3-protocol.h (module 'internet'): void ns3::Ipv6L3Protocol::Receive(ns3::Ptr<ns3::NetDevice> device, ns3::Ptr<const ns3::Packet> p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function]
+    ## ipv6-l3-protocol.h (module 'internet'): void ns3::Ipv6L3Protocol::Receive(ns3::Ptr<ns3::NetDevice> device, ns3::Ptr<ns3::Packet const> p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function]
     cls.add_method('Receive', 
                    'void', 
                    [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'from'), param('ns3::Address const &', 'to'), param('ns3::NetDevice::PacketType', 'packetType')])
@@ -12951,6 +13221,11 @@
                    'bool', 
                    [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], 
                    is_virtual=True)
+    ## ipv6-l3-protocol.h (module 'internet'): bool ns3::Ipv6L3Protocol::RemoveAddress(uint32_t interface, ns3::Ipv6Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv6Address', 'address')], 
+                   is_virtual=True)
     ## ipv6-l3-protocol.h (module 'internet'): void ns3::Ipv6L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function]
     cls.add_method('SetMetric', 
                    'void', 
@@ -12966,6 +13241,11 @@
                    'uint16_t', 
                    [param('uint32_t', 'i')], 
                    is_const=True, is_virtual=True)
+    ## ipv6-l3-protocol.h (module 'internet'): void ns3::Ipv6L3Protocol::SetPmtu(ns3::Ipv6Address dst, uint32_t pmtu) [member function]
+    cls.add_method('SetPmtu', 
+                   'void', 
+                   [param('ns3::Ipv6Address', 'dst'), param('uint32_t', 'pmtu')], 
+                   is_virtual=True)
     ## ipv6-l3-protocol.h (module 'internet'): bool ns3::Ipv6L3Protocol::IsUp(uint32_t i) const [member function]
     cls.add_method('IsUp', 
                    'bool', 
@@ -13039,6 +13319,16 @@
                    'bool', 
                    [], 
                    is_const=True, visibility='private', is_virtual=True)
+    ## ipv6-l3-protocol.h (module 'internet'): void ns3::Ipv6L3Protocol::SetMtuDiscover(bool mtuDiscover) [member function]
+    cls.add_method('SetMtuDiscover', 
+                   'void', 
+                   [param('bool', 'mtuDiscover')], 
+                   visibility='private', is_virtual=True)
+    ## ipv6-l3-protocol.h (module 'internet'): bool ns3::Ipv6L3Protocol::GetMtuDiscover() const [member function]
+    cls.add_method('GetMtuDiscover', 
+                   'bool', 
+                   [], 
+                   is_const=True, visibility='private', is_virtual=True)
     ## ipv6-l3-protocol.h (module 'internet'): void ns3::Ipv6L3Protocol::SetSendIcmpv6Redirect(bool sendIcmpv6Redirect) [member function]
     cls.add_method('SetSendIcmpv6Redirect', 
                    'void', 
@@ -13104,6 +13394,40 @@
     cls.add_static_attribute('MAX_TTL', 'uint32_t const', is_const=True)
     return
 
+def register_Ns3Ipv6PmtuCache_methods(root_module, cls):
+    ## ipv6-pmtu-cache.h (module 'internet'): ns3::Ipv6PmtuCache::Ipv6PmtuCache(ns3::Ipv6PmtuCache const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv6PmtuCache const &', 'arg0')])
+    ## ipv6-pmtu-cache.h (module 'internet'): ns3::Ipv6PmtuCache::Ipv6PmtuCache() [constructor]
+    cls.add_constructor([])
+    ## ipv6-pmtu-cache.h (module 'internet'): void ns3::Ipv6PmtuCache::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    ## ipv6-pmtu-cache.h (module 'internet'): uint32_t ns3::Ipv6PmtuCache::GetPmtu(ns3::Ipv6Address dst) [member function]
+    cls.add_method('GetPmtu', 
+                   'uint32_t', 
+                   [param('ns3::Ipv6Address', 'dst')])
+    ## ipv6-pmtu-cache.h (module 'internet'): ns3::Time ns3::Ipv6PmtuCache::GetPmtuValidityTime() const [member function]
+    cls.add_method('GetPmtuValidityTime', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## ipv6-pmtu-cache.h (module 'internet'): static ns3::TypeId ns3::Ipv6PmtuCache::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## ipv6-pmtu-cache.h (module 'internet'): void ns3::Ipv6PmtuCache::SetPmtu(ns3::Ipv6Address dst, uint32_t pmtu) [member function]
+    cls.add_method('SetPmtu', 
+                   'void', 
+                   [param('ns3::Ipv6Address', 'dst'), param('uint32_t', 'pmtu')])
+    ## ipv6-pmtu-cache.h (module 'internet'): bool ns3::Ipv6PmtuCache::SetPmtuValidityTime(ns3::Time validity) [member function]
+    cls.add_method('SetPmtuValidityTime', 
+                   'bool', 
+                   [param('ns3::Time', 'validity')])
+    return
+
 def register_Ns3Ipv6PrefixChecker_methods(root_module, cls):
     ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixChecker::Ipv6PrefixChecker() [constructor]
     cls.add_constructor([])
@@ -13245,10 +13569,10 @@
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], 
                    is_pure_virtual=True, is_const=True, is_virtual=True)
-    ## ipv6-routing-protocol.h (module 'internet'): bool ns3::Ipv6RoutingProtocol::RouteInput(ns3::Ptr<const ns3::Packet> p, ns3::Ipv6Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void,ns3::Ptr<ns3::Ipv6Route>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<ns3::Ipv6MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function]
+    ## ipv6-routing-protocol.h (module 'internet'): bool ns3::Ipv6RoutingProtocol::RouteInput(ns3::Ptr<ns3::Packet const> p, ns3::Ipv6Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void,ns3::Ptr<const ns3::NetDevice>,ns3::Ptr<ns3::Ipv6Route>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<const ns3::NetDevice>,ns3::Ptr<ns3::Ipv6MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function]
     cls.add_method('RouteInput', 
                    'bool', 
-                   [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv6Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv6MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], 
+                   [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice const >, ns3::Ptr< ns3::Ipv6Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice const >, ns3::Ptr< ns3::Ipv6MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], 
                    is_pure_virtual=True, is_virtual=True)
     ## ipv6-routing-protocol.h (module 'internet'): ns3::Ptr<ns3::Ipv6Route> ns3::Ipv6RoutingProtocol::RouteOutput(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Header const & header, ns3::Ptr<ns3::NetDevice> oif, ns3::Socket::SocketErrno & sockerr) [member function]
     cls.add_method('RouteOutput', 
@@ -13380,10 +13704,10 @@
     cls.add_method('RemoveRoute', 
                    'void', 
                    [param('ns3::Ipv6Address', 'network'), param('ns3::Ipv6Prefix', 'prefix'), param('uint32_t', 'ifIndex'), param('ns3::Ipv6Address', 'prefixToUse')])
-    ## ipv6-static-routing.h (module 'internet'): bool ns3::Ipv6StaticRouting::RouteInput(ns3::Ptr<const ns3::Packet> p, ns3::Ipv6Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void,ns3::Ptr<ns3::Ipv6Route>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<ns3::Ipv6MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function]
+    ## ipv6-static-routing.h (module 'internet'): bool ns3::Ipv6StaticRouting::RouteInput(ns3::Ptr<ns3::Packet const> p, ns3::Ipv6Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void,ns3::Ptr<const ns3::NetDevice>,ns3::Ptr<ns3::Ipv6Route>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<const ns3::NetDevice>,ns3::Ptr<ns3::Ipv6MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function]
     cls.add_method('RouteInput', 
                    'bool', 
-                   [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv6Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv6MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], 
+                   [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice const >, ns3::Ptr< ns3::Ipv6Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice const >, ns3::Ptr< ns3::Ipv6MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], 
                    is_virtual=True)
     ## ipv6-static-routing.h (module 'internet'): ns3::Ptr<ns3::Ipv6Route> ns3::Ipv6StaticRouting::RouteOutput(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Header const & header, ns3::Ptr<ns3::NetDevice> oif, ns3::Socket::SocketErrno & sockerr) [member function]
     cls.add_method('RouteOutput', 
@@ -14072,7 +14396,7 @@
     cls.add_constructor([param('uint8_t const *', 'buffer'), param('uint32_t', 'size'), param('bool', 'magic')])
     ## packet.h (module 'network'): ns3::Packet::Packet(uint8_t const * buffer, uint32_t size) [constructor]
     cls.add_constructor([param('uint8_t const *', 'buffer'), param('uint32_t', 'size')])
-    ## packet.h (module 'network'): void ns3::Packet::AddAtEnd(ns3::Ptr<const ns3::Packet> packet) [member function]
+    ## packet.h (module 'network'): void ns3::Packet::AddAtEnd(ns3::Ptr<ns3::Packet const> packet) [member function]
     cls.add_method('AddAtEnd', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet const >', 'packet')])
@@ -14230,6 +14554,10 @@
     cls.add_method('RemoveTrailer', 
                    'uint32_t', 
                    [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('ReplacePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
     cls.add_method('Serialize', 
                    'uint32_t', 
@@ -14284,6 +14612,33 @@
                    is_virtual=True)
     return
 
+def register_Ns3Probe_methods(root_module, cls):
+    ## probe.h (module 'stats'): ns3::Probe::Probe(ns3::Probe const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Probe const &', 'arg0')])
+    ## probe.h (module 'stats'): ns3::Probe::Probe() [constructor]
+    cls.add_constructor([])
+    ## probe.h (module 'stats'): bool ns3::Probe::ConnectByObject(std::string traceSource, ns3::Ptr<ns3::Object> obj) [member function]
+    cls.add_method('ConnectByObject', 
+                   'bool', 
+                   [param('std::string', 'traceSource'), param('ns3::Ptr< ns3::Object >', 'obj')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## probe.h (module 'stats'): void ns3::Probe::ConnectByPath(std::string path) [member function]
+    cls.add_method('ConnectByPath', 
+                   'void', 
+                   [param('std::string', 'path')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## probe.h (module 'stats'): static ns3::TypeId ns3::Probe::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## probe.h (module 'stats'): bool ns3::Probe::IsEnabled() const [member function]
+    cls.add_method('IsEnabled', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    return
+
 def register_Ns3TcpL4Protocol_methods(root_module, cls):
     ## tcp-l4-protocol.h (module 'internet'): ns3::TcpL4Protocol::PROT_NUMBER [variable]
     cls.add_static_attribute('PROT_NUMBER', 'uint8_t const', is_const=True)
@@ -14605,13 +14960,6 @@
                    visibility='protected', is_virtual=True)
     return
 
-def register_Ns3TimeChecker_methods(root_module, cls):
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor]
-    cls.add_constructor([])
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')])
-    return
-
 def register_Ns3TimeValue_methods(root_module, cls):
     ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
     cls.add_constructor([])
@@ -15068,12 +15416,12 @@
                    'void', 
                    [], 
                    visibility='protected', is_virtual=True)
-    ## bridge-net-device.h (module 'bridge'): void ns3::BridgeNetDevice::ForwardBroadcast(ns3::Ptr<ns3::NetDevice> incomingPort, ns3::Ptr<const ns3::Packet> packet, uint16_t protocol, ns3::Mac48Address src, ns3::Mac48Address dst) [member function]
+    ## bridge-net-device.h (module 'bridge'): void ns3::BridgeNetDevice::ForwardBroadcast(ns3::Ptr<ns3::NetDevice> incomingPort, ns3::Ptr<ns3::Packet const> packet, uint16_t protocol, ns3::Mac48Address src, ns3::Mac48Address dst) [member function]
     cls.add_method('ForwardBroadcast', 
                    'void', 
                    [param('ns3::Ptr< ns3::NetDevice >', 'incomingPort'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'protocol'), param('ns3::Mac48Address', 'src'), param('ns3::Mac48Address', 'dst')], 
                    visibility='protected')
-    ## bridge-net-device.h (module 'bridge'): void ns3::BridgeNetDevice::ForwardUnicast(ns3::Ptr<ns3::NetDevice> incomingPort, ns3::Ptr<const ns3::Packet> packet, uint16_t protocol, ns3::Mac48Address src, ns3::Mac48Address dst) [member function]
+    ## bridge-net-device.h (module 'bridge'): void ns3::BridgeNetDevice::ForwardUnicast(ns3::Ptr<ns3::NetDevice> incomingPort, ns3::Ptr<ns3::Packet const> packet, uint16_t protocol, ns3::Mac48Address src, ns3::Mac48Address dst) [member function]
     cls.add_method('ForwardUnicast', 
                    'void', 
                    [param('ns3::Ptr< ns3::NetDevice >', 'incomingPort'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'protocol'), param('ns3::Mac48Address', 'src'), param('ns3::Mac48Address', 'dst')], 
@@ -15088,7 +15436,7 @@
                    'void', 
                    [param('ns3::Mac48Address', 'source'), param('ns3::Ptr< ns3::NetDevice >', 'port')], 
                    visibility='protected')
-    ## bridge-net-device.h (module 'bridge'): void ns3::BridgeNetDevice::ReceiveFromDevice(ns3::Ptr<ns3::NetDevice> device, ns3::Ptr<const ns3::Packet> packet, uint16_t protocol, ns3::Address const & source, ns3::Address const & destination, ns3::NetDevice::PacketType packetType) [member function]
+    ## bridge-net-device.h (module 'bridge'): void ns3::BridgeNetDevice::ReceiveFromDevice(ns3::Ptr<ns3::NetDevice> device, ns3::Ptr<ns3::Packet const> packet, uint16_t protocol, ns3::Address const & source, ns3::Address const & destination, ns3::NetDevice::PacketType packetType) [member function]
     cls.add_method('ReceiveFromDevice', 
                    'void', 
                    [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'source'), param('ns3::Address const &', 'destination'), param('ns3::NetDevice::PacketType', 'packetType')], 
@@ -15135,15 +15483,15 @@
                    'ns3::IpL4Protocol::RxStatus', 
                    [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::Ipv6Interface >', 'incomingInterface')], 
                    is_virtual=True)
-    ## icmpv4-l4-protocol.h (module 'internet'): void ns3::Icmpv4L4Protocol::SendDestUnreachFragNeeded(ns3::Ipv4Header header, ns3::Ptr<const ns3::Packet> orgData, uint16_t nextHopMtu) [member function]
+    ## icmpv4-l4-protocol.h (module 'internet'): void ns3::Icmpv4L4Protocol::SendDestUnreachFragNeeded(ns3::Ipv4Header header, ns3::Ptr<ns3::Packet const> orgData, uint16_t nextHopMtu) [member function]
     cls.add_method('SendDestUnreachFragNeeded', 
                    'void', 
                    [param('ns3::Ipv4Header', 'header'), param('ns3::Ptr< ns3::Packet const >', 'orgData'), param('uint16_t', 'nextHopMtu')])
-    ## icmpv4-l4-protocol.h (module 'internet'): void ns3::Icmpv4L4Protocol::SendDestUnreachPort(ns3::Ipv4Header header, ns3::Ptr<const ns3::Packet> orgData) [member function]
+    ## icmpv4-l4-protocol.h (module 'internet'): void ns3::Icmpv4L4Protocol::SendDestUnreachPort(ns3::Ipv4Header header, ns3::Ptr<ns3::Packet const> orgData) [member function]
     cls.add_method('SendDestUnreachPort', 
                    'void', 
                    [param('ns3::Ipv4Header', 'header'), param('ns3::Ptr< ns3::Packet const >', 'orgData')])
-    ## icmpv4-l4-protocol.h (module 'internet'): void ns3::Icmpv4L4Protocol::SendTimeExceededTtl(ns3::Ipv4Header header, ns3::Ptr<const ns3::Packet> orgData) [member function]
+    ## icmpv4-l4-protocol.h (module 'internet'): void ns3::Icmpv4L4Protocol::SendTimeExceededTtl(ns3::Ipv4Header header, ns3::Ptr<ns3::Packet const> orgData) [member function]
     cls.add_method('SendTimeExceededTtl', 
                    'void', 
                    [param('ns3::Ipv4Header', 'header'), param('ns3::Ptr< ns3::Packet const >', 'orgData')])
@@ -15180,10 +15528,18 @@
     cls.add_constructor([param('ns3::Icmpv6L4Protocol const &', 'arg0')])
     ## icmpv6-l4-protocol.h (module 'internet'): ns3::Icmpv6L4Protocol::Icmpv6L4Protocol() [constructor]
     cls.add_constructor([])
+    ## icmpv6-l4-protocol.h (module 'internet'): int64_t ns3::Icmpv6L4Protocol::AssignStreams(int64_t stream) [member function]
+    cls.add_method('AssignStreams', 
+                   'int64_t', 
+                   [param('int64_t', 'stream')])
     ## icmpv6-l4-protocol.h (module 'internet'): ns3::Ptr<ns3::NdiscCache> ns3::Icmpv6L4Protocol::CreateCache(ns3::Ptr<ns3::NetDevice> device, ns3::Ptr<ns3::Ipv6Interface> interface) [member function]
     cls.add_method('CreateCache', 
                    'ns3::Ptr< ns3::NdiscCache >', 
                    [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Ipv6Interface >', 'interface')])
+    ## icmpv6-l4-protocol.h (module 'internet'): void ns3::Icmpv6L4Protocol::DelayedSendMessage(ns3::Ptr<ns3::Packet> packet, ns3::Ipv6Address src, ns3::Ipv6Address dst, uint8_t ttl) [member function]
+    cls.add_method('DelayedSendMessage', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv6Address', 'src'), param('ns3::Ipv6Address', 'dst'), param('uint8_t', 'ttl')])
     ## icmpv6-l4-protocol.h (module 'internet'): void ns3::Icmpv6L4Protocol::DoDAD(ns3::Ipv6Address target, ns3::Ptr<ns3::Ipv6Interface> interface) [member function]
     cls.add_method('DoDAD', 
                    'void', 
@@ -15297,10 +15653,10 @@
     cls.add_method('SendRS', 
                    'void', 
                    [param('ns3::Ipv6Address', 'src'), param('ns3::Ipv6Address', 'dst'), param('ns3::Address', 'hardwareAddress')])
-    ## icmpv6-l4-protocol.h (module 'internet'): void ns3::Icmpv6L4Protocol::SendRedirection(ns3::Ptr<ns3::Packet> redirectedPacket, ns3::Ipv6Address dst, ns3::Ipv6Address redirTarget, ns3::Ipv6Address redirDestination, ns3::Address redirHardwareTarget) [member function]
+    ## icmpv6-l4-protocol.h (module 'internet'): void ns3::Icmpv6L4Protocol::SendRedirection(ns3::Ptr<ns3::Packet> redirectedPacket, ns3::Ipv6Address src, ns3::Ipv6Address dst, ns3::Ipv6Address redirTarget, ns3::Ipv6Address redirDestination, ns3::Address redirHardwareTarget) [member function]
     cls.add_method('SendRedirection', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'redirectedPacket'), param('ns3::Ipv6Address', 'dst'), param('ns3::Ipv6Address', 'redirTarget'), param('ns3::Ipv6Address', 'redirDestination'), param('ns3::Address', 'redirHardwareTarget')])
+                   [param('ns3::Ptr< ns3::Packet >', 'redirectedPacket'), param('ns3::Ipv6Address', 'src'), param('ns3::Ipv6Address', 'dst'), param('ns3::Ipv6Address', 'redirTarget'), param('ns3::Ipv6Address', 'redirDestination'), param('ns3::Address', 'redirHardwareTarget')])
     ## icmpv6-l4-protocol.h (module 'internet'): void ns3::Icmpv6L4Protocol::SetNode(ns3::Ptr<ns3::Node> node) [member function]
     cls.add_method('SetNode', 
                    'void', 
@@ -15441,7 +15797,7 @@
     cls.add_method('RemoveRoute', 
                    'void', 
                    [param('uint32_t', 'i')])
-    ## ipv4-global-routing.h (module 'internet'): bool ns3::Ipv4GlobalRouting::RouteInput(ns3::Ptr<const ns3::Packet> p, ns3::Ipv4Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void,ns3::Ptr<ns3::Ipv4Route>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<ns3::Ipv4MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function]
+    ## ipv4-global-routing.h (module 'internet'): bool ns3::Ipv4GlobalRouting::RouteInput(ns3::Ptr<ns3::Packet const> p, ns3::Ipv4Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void,ns3::Ptr<ns3::Ipv4Route>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<ns3::Ipv4MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function]
     cls.add_method('RouteInput', 
                    'bool', 
                    [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv4Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], 
@@ -15513,7 +15869,7 @@
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], 
                    is_const=True, is_virtual=True)
-    ## ipv4-list-routing.h (module 'internet'): bool ns3::Ipv4ListRouting::RouteInput(ns3::Ptr<const ns3::Packet> p, ns3::Ipv4Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void,ns3::Ptr<ns3::Ipv4Route>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<ns3::Ipv4MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function]
+    ## ipv4-list-routing.h (module 'internet'): bool ns3::Ipv4ListRouting::RouteInput(ns3::Ptr<ns3::Packet const> p, ns3::Ipv4Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void,ns3::Ptr<ns3::Ipv4Route>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<ns3::Ipv4MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function]
     cls.add_method('RouteInput', 
                    'bool', 
                    [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv4Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], 
@@ -15540,6 +15896,37 @@
                    visibility='protected', is_virtual=True)
     return
 
+def register_Ns3Ipv4PacketProbe_methods(root_module, cls):
+    ## ipv4-packet-probe.h (module 'internet'): ns3::Ipv4PacketProbe::Ipv4PacketProbe(ns3::Ipv4PacketProbe const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv4PacketProbe const &', 'arg0')])
+    ## ipv4-packet-probe.h (module 'internet'): ns3::Ipv4PacketProbe::Ipv4PacketProbe() [constructor]
+    cls.add_constructor([])
+    ## ipv4-packet-probe.h (module 'internet'): bool ns3::Ipv4PacketProbe::ConnectByObject(std::string traceSource, ns3::Ptr<ns3::Object> obj) [member function]
+    cls.add_method('ConnectByObject', 
+                   'bool', 
+                   [param('std::string', 'traceSource'), param('ns3::Ptr< ns3::Object >', 'obj')], 
+                   is_virtual=True)
+    ## ipv4-packet-probe.h (module 'internet'): void ns3::Ipv4PacketProbe::ConnectByPath(std::string path) [member function]
+    cls.add_method('ConnectByPath', 
+                   'void', 
+                   [param('std::string', 'path')], 
+                   is_virtual=True)
+    ## ipv4-packet-probe.h (module 'internet'): static ns3::TypeId ns3::Ipv4PacketProbe::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## ipv4-packet-probe.h (module 'internet'): void ns3::Ipv4PacketProbe::SetValue(ns3::Ptr<ns3::Packet const> packet, ns3::Ptr<ns3::Ipv4> ipv4, uint32_t interface) [member function]
+    cls.add_method('SetValue', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')])
+    ## ipv4-packet-probe.h (module 'internet'): static void ns3::Ipv4PacketProbe::SetValueByPath(std::string path, ns3::Ptr<ns3::Packet const> packet, ns3::Ptr<ns3::Ipv4> ipv4, uint32_t interface) [member function]
+    cls.add_method('SetValueByPath', 
+                   'void', 
+                   [param('std::string', 'path'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')], 
+                   is_static=True)
+    return
+
 def register_Ns3Ipv6ExtensionLooseRouting_methods(root_module, cls):
     ## ipv6-extension.h (module 'internet'): ns3::Ipv6ExtensionLooseRouting::Ipv6ExtensionLooseRouting(ns3::Ipv6ExtensionLooseRouting const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::Ipv6ExtensionLooseRouting const &', 'arg0')])
@@ -15624,10 +16011,10 @@
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], 
                    is_const=True, is_virtual=True)
-    ## ipv6-list-routing.h (module 'internet'): bool ns3::Ipv6ListRouting::RouteInput(ns3::Ptr<const ns3::Packet> p, ns3::Ipv6Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void,ns3::Ptr<ns3::Ipv6Route>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<ns3::Ipv6MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function]
+    ## ipv6-list-routing.h (module 'internet'): bool ns3::Ipv6ListRouting::RouteInput(ns3::Ptr<ns3::Packet const> p, ns3::Ipv6Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void,ns3::Ptr<const ns3::NetDevice>,ns3::Ptr<ns3::Ipv6Route>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<const ns3::NetDevice>,ns3::Ptr<ns3::Ipv6MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function]
     cls.add_method('RouteInput', 
                    'bool', 
-                   [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv6Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv6MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], 
+                   [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice const >, ns3::Ptr< ns3::Ipv6Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice const >, ns3::Ptr< ns3::Ipv6MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], 
                    is_virtual=True)
     ## ipv6-list-routing.h (module 'internet'): ns3::Ptr<ns3::Ipv6Route> ns3::Ipv6ListRouting::RouteOutput(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Header const & header, ns3::Ptr<ns3::NetDevice> oif, ns3::Socket::SocketErrno & sockerr) [member function]
     cls.add_method('RouteOutput', 
@@ -15646,6 +16033,37 @@
                    visibility='protected', is_virtual=True)
     return
 
+def register_Ns3Ipv6PacketProbe_methods(root_module, cls):
+    ## ipv6-packet-probe.h (module 'internet'): ns3::Ipv6PacketProbe::Ipv6PacketProbe(ns3::Ipv6PacketProbe const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv6PacketProbe const &', 'arg0')])
+    ## ipv6-packet-probe.h (module 'internet'): ns3::Ipv6PacketProbe::Ipv6PacketProbe() [constructor]
+    cls.add_constructor([])
+    ## ipv6-packet-probe.h (module 'internet'): bool ns3::Ipv6PacketProbe::ConnectByObject(std::string traceSource, ns3::Ptr<ns3::Object> obj) [member function]
+    cls.add_method('ConnectByObject', 
+                   'bool', 
+                   [param('std::string', 'traceSource'), param('ns3::Ptr< ns3::Object >', 'obj')], 
+                   is_virtual=True)
+    ## ipv6-packet-probe.h (module 'internet'): void ns3::Ipv6PacketProbe::ConnectByPath(std::string path) [member function]
+    cls.add_method('ConnectByPath', 
+                   'void', 
+                   [param('std::string', 'path')], 
+                   is_virtual=True)
+    ## ipv6-packet-probe.h (module 'internet'): static ns3::TypeId ns3::Ipv6PacketProbe::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## ipv6-packet-probe.h (module 'internet'): void ns3::Ipv6PacketProbe::SetValue(ns3::Ptr<ns3::Packet const> packet, ns3::Ptr<ns3::Ipv6> ipv6, uint32_t interface) [member function]
+    cls.add_method('SetValue', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Ptr< ns3::Ipv6 >', 'ipv6'), param('uint32_t', 'interface')])
+    ## ipv6-packet-probe.h (module 'internet'): static void ns3::Ipv6PacketProbe::SetValueByPath(std::string path, ns3::Ptr<ns3::Packet const> packet, ns3::Ptr<ns3::Ipv6> ipv6, uint32_t interface) [member function]
+    cls.add_method('SetValueByPath', 
+                   'void', 
+                   [param('std::string', 'path'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Ptr< ns3::Ipv6 >', 'ipv6'), param('uint32_t', 'interface')], 
+                   is_static=True)
+    return
+
 def register_Ns3LoopbackNetDevice_methods(root_module, cls):
     ## loopback-net-device.h (module 'internet'): ns3::LoopbackNetDevice::LoopbackNetDevice(ns3::LoopbackNetDevice const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::LoopbackNetDevice const &', 'arg0')])
@@ -15783,15 +16201,128 @@
                    visibility='protected', is_virtual=True)
     return
 
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_functions(root_module):
     module = root_module
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     register_functions_ns3_internal(module.get_submodule('internal'), root_module)
     return
 
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def register_functions_ns3_internal(module, root_module):
     return
 
diff -Naur ns-3.17/src/internet/bindings/modulegen__gcc_LP64.py ns-3.18/src/internet/bindings/modulegen__gcc_LP64.py
--- ns-3.17/src/internet/bindings/modulegen__gcc_LP64.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/bindings/modulegen__gcc_LP64.py	2013-10-26 07:07:29.947364390 -0700
@@ -74,6 +74,8 @@
     module.add_class('GlobalRoutingLinkRecord')
     ## global-router-interface.h (module 'internet'): ns3::GlobalRoutingLinkRecord::LinkType [enumeration]
     module.add_enum('LinkType', ['Unknown', 'PointToPoint', 'TransitNetwork', 'StubNetwork', 'VirtualLink'], outer_class=root_module['ns3::GlobalRoutingLinkRecord'])
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress [class]
     module.add_class('Inet6SocketAddress', import_from_module='ns.network')
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress [class]
@@ -194,6 +196,8 @@
     module.add_class('PacketTagList', import_from_module='ns.network')
     ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct]
     module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration]
+    module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network')
     ## pcap-file.h (module 'network'): ns3::PcapFile [class]
     module.add_class('PcapFile', import_from_module='ns.network')
     ## trace-helper.h (module 'network'): ns3::PcapHelper [class]
@@ -315,9 +319,9 @@
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header [class]
     module.add_class('Ipv4Header', parent=root_module['ns3::Header'])
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType [enumeration]
-    module.add_enum('DscpType', ['DscpDefault', 'CS1', 'AF11', 'AF12', 'AF13', 'CS2', 'AF21', 'AF22', 'AF23', 'CS3', 'AF31', 'AF32', 'AF33', 'CS4', 'AF41', 'AF42', 'AF43', 'CS5', 'EF', 'CS6', 'CS7'], outer_class=root_module['ns3::Ipv4Header'])
+    module.add_enum('DscpType', ['DscpDefault', 'DSCP_CS1', 'DSCP_AF11', 'DSCP_AF12', 'DSCP_AF13', 'DSCP_CS2', 'DSCP_AF21', 'DSCP_AF22', 'DSCP_AF23', 'DSCP_CS3', 'DSCP_AF31', 'DSCP_AF32', 'DSCP_AF33', 'DSCP_CS4', 'DSCP_AF41', 'DSCP_AF42', 'DSCP_AF43', 'DSCP_CS5', 'DSCP_EF', 'DSCP_CS6', 'DSCP_CS7'], outer_class=root_module['ns3::Ipv4Header'])
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType [enumeration]
-    module.add_enum('EcnType', ['NotECT', 'ECT1', 'ECT0', 'CE'], outer_class=root_module['ns3::Ipv4Header'])
+    module.add_enum('EcnType', ['ECN_NotECT', 'ECN_ECT1', 'ECN_ECT0', 'ECN_CE'], outer_class=root_module['ns3::Ipv4Header'])
     ## ipv4-list-routing-helper.h (module 'internet'): ns3::Ipv4ListRoutingHelper [class]
     module.add_class('Ipv4ListRoutingHelper', parent=root_module['ns3::Ipv4RoutingHelper'])
     ## ipv4-packet-info-tag.h (module 'internet'): ns3::Ipv4PacketInfoTag [class]
@@ -372,6 +376,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter<ns3::CallbackImplBase>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, template_parameters=['ns3::Ipv4MulticastRoute', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Ipv4MulticastRoute>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> > [class]
@@ -490,6 +496,8 @@
     module.add_class('Channel', import_from_module='ns.network', parent=root_module['ns3::Object'])
     ## random-variable-stream.h (module 'core'): ns3::ConstantRandomVariable [class]
     module.add_class('ConstantRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## data-collection-object.h (module 'stats'): ns3::DataCollectionObject [class]
+    module.add_class('DataCollectionObject', import_from_module='ns.stats', parent=root_module['ns3::Object'])
     ## random-variable-stream.h (module 'core'): ns3::DeterministicRandomVariable [class]
     module.add_class('DeterministicRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
     ## double.h (module 'core'): ns3::DoubleValue [class]
@@ -592,6 +600,8 @@
     module.add_enum('DropReason', ['DROP_TTL_EXPIRED', 'DROP_NO_ROUTE', 'DROP_INTERFACE_DOWN', 'DROP_ROUTE_ERROR', 'DROP_UNKNOWN_PROTOCOL'], outer_class=root_module['ns3::Ipv6L3Protocol'])
     ## ipv6-route.h (module 'internet'): ns3::Ipv6MulticastRoute [class]
     module.add_class('Ipv6MulticastRoute', parent=root_module['ns3::SimpleRefCount< ns3::Ipv6MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv6MulticastRoute> >'])
+    ## ipv6-pmtu-cache.h (module 'internet'): ns3::Ipv6PmtuCache [class]
+    module.add_class('Ipv6PmtuCache', parent=root_module['ns3::Object'])
     ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixChecker [class]
     module.add_class('Ipv6PrefixChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker'])
     ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixValue [class]
@@ -634,6 +644,8 @@
     module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
     ## random-variable-stream.h (module 'core'): ns3::ParetoRandomVariable [class]
     module.add_class('ParetoRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## probe.h (module 'stats'): ns3::Probe [class]
+    module.add_class('Probe', import_from_module='ns.stats', parent=root_module['ns3::DataCollectionObject'])
     ## tcp-l4-protocol.h (module 'internet'): ns3::TcpL4Protocol [class]
     module.add_class('TcpL4Protocol', parent=root_module['ns3::IpL4Protocol'])
     ## tcp-newreno.h (module 'internet'): ns3::TcpNewReno [class]
@@ -642,8 +654,6 @@
     module.add_class('TcpReno', parent=root_module['ns3::TcpSocketBase'])
     ## tcp-rfc793.h (module 'internet'): ns3::TcpRfc793 [class]
     module.add_class('TcpRfc793', parent=root_module['ns3::TcpSocketBase'])
-    ## nstime.h (module 'core'): ns3::TimeChecker [class]
-    module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
     module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## type-id.h (module 'core'): ns3::TypeIdChecker [class]
@@ -670,10 +680,14 @@
     module.add_class('Ipv4GlobalRouting', parent=root_module['ns3::Ipv4RoutingProtocol'])
     ## ipv4-list-routing.h (module 'internet'): ns3::Ipv4ListRouting [class]
     module.add_class('Ipv4ListRouting', parent=root_module['ns3::Ipv4RoutingProtocol'])
+    ## ipv4-packet-probe.h (module 'internet'): ns3::Ipv4PacketProbe [class]
+    module.add_class('Ipv4PacketProbe', parent=root_module['ns3::Probe'])
     ## ipv6-extension.h (module 'internet'): ns3::Ipv6ExtensionLooseRouting [class]
     module.add_class('Ipv6ExtensionLooseRouting', parent=root_module['ns3::Ipv6ExtensionRouting'])
     ## ipv6-list-routing.h (module 'internet'): ns3::Ipv6ListRouting [class]
     module.add_class('Ipv6ListRouting', parent=root_module['ns3::Ipv6RoutingProtocol'])
+    ## ipv6-packet-probe.h (module 'internet'): ns3::Ipv6PacketProbe [class]
+    module.add_class('Ipv6PacketProbe', parent=root_module['ns3::Probe'])
     ## loopback-net-device.h (module 'internet'): ns3::LoopbackNetDevice [class]
     module.add_class('LoopbackNetDevice', parent=root_module['ns3::NetDevice'])
     module.add_container('std::vector< unsigned int >', 'unsigned int', container_type='vector')
@@ -698,6 +712,12 @@
     register_types_ns3_FatalImpl(nested_module)
     
     
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
+    
     ## Register a nested module for the namespace internal
     
     nested_module = module.add_cpp_namespace('internal')
@@ -708,6 +728,36 @@
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_types_ns3_internal(module):
     root_module = module.get_root()
     
@@ -735,6 +785,7 @@
     register_Ns3GlobalRouteManagerLSDB_methods(root_module, root_module['ns3::GlobalRouteManagerLSDB'])
     register_Ns3GlobalRoutingLSA_methods(root_module, root_module['ns3::GlobalRoutingLSA'])
     register_Ns3GlobalRoutingLinkRecord_methods(root_module, root_module['ns3::GlobalRoutingLinkRecord'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3Inet6SocketAddress_methods(root_module, root_module['ns3::Inet6SocketAddress'])
     register_Ns3InetSocketAddress_methods(root_module, root_module['ns3::InetSocketAddress'])
     register_Ns3IntToType__0_methods(root_module, root_module['ns3::IntToType< 0 >'])
@@ -851,6 +902,7 @@
     register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
     register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter<ns3::CallbackImplBase> >'])
     register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3Ipv4MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4MulticastRoute__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> >'])
     register_Ns3SimpleRefCount__Ns3Ipv4Route_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4Route__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> >'])
     register_Ns3SimpleRefCount__Ns3Ipv6MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv6MulticastRoute__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv6MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv6MulticastRoute> >'])
@@ -901,6 +953,7 @@
     register_Ns3CallbackValue_methods(root_module, root_module['ns3::CallbackValue'])
     register_Ns3Channel_methods(root_module, root_module['ns3::Channel'])
     register_Ns3ConstantRandomVariable_methods(root_module, root_module['ns3::ConstantRandomVariable'])
+    register_Ns3DataCollectionObject_methods(root_module, root_module['ns3::DataCollectionObject'])
     register_Ns3DeterministicRandomVariable_methods(root_module, root_module['ns3::DeterministicRandomVariable'])
     register_Ns3DoubleValue_methods(root_module, root_module['ns3::DoubleValue'])
     register_Ns3EmpiricalRandomVariable_methods(root_module, root_module['ns3::EmpiricalRandomVariable'])
@@ -949,6 +1002,7 @@
     register_Ns3Ipv6Interface_methods(root_module, root_module['ns3::Ipv6Interface'])
     register_Ns3Ipv6L3Protocol_methods(root_module, root_module['ns3::Ipv6L3Protocol'])
     register_Ns3Ipv6MulticastRoute_methods(root_module, root_module['ns3::Ipv6MulticastRoute'])
+    register_Ns3Ipv6PmtuCache_methods(root_module, root_module['ns3::Ipv6PmtuCache'])
     register_Ns3Ipv6PrefixChecker_methods(root_module, root_module['ns3::Ipv6PrefixChecker'])
     register_Ns3Ipv6PrefixValue_methods(root_module, root_module['ns3::Ipv6PrefixValue'])
     register_Ns3Ipv6RawSocketFactory_methods(root_module, root_module['ns3::Ipv6RawSocketFactory'])
@@ -969,11 +1023,11 @@
     register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper'])
     register_Ns3Packet_methods(root_module, root_module['ns3::Packet'])
     register_Ns3ParetoRandomVariable_methods(root_module, root_module['ns3::ParetoRandomVariable'])
+    register_Ns3Probe_methods(root_module, root_module['ns3::Probe'])
     register_Ns3TcpL4Protocol_methods(root_module, root_module['ns3::TcpL4Protocol'])
     register_Ns3TcpNewReno_methods(root_module, root_module['ns3::TcpNewReno'])
     register_Ns3TcpReno_methods(root_module, root_module['ns3::TcpReno'])
     register_Ns3TcpRfc793_methods(root_module, root_module['ns3::TcpRfc793'])
-    register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
     register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue'])
@@ -987,9 +1041,16 @@
     register_Ns3Icmpv6L4Protocol_methods(root_module, root_module['ns3::Icmpv6L4Protocol'])
     register_Ns3Ipv4GlobalRouting_methods(root_module, root_module['ns3::Ipv4GlobalRouting'])
     register_Ns3Ipv4ListRouting_methods(root_module, root_module['ns3::Ipv4ListRouting'])
+    register_Ns3Ipv4PacketProbe_methods(root_module, root_module['ns3::Ipv4PacketProbe'])
     register_Ns3Ipv6ExtensionLooseRouting_methods(root_module, root_module['ns3::Ipv6ExtensionLooseRouting'])
     register_Ns3Ipv6ListRouting_methods(root_module, root_module['ns3::Ipv6ListRouting'])
+    register_Ns3Ipv6PacketProbe_methods(root_module, root_module['ns3::Ipv6PacketProbe'])
     register_Ns3LoopbackNetDevice_methods(root_module, root_module['ns3::LoopbackNetDevice'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     return
 
 def register_Ns3Address_methods(root_module, cls):
@@ -1071,42 +1132,42 @@
     cls.add_method('CreateFileStream', 
                    'ns3::Ptr< ns3::OutputStreamWrapper >', 
                    [param('std::string', 'filename'), param('std::_Ios_Openmode', 'filemode', default_value='std::ios_base::out')])
-    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('DefaultDequeueSinkWithContext', 
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
                    is_static=True)
-    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('DefaultDequeueSinkWithoutContext', 
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
                    is_static=True)
-    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDropSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDropSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('DefaultDropSinkWithContext', 
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
                    is_static=True)
-    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDropSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultDropSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('DefaultDropSinkWithoutContext', 
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
                    is_static=True)
-    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultEnqueueSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultEnqueueSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('DefaultEnqueueSinkWithContext', 
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
                    is_static=True)
-    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultEnqueueSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultEnqueueSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('DefaultEnqueueSinkWithoutContext', 
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
                    is_static=True)
-    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultReceiveSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultReceiveSinkWithContext(ns3::Ptr<ns3::OutputStreamWrapper> file, std::string context, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('DefaultReceiveSinkWithContext', 
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
                    is_static=True)
-    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultReceiveSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## trace-helper.h (module 'network'): static void ns3::AsciiTraceHelper::DefaultReceiveSinkWithoutContext(ns3::Ptr<ns3::OutputStreamWrapper> file, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('DefaultReceiveSinkWithoutContext', 
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')], 
@@ -2035,6 +2096,35 @@
                    [param('uint16_t', 'metric')])
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3Inet6SocketAddress_methods(root_module, cls):
     ## inet6-socket-address.h (module 'network'): ns3::Inet6SocketAddress::Inet6SocketAddress(ns3::Inet6SocketAddress const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::Inet6SocketAddress const &', 'arg0')])
@@ -2900,6 +2990,11 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
     cls.add_method('IsEqual', 
                    'bool', 
@@ -2939,16 +3034,36 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
     cls.add_method('MakeAutoconfiguredAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
     cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'mac')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
     cls.add_method('MakeIpv4MappedAddress', 
                    'ns3::Ipv6Address', 
@@ -3165,6 +3280,14 @@
                    'uint32_t', 
                    [param('uint32_t', 'i')], 
                    is_const=True)
+    ## ipv6-interface-container.h (module 'internet'): ns3::Ipv6Address ns3::Ipv6InterfaceContainer::GetLinkLocalAddress(uint32_t i) [member function]
+    cls.add_method('GetLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('uint32_t', 'i')])
+    ## ipv6-interface-container.h (module 'internet'): ns3::Ipv6Address ns3::Ipv6InterfaceContainer::GetLinkLocalAddress(ns3::Ipv6Address address) [member function]
+    cls.add_method('GetLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Ipv6Address', 'address')])
     ## ipv6-interface-container.h (module 'internet'): uint32_t ns3::Ipv6InterfaceContainer::GetN() const [member function]
     cls.add_method('GetN', 
                    'uint32_t', 
@@ -3174,10 +3297,27 @@
     cls.add_method('SetDefaultRoute', 
                    'void', 
                    [param('uint32_t', 'i'), param('uint32_t', 'router')])
+    ## ipv6-interface-container.h (module 'internet'): void ns3::Ipv6InterfaceContainer::SetDefaultRoute(uint32_t i, ns3::Ipv6Address routerAddr) [member function]
+    cls.add_method('SetDefaultRoute', 
+                   'void', 
+                   [param('uint32_t', 'i'), param('ns3::Ipv6Address', 'routerAddr')])
+    ## ipv6-interface-container.h (module 'internet'): void ns3::Ipv6InterfaceContainer::SetDefaultRouteInAllNodes(uint32_t router) [member function]
+    cls.add_method('SetDefaultRouteInAllNodes', 
+                   'void', 
+                   [param('uint32_t', 'router')])
+    ## ipv6-interface-container.h (module 'internet'): void ns3::Ipv6InterfaceContainer::SetDefaultRouteInAllNodes(ns3::Ipv6Address routerAddr) [member function]
+    cls.add_method('SetDefaultRouteInAllNodes', 
+                   'void', 
+                   [param('ns3::Ipv6Address', 'routerAddr')])
+    ## ipv6-interface-container.h (module 'internet'): void ns3::Ipv6InterfaceContainer::SetForwarding(uint32_t i, bool state) [member function]
+    cls.add_method('SetForwarding', 
+                   'void', 
+                   [param('uint32_t', 'i'), param('bool', 'state')])
     ## ipv6-interface-container.h (module 'internet'): void ns3::Ipv6InterfaceContainer::SetRouter(uint32_t i, bool router) [member function]
     cls.add_method('SetRouter', 
                    'void', 
-                   [param('uint32_t', 'i'), param('bool', 'router')])
+                   [param('uint32_t', 'i'), param('bool', 'router')], 
+                   deprecated=True)
     return
 
 def register_Ns3Ipv6MulticastRoutingTableEntry_methods(root_module, cls):
@@ -3945,6 +4085,10 @@
     cls.add_method('RemoveAll', 
                    'void', 
                    [])
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function]
+    cls.add_method('Replace', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     return
 
 def register_Ns3PacketTagListTagData_methods(root_module, cls):
@@ -4036,11 +4180,11 @@
     cls.add_method('Write', 
                    'void', 
                    [param('uint32_t', 'tsSec'), param('uint32_t', 'tsUsec'), param('uint8_t const * const', 'data'), param('uint32_t', 'totalLen')])
-    ## pcap-file.h (module 'network'): void ns3::PcapFile::Write(uint32_t tsSec, uint32_t tsUsec, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## pcap-file.h (module 'network'): void ns3::PcapFile::Write(uint32_t tsSec, uint32_t tsUsec, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('Write', 
                    'void', 
                    [param('uint32_t', 'tsSec'), param('uint32_t', 'tsUsec'), param('ns3::Ptr< ns3::Packet const >', 'p')])
-    ## pcap-file.h (module 'network'): void ns3::PcapFile::Write(uint32_t tsSec, uint32_t tsUsec, ns3::Header & header, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## pcap-file.h (module 'network'): void ns3::PcapFile::Write(uint32_t tsSec, uint32_t tsUsec, ns3::Header & header, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('Write', 
                    'void', 
                    [param('uint32_t', 'tsSec'), param('uint32_t', 'tsUsec'), param('ns3::Header &', 'header'), param('ns3::Ptr< ns3::Packet const >', 'p')])
@@ -4786,6 +4930,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -4845,6 +4994,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -5106,7 +5265,7 @@
                    'ns3::TypeId', 
                    [], 
                    is_static=True)
-    ## icmpv4.h (module 'internet'): void ns3::Icmpv4DestinationUnreachable::SetData(ns3::Ptr<const ns3::Packet> data) [member function]
+    ## icmpv4.h (module 'internet'): void ns3::Icmpv4DestinationUnreachable::SetData(ns3::Ptr<ns3::Packet const> data) [member function]
     cls.add_method('SetData', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet const >', 'data')])
@@ -5200,7 +5359,7 @@
                    'void', 
                    [param('ns3::Buffer::Iterator', 'start')], 
                    is_const=True, is_virtual=True)
-    ## icmpv4.h (module 'internet'): void ns3::Icmpv4Echo::SetData(ns3::Ptr<const ns3::Packet> data) [member function]
+    ## icmpv4.h (module 'internet'): void ns3::Icmpv4Echo::SetData(ns3::Ptr<ns3::Packet const> data) [member function]
     cls.add_method('SetData', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet const >', 'data')])
@@ -5318,7 +5477,7 @@
                    'void', 
                    [param('ns3::Buffer::Iterator', 'start')], 
                    is_const=True, is_virtual=True)
-    ## icmpv4.h (module 'internet'): void ns3::Icmpv4TimeExceeded::SetData(ns3::Ptr<const ns3::Packet> data) [member function]
+    ## icmpv4.h (module 'internet'): void ns3::Icmpv4TimeExceeded::SetData(ns3::Ptr<ns3::Packet const> data) [member function]
     cls.add_method('SetData', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet const >', 'data')])
@@ -6244,10 +6403,18 @@
     cls.add_method('Reset', 
                    'void', 
                    [])
+    ## internet-stack-helper.h (module 'internet'): void ns3::InternetStackHelper::SetIpv4ArpJitter(bool enable) [member function]
+    cls.add_method('SetIpv4ArpJitter', 
+                   'void', 
+                   [param('bool', 'enable')])
     ## internet-stack-helper.h (module 'internet'): void ns3::InternetStackHelper::SetIpv4StackInstall(bool enable) [member function]
     cls.add_method('SetIpv4StackInstall', 
                    'void', 
                    [param('bool', 'enable')])
+    ## internet-stack-helper.h (module 'internet'): void ns3::InternetStackHelper::SetIpv6NsRsJitter(bool enable) [member function]
+    cls.add_method('SetIpv6NsRsJitter', 
+                   'void', 
+                   [param('bool', 'enable')])
     ## internet-stack-helper.h (module 'internet'): void ns3::InternetStackHelper::SetIpv6StackInstall(bool enable) [member function]
     cls.add_method('SetIpv6StackInstall', 
                    'void', 
@@ -7271,11 +7438,11 @@
     cls.add_method('Init', 
                    'void', 
                    [param('uint32_t', 'dataLinkType'), param('uint32_t', 'snapLen', default_value='std::numeric_limits<unsigned int>::max()'), param('int32_t', 'tzCorrection', default_value='ns3::PcapFile::ZONE_DEFAULT')])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::Write(ns3::Time t, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::Write(ns3::Time t, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('Write', 
                    'void', 
                    [param('ns3::Time', 't'), param('ns3::Ptr< ns3::Packet const >', 'p')])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::Write(ns3::Time t, ns3::Header & header, ns3::Ptr<const ns3::Packet> p) [member function]
+    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::Write(ns3::Time t, ns3::Header & header, ns3::Ptr<ns3::Packet const> p) [member function]
     cls.add_method('Write', 
                    'void', 
                    [param('ns3::Time', 't'), param('ns3::Header &', 'header'), param('ns3::Ptr< ns3::Packet const >', 'p')])
@@ -7577,6 +7744,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3Ipv4MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4MulticastRoute__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -9498,11 +9677,26 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
     cls.add_method('SetResolution', 
                    'void', 
                    [param('ns3::Time::Unit', 'resolution')], 
                    is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
     cls.add_method('To', 
                    'ns3::int64x64_t', 
@@ -10215,7 +10409,7 @@
     cls.add_method('CreateCache', 
                    'ns3::Ptr< ns3::ArpCache >', 
                    [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Ipv4Interface >', 'interface')])
-    ## arp-l3-protocol.h (module 'internet'): void ns3::ArpL3Protocol::Receive(ns3::Ptr<ns3::NetDevice> device, ns3::Ptr<const ns3::Packet> p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function]
+    ## arp-l3-protocol.h (module 'internet'): void ns3::ArpL3Protocol::Receive(ns3::Ptr<ns3::NetDevice> device, ns3::Ptr<ns3::Packet const> p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function]
     cls.add_method('Receive', 
                    'void', 
                    [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'from'), param('ns3::Address const &', 'to'), param('ns3::NetDevice::PacketType', 'packetType')])
@@ -10223,6 +10417,10 @@
     cls.add_method('Lookup', 
                    'bool', 
                    [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv4Address', 'destination'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::ArpCache >', 'cache'), param('ns3::Address *', 'hardwareDestination')])
+    ## arp-l3-protocol.h (module 'internet'): int64_t ns3::ArpL3Protocol::AssignStreams(int64_t stream) [member function]
+    cls.add_method('AssignStreams', 
+                   'int64_t', 
+                   [param('int64_t', 'stream')])
     ## arp-l3-protocol.h (module 'internet'): void ns3::ArpL3Protocol::DoDispose() [member function]
     cls.add_method('DoDispose', 
                    'void', 
@@ -10474,6 +10672,40 @@
                    is_virtual=True)
     return
 
+def register_Ns3DataCollectionObject_methods(root_module, cls):
+    ## data-collection-object.h (module 'stats'): ns3::DataCollectionObject::DataCollectionObject(ns3::DataCollectionObject const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::DataCollectionObject const &', 'arg0')])
+    ## data-collection-object.h (module 'stats'): ns3::DataCollectionObject::DataCollectionObject() [constructor]
+    cls.add_constructor([])
+    ## data-collection-object.h (module 'stats'): void ns3::DataCollectionObject::Disable() [member function]
+    cls.add_method('Disable', 
+                   'void', 
+                   [])
+    ## data-collection-object.h (module 'stats'): void ns3::DataCollectionObject::Enable() [member function]
+    cls.add_method('Enable', 
+                   'void', 
+                   [])
+    ## data-collection-object.h (module 'stats'): std::string ns3::DataCollectionObject::GetName() const [member function]
+    cls.add_method('GetName', 
+                   'std::string', 
+                   [], 
+                   is_const=True)
+    ## data-collection-object.h (module 'stats'): static ns3::TypeId ns3::DataCollectionObject::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## data-collection-object.h (module 'stats'): bool ns3::DataCollectionObject::IsEnabled() const [member function]
+    cls.add_method('IsEnabled', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## data-collection-object.h (module 'stats'): void ns3::DataCollectionObject::SetName(std::string name) [member function]
+    cls.add_method('SetName', 
+                   'void', 
+                   [param('std::string', 'name')])
+    return
+
 def register_Ns3DeterministicRandomVariable_methods(root_module, cls):
     ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::DeterministicRandomVariable::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
@@ -11168,6 +11400,11 @@
                    'bool', 
                    [param('uint32_t', 'interface'), param('uint32_t', 'addressIndex')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## ipv4.h (module 'internet'): bool ns3::Ipv4::RemoveAddress(uint32_t interface, ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4Address', 'address')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## ipv4.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4::SelectSourceAddress(ns3::Ptr<const ns3::NetDevice> device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function]
     cls.add_method('SelectSourceAddress', 
                    'ns3::Ipv4Address', 
@@ -11330,6 +11567,10 @@
     cls.add_method('RemoveAddress', 
                    'ns3::Ipv4InterfaceAddress', 
                    [param('uint32_t', 'index')])
+    ## ipv4-interface.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4Interface::RemoveAddress(ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'ns3::Ipv4InterfaceAddress', 
+                   [param('ns3::Ipv4Address', 'address')])
     ## ipv4-interface.h (module 'internet'): void ns3::Ipv4Interface::Send(ns3::Ptr<ns3::Packet> p, ns3::Ipv4Address dest) [member function]
     cls.add_method('Send', 
                    'void', 
@@ -11477,7 +11718,7 @@
                    'bool', 
                    [param('uint32_t', 'i')], 
                    is_const=True, is_virtual=True)
-    ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Receive(ns3::Ptr<ns3::NetDevice> device, ns3::Ptr<const ns3::Packet> p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function]
+    ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Receive(ns3::Ptr<ns3::NetDevice> device, ns3::Ptr<ns3::Packet const> p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function]
     cls.add_method('Receive', 
                    'void', 
                    [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'from'), param('ns3::Address const &', 'to'), param('ns3::NetDevice::PacketType', 'packetType')])
@@ -11490,6 +11731,11 @@
                    'bool', 
                    [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], 
                    is_virtual=True)
+    ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interface, ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4Address', 'address')], 
+                   is_virtual=True)
     ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr<const ns3::NetDevice> device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function]
     cls.add_method('SelectSourceAddress', 
                    'ns3::Ipv4Address', 
@@ -11706,7 +11952,7 @@
                    'int', 
                    [param('ns3::Address const &', 'address')], 
                    is_virtual=True)
-    ## ipv4-raw-socket-impl.h (module 'internet'): bool ns3::Ipv4RawSocketImpl::ForwardUp(ns3::Ptr<const ns3::Packet> p, ns3::Ipv4Header ipHeader, ns3::Ptr<ns3::Ipv4Interface> incomingInterface) [member function]
+    ## ipv4-raw-socket-impl.h (module 'internet'): bool ns3::Ipv4RawSocketImpl::ForwardUp(ns3::Ptr<ns3::Packet const> p, ns3::Ipv4Header ipHeader, ns3::Ptr<ns3::Ipv4Interface> incomingInterface) [member function]
     cls.add_method('ForwardUp', 
                    'bool', 
                    [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv4Header', 'ipHeader'), param('ns3::Ptr< ns3::Ipv4Interface >', 'incomingInterface')])
@@ -11884,7 +12130,7 @@
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], 
                    is_pure_virtual=True, is_const=True, is_virtual=True)
-    ## ipv4-routing-protocol.h (module 'internet'): bool ns3::Ipv4RoutingProtocol::RouteInput(ns3::Ptr<const ns3::Packet> p, ns3::Ipv4Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void,ns3::Ptr<ns3::Ipv4Route>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<ns3::Ipv4MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function]
+    ## ipv4-routing-protocol.h (module 'internet'): bool ns3::Ipv4RoutingProtocol::RouteInput(ns3::Ptr<ns3::Packet const> p, ns3::Ipv4Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void,ns3::Ptr<ns3::Ipv4Route>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<ns3::Ipv4MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function]
     cls.add_method('RouteInput', 
                    'bool', 
                    [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv4Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], 
@@ -11997,7 +12243,7 @@
     cls.add_method('RemoveRoute', 
                    'void', 
                    [param('uint32_t', 'i')])
-    ## ipv4-static-routing.h (module 'internet'): bool ns3::Ipv4StaticRouting::RouteInput(ns3::Ptr<const ns3::Packet> p, ns3::Ipv4Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void,ns3::Ptr<ns3::Ipv4Route>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<ns3::Ipv4MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function]
+    ## ipv4-static-routing.h (module 'internet'): bool ns3::Ipv4StaticRouting::RouteInput(ns3::Ptr<ns3::Packet const> p, ns3::Ipv4Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void,ns3::Ptr<ns3::Ipv4Route>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<ns3::Ipv4MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function]
     cls.add_method('RouteInput', 
                    'bool', 
                    [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv4Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], 
@@ -12122,6 +12368,11 @@
                    'bool', 
                    [param('uint32_t', 'interface'), param('uint32_t', 'addressIndex')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## ipv6.h (module 'internet'): bool ns3::Ipv6::RemoveAddress(uint32_t interface, ns3::Ipv6Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv6Address', 'address')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## ipv6.h (module 'internet'): void ns3::Ipv6::SetDown(uint32_t interface) [member function]
     cls.add_method('SetDown', 
                    'void', 
@@ -12137,6 +12388,11 @@
                    'void', 
                    [param('uint32_t', 'interface'), param('uint16_t', 'metric')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## ipv6.h (module 'internet'): void ns3::Ipv6::SetPmtu(ns3::Ipv6Address dst, uint32_t pmtu) [member function]
+    cls.add_method('SetPmtu', 
+                   'void', 
+                   [param('ns3::Ipv6Address', 'dst'), param('uint32_t', 'pmtu')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## ipv6.h (module 'internet'): void ns3::Ipv6::SetRoutingProtocol(ns3::Ptr<ns3::Ipv6RoutingProtocol> routingProtocol) [member function]
     cls.add_method('SetRoutingProtocol', 
                    'void', 
@@ -12154,11 +12410,21 @@
                    'bool', 
                    [], 
                    is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
+    ## ipv6.h (module 'internet'): bool ns3::Ipv6::GetMtuDiscover() const [member function]
+    cls.add_method('GetMtuDiscover', 
+                   'bool', 
+                   [], 
+                   is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
     ## ipv6.h (module 'internet'): void ns3::Ipv6::SetIpForward(bool forward) [member function]
     cls.add_method('SetIpForward', 
                    'void', 
                    [param('bool', 'forward')], 
                    is_pure_virtual=True, visibility='private', is_virtual=True)
+    ## ipv6.h (module 'internet'): void ns3::Ipv6::SetMtuDiscover(bool mtuDiscover) [member function]
+    cls.add_method('SetMtuDiscover', 
+                   'void', 
+                   [param('bool', 'mtuDiscover')], 
+                   is_pure_virtual=True, visibility='private', is_virtual=True)
     return
 
 def register_Ns3Ipv6AddressChecker_methods(root_module, cls):
@@ -12781,6 +13047,10 @@
     cls.add_method('RemoveAddress', 
                    'ns3::Ipv6InterfaceAddress', 
                    [param('uint32_t', 'index')])
+    ## ipv6-interface.h (module 'internet'): ns3::Ipv6InterfaceAddress ns3::Ipv6Interface::RemoveAddress(ns3::Ipv6Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'ns3::Ipv6InterfaceAddress', 
+                   [param('ns3::Ipv6Address', 'address')])
     ## ipv6-interface.h (module 'internet'): void ns3::Ipv6Interface::Send(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Address dest) [member function]
     cls.add_method('Send', 
                    'void', 
@@ -12883,7 +13153,7 @@
     cls.add_method('SetDefaultTclass', 
                    'void', 
                    [param('uint8_t', 'tclass')])
-    ## ipv6-l3-protocol.h (module 'internet'): void ns3::Ipv6L3Protocol::Receive(ns3::Ptr<ns3::NetDevice> device, ns3::Ptr<const ns3::Packet> p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function]
+    ## ipv6-l3-protocol.h (module 'internet'): void ns3::Ipv6L3Protocol::Receive(ns3::Ptr<ns3::NetDevice> device, ns3::Ptr<ns3::Packet const> p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function]
     cls.add_method('Receive', 
                    'void', 
                    [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'from'), param('ns3::Address const &', 'to'), param('ns3::NetDevice::PacketType', 'packetType')])
@@ -12951,6 +13221,11 @@
                    'bool', 
                    [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], 
                    is_virtual=True)
+    ## ipv6-l3-protocol.h (module 'internet'): bool ns3::Ipv6L3Protocol::RemoveAddress(uint32_t interface, ns3::Ipv6Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv6Address', 'address')], 
+                   is_virtual=True)
     ## ipv6-l3-protocol.h (module 'internet'): void ns3::Ipv6L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function]
     cls.add_method('SetMetric', 
                    'void', 
@@ -12966,6 +13241,11 @@
                    'uint16_t', 
                    [param('uint32_t', 'i')], 
                    is_const=True, is_virtual=True)
+    ## ipv6-l3-protocol.h (module 'internet'): void ns3::Ipv6L3Protocol::SetPmtu(ns3::Ipv6Address dst, uint32_t pmtu) [member function]
+    cls.add_method('SetPmtu', 
+                   'void', 
+                   [param('ns3::Ipv6Address', 'dst'), param('uint32_t', 'pmtu')], 
+                   is_virtual=True)
     ## ipv6-l3-protocol.h (module 'internet'): bool ns3::Ipv6L3Protocol::IsUp(uint32_t i) const [member function]
     cls.add_method('IsUp', 
                    'bool', 
@@ -13039,6 +13319,16 @@
                    'bool', 
                    [], 
                    is_const=True, visibility='private', is_virtual=True)
+    ## ipv6-l3-protocol.h (module 'internet'): void ns3::Ipv6L3Protocol::SetMtuDiscover(bool mtuDiscover) [member function]
+    cls.add_method('SetMtuDiscover', 
+                   'void', 
+                   [param('bool', 'mtuDiscover')], 
+                   visibility='private', is_virtual=True)
+    ## ipv6-l3-protocol.h (module 'internet'): bool ns3::Ipv6L3Protocol::GetMtuDiscover() const [member function]
+    cls.add_method('GetMtuDiscover', 
+                   'bool', 
+                   [], 
+                   is_const=True, visibility='private', is_virtual=True)
     ## ipv6-l3-protocol.h (module 'internet'): void ns3::Ipv6L3Protocol::SetSendIcmpv6Redirect(bool sendIcmpv6Redirect) [member function]
     cls.add_method('SetSendIcmpv6Redirect', 
                    'void', 
@@ -13104,6 +13394,40 @@
     cls.add_static_attribute('MAX_TTL', 'uint32_t const', is_const=True)
     return
 
+def register_Ns3Ipv6PmtuCache_methods(root_module, cls):
+    ## ipv6-pmtu-cache.h (module 'internet'): ns3::Ipv6PmtuCache::Ipv6PmtuCache(ns3::Ipv6PmtuCache const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv6PmtuCache const &', 'arg0')])
+    ## ipv6-pmtu-cache.h (module 'internet'): ns3::Ipv6PmtuCache::Ipv6PmtuCache() [constructor]
+    cls.add_constructor([])
+    ## ipv6-pmtu-cache.h (module 'internet'): void ns3::Ipv6PmtuCache::DoDispose() [member function]
+    cls.add_method('DoDispose', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    ## ipv6-pmtu-cache.h (module 'internet'): uint32_t ns3::Ipv6PmtuCache::GetPmtu(ns3::Ipv6Address dst) [member function]
+    cls.add_method('GetPmtu', 
+                   'uint32_t', 
+                   [param('ns3::Ipv6Address', 'dst')])
+    ## ipv6-pmtu-cache.h (module 'internet'): ns3::Time ns3::Ipv6PmtuCache::GetPmtuValidityTime() const [member function]
+    cls.add_method('GetPmtuValidityTime', 
+                   'ns3::Time', 
+                   [], 
+                   is_const=True)
+    ## ipv6-pmtu-cache.h (module 'internet'): static ns3::TypeId ns3::Ipv6PmtuCache::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## ipv6-pmtu-cache.h (module 'internet'): void ns3::Ipv6PmtuCache::SetPmtu(ns3::Ipv6Address dst, uint32_t pmtu) [member function]
+    cls.add_method('SetPmtu', 
+                   'void', 
+                   [param('ns3::Ipv6Address', 'dst'), param('uint32_t', 'pmtu')])
+    ## ipv6-pmtu-cache.h (module 'internet'): bool ns3::Ipv6PmtuCache::SetPmtuValidityTime(ns3::Time validity) [member function]
+    cls.add_method('SetPmtuValidityTime', 
+                   'bool', 
+                   [param('ns3::Time', 'validity')])
+    return
+
 def register_Ns3Ipv6PrefixChecker_methods(root_module, cls):
     ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixChecker::Ipv6PrefixChecker() [constructor]
     cls.add_constructor([])
@@ -13245,10 +13569,10 @@
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], 
                    is_pure_virtual=True, is_const=True, is_virtual=True)
-    ## ipv6-routing-protocol.h (module 'internet'): bool ns3::Ipv6RoutingProtocol::RouteInput(ns3::Ptr<const ns3::Packet> p, ns3::Ipv6Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void,ns3::Ptr<ns3::Ipv6Route>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<ns3::Ipv6MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function]
+    ## ipv6-routing-protocol.h (module 'internet'): bool ns3::Ipv6RoutingProtocol::RouteInput(ns3::Ptr<ns3::Packet const> p, ns3::Ipv6Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void,ns3::Ptr<const ns3::NetDevice>,ns3::Ptr<ns3::Ipv6Route>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<const ns3::NetDevice>,ns3::Ptr<ns3::Ipv6MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function]
     cls.add_method('RouteInput', 
                    'bool', 
-                   [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv6Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv6MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], 
+                   [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice const >, ns3::Ptr< ns3::Ipv6Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice const >, ns3::Ptr< ns3::Ipv6MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], 
                    is_pure_virtual=True, is_virtual=True)
     ## ipv6-routing-protocol.h (module 'internet'): ns3::Ptr<ns3::Ipv6Route> ns3::Ipv6RoutingProtocol::RouteOutput(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Header const & header, ns3::Ptr<ns3::NetDevice> oif, ns3::Socket::SocketErrno & sockerr) [member function]
     cls.add_method('RouteOutput', 
@@ -13380,10 +13704,10 @@
     cls.add_method('RemoveRoute', 
                    'void', 
                    [param('ns3::Ipv6Address', 'network'), param('ns3::Ipv6Prefix', 'prefix'), param('uint32_t', 'ifIndex'), param('ns3::Ipv6Address', 'prefixToUse')])
-    ## ipv6-static-routing.h (module 'internet'): bool ns3::Ipv6StaticRouting::RouteInput(ns3::Ptr<const ns3::Packet> p, ns3::Ipv6Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void,ns3::Ptr<ns3::Ipv6Route>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<ns3::Ipv6MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function]
+    ## ipv6-static-routing.h (module 'internet'): bool ns3::Ipv6StaticRouting::RouteInput(ns3::Ptr<ns3::Packet const> p, ns3::Ipv6Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void,ns3::Ptr<const ns3::NetDevice>,ns3::Ptr<ns3::Ipv6Route>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<const ns3::NetDevice>,ns3::Ptr<ns3::Ipv6MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function]
     cls.add_method('RouteInput', 
                    'bool', 
-                   [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv6Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv6MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], 
+                   [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice const >, ns3::Ptr< ns3::Ipv6Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice const >, ns3::Ptr< ns3::Ipv6MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], 
                    is_virtual=True)
     ## ipv6-static-routing.h (module 'internet'): ns3::Ptr<ns3::Ipv6Route> ns3::Ipv6StaticRouting::RouteOutput(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Header const & header, ns3::Ptr<ns3::NetDevice> oif, ns3::Socket::SocketErrno & sockerr) [member function]
     cls.add_method('RouteOutput', 
@@ -14072,7 +14396,7 @@
     cls.add_constructor([param('uint8_t const *', 'buffer'), param('uint32_t', 'size'), param('bool', 'magic')])
     ## packet.h (module 'network'): ns3::Packet::Packet(uint8_t const * buffer, uint32_t size) [constructor]
     cls.add_constructor([param('uint8_t const *', 'buffer'), param('uint32_t', 'size')])
-    ## packet.h (module 'network'): void ns3::Packet::AddAtEnd(ns3::Ptr<const ns3::Packet> packet) [member function]
+    ## packet.h (module 'network'): void ns3::Packet::AddAtEnd(ns3::Ptr<ns3::Packet const> packet) [member function]
     cls.add_method('AddAtEnd', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet const >', 'packet')])
@@ -14230,6 +14554,10 @@
     cls.add_method('RemoveTrailer', 
                    'uint32_t', 
                    [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('ReplacePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
     cls.add_method('Serialize', 
                    'uint32_t', 
@@ -14284,6 +14612,33 @@
                    is_virtual=True)
     return
 
+def register_Ns3Probe_methods(root_module, cls):
+    ## probe.h (module 'stats'): ns3::Probe::Probe(ns3::Probe const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Probe const &', 'arg0')])
+    ## probe.h (module 'stats'): ns3::Probe::Probe() [constructor]
+    cls.add_constructor([])
+    ## probe.h (module 'stats'): bool ns3::Probe::ConnectByObject(std::string traceSource, ns3::Ptr<ns3::Object> obj) [member function]
+    cls.add_method('ConnectByObject', 
+                   'bool', 
+                   [param('std::string', 'traceSource'), param('ns3::Ptr< ns3::Object >', 'obj')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## probe.h (module 'stats'): void ns3::Probe::ConnectByPath(std::string path) [member function]
+    cls.add_method('ConnectByPath', 
+                   'void', 
+                   [param('std::string', 'path')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## probe.h (module 'stats'): static ns3::TypeId ns3::Probe::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## probe.h (module 'stats'): bool ns3::Probe::IsEnabled() const [member function]
+    cls.add_method('IsEnabled', 
+                   'bool', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    return
+
 def register_Ns3TcpL4Protocol_methods(root_module, cls):
     ## tcp-l4-protocol.h (module 'internet'): ns3::TcpL4Protocol::PROT_NUMBER [variable]
     cls.add_static_attribute('PROT_NUMBER', 'uint8_t const', is_const=True)
@@ -14605,13 +14960,6 @@
                    visibility='protected', is_virtual=True)
     return
 
-def register_Ns3TimeChecker_methods(root_module, cls):
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor]
-    cls.add_constructor([])
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')])
-    return
-
 def register_Ns3TimeValue_methods(root_module, cls):
     ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
     cls.add_constructor([])
@@ -15068,12 +15416,12 @@
                    'void', 
                    [], 
                    visibility='protected', is_virtual=True)
-    ## bridge-net-device.h (module 'bridge'): void ns3::BridgeNetDevice::ForwardBroadcast(ns3::Ptr<ns3::NetDevice> incomingPort, ns3::Ptr<const ns3::Packet> packet, uint16_t protocol, ns3::Mac48Address src, ns3::Mac48Address dst) [member function]
+    ## bridge-net-device.h (module 'bridge'): void ns3::BridgeNetDevice::ForwardBroadcast(ns3::Ptr<ns3::NetDevice> incomingPort, ns3::Ptr<ns3::Packet const> packet, uint16_t protocol, ns3::Mac48Address src, ns3::Mac48Address dst) [member function]
     cls.add_method('ForwardBroadcast', 
                    'void', 
                    [param('ns3::Ptr< ns3::NetDevice >', 'incomingPort'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'protocol'), param('ns3::Mac48Address', 'src'), param('ns3::Mac48Address', 'dst')], 
                    visibility='protected')
-    ## bridge-net-device.h (module 'bridge'): void ns3::BridgeNetDevice::ForwardUnicast(ns3::Ptr<ns3::NetDevice> incomingPort, ns3::Ptr<const ns3::Packet> packet, uint16_t protocol, ns3::Mac48Address src, ns3::Mac48Address dst) [member function]
+    ## bridge-net-device.h (module 'bridge'): void ns3::BridgeNetDevice::ForwardUnicast(ns3::Ptr<ns3::NetDevice> incomingPort, ns3::Ptr<ns3::Packet const> packet, uint16_t protocol, ns3::Mac48Address src, ns3::Mac48Address dst) [member function]
     cls.add_method('ForwardUnicast', 
                    'void', 
                    [param('ns3::Ptr< ns3::NetDevice >', 'incomingPort'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'protocol'), param('ns3::Mac48Address', 'src'), param('ns3::Mac48Address', 'dst')], 
@@ -15088,7 +15436,7 @@
                    'void', 
                    [param('ns3::Mac48Address', 'source'), param('ns3::Ptr< ns3::NetDevice >', 'port')], 
                    visibility='protected')
-    ## bridge-net-device.h (module 'bridge'): void ns3::BridgeNetDevice::ReceiveFromDevice(ns3::Ptr<ns3::NetDevice> device, ns3::Ptr<const ns3::Packet> packet, uint16_t protocol, ns3::Address const & source, ns3::Address const & destination, ns3::NetDevice::PacketType packetType) [member function]
+    ## bridge-net-device.h (module 'bridge'): void ns3::BridgeNetDevice::ReceiveFromDevice(ns3::Ptr<ns3::NetDevice> device, ns3::Ptr<ns3::Packet const> packet, uint16_t protocol, ns3::Address const & source, ns3::Address const & destination, ns3::NetDevice::PacketType packetType) [member function]
     cls.add_method('ReceiveFromDevice', 
                    'void', 
                    [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'source'), param('ns3::Address const &', 'destination'), param('ns3::NetDevice::PacketType', 'packetType')], 
@@ -15135,15 +15483,15 @@
                    'ns3::IpL4Protocol::RxStatus', 
                    [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::Ipv6Interface >', 'incomingInterface')], 
                    is_virtual=True)
-    ## icmpv4-l4-protocol.h (module 'internet'): void ns3::Icmpv4L4Protocol::SendDestUnreachFragNeeded(ns3::Ipv4Header header, ns3::Ptr<const ns3::Packet> orgData, uint16_t nextHopMtu) [member function]
+    ## icmpv4-l4-protocol.h (module 'internet'): void ns3::Icmpv4L4Protocol::SendDestUnreachFragNeeded(ns3::Ipv4Header header, ns3::Ptr<ns3::Packet const> orgData, uint16_t nextHopMtu) [member function]
     cls.add_method('SendDestUnreachFragNeeded', 
                    'void', 
                    [param('ns3::Ipv4Header', 'header'), param('ns3::Ptr< ns3::Packet const >', 'orgData'), param('uint16_t', 'nextHopMtu')])
-    ## icmpv4-l4-protocol.h (module 'internet'): void ns3::Icmpv4L4Protocol::SendDestUnreachPort(ns3::Ipv4Header header, ns3::Ptr<const ns3::Packet> orgData) [member function]
+    ## icmpv4-l4-protocol.h (module 'internet'): void ns3::Icmpv4L4Protocol::SendDestUnreachPort(ns3::Ipv4Header header, ns3::Ptr<ns3::Packet const> orgData) [member function]
     cls.add_method('SendDestUnreachPort', 
                    'void', 
                    [param('ns3::Ipv4Header', 'header'), param('ns3::Ptr< ns3::Packet const >', 'orgData')])
-    ## icmpv4-l4-protocol.h (module 'internet'): void ns3::Icmpv4L4Protocol::SendTimeExceededTtl(ns3::Ipv4Header header, ns3::Ptr<const ns3::Packet> orgData) [member function]
+    ## icmpv4-l4-protocol.h (module 'internet'): void ns3::Icmpv4L4Protocol::SendTimeExceededTtl(ns3::Ipv4Header header, ns3::Ptr<ns3::Packet const> orgData) [member function]
     cls.add_method('SendTimeExceededTtl', 
                    'void', 
                    [param('ns3::Ipv4Header', 'header'), param('ns3::Ptr< ns3::Packet const >', 'orgData')])
@@ -15180,10 +15528,18 @@
     cls.add_constructor([param('ns3::Icmpv6L4Protocol const &', 'arg0')])
     ## icmpv6-l4-protocol.h (module 'internet'): ns3::Icmpv6L4Protocol::Icmpv6L4Protocol() [constructor]
     cls.add_constructor([])
+    ## icmpv6-l4-protocol.h (module 'internet'): int64_t ns3::Icmpv6L4Protocol::AssignStreams(int64_t stream) [member function]
+    cls.add_method('AssignStreams', 
+                   'int64_t', 
+                   [param('int64_t', 'stream')])
     ## icmpv6-l4-protocol.h (module 'internet'): ns3::Ptr<ns3::NdiscCache> ns3::Icmpv6L4Protocol::CreateCache(ns3::Ptr<ns3::NetDevice> device, ns3::Ptr<ns3::Ipv6Interface> interface) [member function]
     cls.add_method('CreateCache', 
                    'ns3::Ptr< ns3::NdiscCache >', 
                    [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Ipv6Interface >', 'interface')])
+    ## icmpv6-l4-protocol.h (module 'internet'): void ns3::Icmpv6L4Protocol::DelayedSendMessage(ns3::Ptr<ns3::Packet> packet, ns3::Ipv6Address src, ns3::Ipv6Address dst, uint8_t ttl) [member function]
+    cls.add_method('DelayedSendMessage', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv6Address', 'src'), param('ns3::Ipv6Address', 'dst'), param('uint8_t', 'ttl')])
     ## icmpv6-l4-protocol.h (module 'internet'): void ns3::Icmpv6L4Protocol::DoDAD(ns3::Ipv6Address target, ns3::Ptr<ns3::Ipv6Interface> interface) [member function]
     cls.add_method('DoDAD', 
                    'void', 
@@ -15297,10 +15653,10 @@
     cls.add_method('SendRS', 
                    'void', 
                    [param('ns3::Ipv6Address', 'src'), param('ns3::Ipv6Address', 'dst'), param('ns3::Address', 'hardwareAddress')])
-    ## icmpv6-l4-protocol.h (module 'internet'): void ns3::Icmpv6L4Protocol::SendRedirection(ns3::Ptr<ns3::Packet> redirectedPacket, ns3::Ipv6Address dst, ns3::Ipv6Address redirTarget, ns3::Ipv6Address redirDestination, ns3::Address redirHardwareTarget) [member function]
+    ## icmpv6-l4-protocol.h (module 'internet'): void ns3::Icmpv6L4Protocol::SendRedirection(ns3::Ptr<ns3::Packet> redirectedPacket, ns3::Ipv6Address src, ns3::Ipv6Address dst, ns3::Ipv6Address redirTarget, ns3::Ipv6Address redirDestination, ns3::Address redirHardwareTarget) [member function]
     cls.add_method('SendRedirection', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'redirectedPacket'), param('ns3::Ipv6Address', 'dst'), param('ns3::Ipv6Address', 'redirTarget'), param('ns3::Ipv6Address', 'redirDestination'), param('ns3::Address', 'redirHardwareTarget')])
+                   [param('ns3::Ptr< ns3::Packet >', 'redirectedPacket'), param('ns3::Ipv6Address', 'src'), param('ns3::Ipv6Address', 'dst'), param('ns3::Ipv6Address', 'redirTarget'), param('ns3::Ipv6Address', 'redirDestination'), param('ns3::Address', 'redirHardwareTarget')])
     ## icmpv6-l4-protocol.h (module 'internet'): void ns3::Icmpv6L4Protocol::SetNode(ns3::Ptr<ns3::Node> node) [member function]
     cls.add_method('SetNode', 
                    'void', 
@@ -15441,7 +15797,7 @@
     cls.add_method('RemoveRoute', 
                    'void', 
                    [param('uint32_t', 'i')])
-    ## ipv4-global-routing.h (module 'internet'): bool ns3::Ipv4GlobalRouting::RouteInput(ns3::Ptr<const ns3::Packet> p, ns3::Ipv4Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void,ns3::Ptr<ns3::Ipv4Route>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<ns3::Ipv4MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function]
+    ## ipv4-global-routing.h (module 'internet'): bool ns3::Ipv4GlobalRouting::RouteInput(ns3::Ptr<ns3::Packet const> p, ns3::Ipv4Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void,ns3::Ptr<ns3::Ipv4Route>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<ns3::Ipv4MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function]
     cls.add_method('RouteInput', 
                    'bool', 
                    [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv4Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], 
@@ -15513,7 +15869,7 @@
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], 
                    is_const=True, is_virtual=True)
-    ## ipv4-list-routing.h (module 'internet'): bool ns3::Ipv4ListRouting::RouteInput(ns3::Ptr<const ns3::Packet> p, ns3::Ipv4Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void,ns3::Ptr<ns3::Ipv4Route>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<ns3::Ipv4MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function]
+    ## ipv4-list-routing.h (module 'internet'): bool ns3::Ipv4ListRouting::RouteInput(ns3::Ptr<ns3::Packet const> p, ns3::Ipv4Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void,ns3::Ptr<ns3::Ipv4Route>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<ns3::Ipv4MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function]
     cls.add_method('RouteInput', 
                    'bool', 
                    [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv4Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], 
@@ -15540,6 +15896,37 @@
                    visibility='protected', is_virtual=True)
     return
 
+def register_Ns3Ipv4PacketProbe_methods(root_module, cls):
+    ## ipv4-packet-probe.h (module 'internet'): ns3::Ipv4PacketProbe::Ipv4PacketProbe(ns3::Ipv4PacketProbe const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv4PacketProbe const &', 'arg0')])
+    ## ipv4-packet-probe.h (module 'internet'): ns3::Ipv4PacketProbe::Ipv4PacketProbe() [constructor]
+    cls.add_constructor([])
+    ## ipv4-packet-probe.h (module 'internet'): bool ns3::Ipv4PacketProbe::ConnectByObject(std::string traceSource, ns3::Ptr<ns3::Object> obj) [member function]
+    cls.add_method('ConnectByObject', 
+                   'bool', 
+                   [param('std::string', 'traceSource'), param('ns3::Ptr< ns3::Object >', 'obj')], 
+                   is_virtual=True)
+    ## ipv4-packet-probe.h (module 'internet'): void ns3::Ipv4PacketProbe::ConnectByPath(std::string path) [member function]
+    cls.add_method('ConnectByPath', 
+                   'void', 
+                   [param('std::string', 'path')], 
+                   is_virtual=True)
+    ## ipv4-packet-probe.h (module 'internet'): static ns3::TypeId ns3::Ipv4PacketProbe::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## ipv4-packet-probe.h (module 'internet'): void ns3::Ipv4PacketProbe::SetValue(ns3::Ptr<ns3::Packet const> packet, ns3::Ptr<ns3::Ipv4> ipv4, uint32_t interface) [member function]
+    cls.add_method('SetValue', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')])
+    ## ipv4-packet-probe.h (module 'internet'): static void ns3::Ipv4PacketProbe::SetValueByPath(std::string path, ns3::Ptr<ns3::Packet const> packet, ns3::Ptr<ns3::Ipv4> ipv4, uint32_t interface) [member function]
+    cls.add_method('SetValueByPath', 
+                   'void', 
+                   [param('std::string', 'path'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')], 
+                   is_static=True)
+    return
+
 def register_Ns3Ipv6ExtensionLooseRouting_methods(root_module, cls):
     ## ipv6-extension.h (module 'internet'): ns3::Ipv6ExtensionLooseRouting::Ipv6ExtensionLooseRouting(ns3::Ipv6ExtensionLooseRouting const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::Ipv6ExtensionLooseRouting const &', 'arg0')])
@@ -15624,10 +16011,10 @@
                    'void', 
                    [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], 
                    is_const=True, is_virtual=True)
-    ## ipv6-list-routing.h (module 'internet'): bool ns3::Ipv6ListRouting::RouteInput(ns3::Ptr<const ns3::Packet> p, ns3::Ipv6Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void,ns3::Ptr<ns3::Ipv6Route>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<ns3::Ipv6MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function]
+    ## ipv6-list-routing.h (module 'internet'): bool ns3::Ipv6ListRouting::RouteInput(ns3::Ptr<ns3::Packet const> p, ns3::Ipv6Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void,ns3::Ptr<const ns3::NetDevice>,ns3::Ptr<ns3::Ipv6Route>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<const ns3::NetDevice>,ns3::Ptr<ns3::Ipv6MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv6Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function]
     cls.add_method('RouteInput', 
                    'bool', 
-                   [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv6Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv6MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], 
+                   [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice const >, ns3::Ptr< ns3::Ipv6Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice const >, ns3::Ptr< ns3::Ipv6MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], 
                    is_virtual=True)
     ## ipv6-list-routing.h (module 'internet'): ns3::Ptr<ns3::Ipv6Route> ns3::Ipv6ListRouting::RouteOutput(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Header const & header, ns3::Ptr<ns3::NetDevice> oif, ns3::Socket::SocketErrno & sockerr) [member function]
     cls.add_method('RouteOutput', 
@@ -15646,6 +16033,37 @@
                    visibility='protected', is_virtual=True)
     return
 
+def register_Ns3Ipv6PacketProbe_methods(root_module, cls):
+    ## ipv6-packet-probe.h (module 'internet'): ns3::Ipv6PacketProbe::Ipv6PacketProbe(ns3::Ipv6PacketProbe const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Ipv6PacketProbe const &', 'arg0')])
+    ## ipv6-packet-probe.h (module 'internet'): ns3::Ipv6PacketProbe::Ipv6PacketProbe() [constructor]
+    cls.add_constructor([])
+    ## ipv6-packet-probe.h (module 'internet'): bool ns3::Ipv6PacketProbe::ConnectByObject(std::string traceSource, ns3::Ptr<ns3::Object> obj) [member function]
+    cls.add_method('ConnectByObject', 
+                   'bool', 
+                   [param('std::string', 'traceSource'), param('ns3::Ptr< ns3::Object >', 'obj')], 
+                   is_virtual=True)
+    ## ipv6-packet-probe.h (module 'internet'): void ns3::Ipv6PacketProbe::ConnectByPath(std::string path) [member function]
+    cls.add_method('ConnectByPath', 
+                   'void', 
+                   [param('std::string', 'path')], 
+                   is_virtual=True)
+    ## ipv6-packet-probe.h (module 'internet'): static ns3::TypeId ns3::Ipv6PacketProbe::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## ipv6-packet-probe.h (module 'internet'): void ns3::Ipv6PacketProbe::SetValue(ns3::Ptr<ns3::Packet const> packet, ns3::Ptr<ns3::Ipv6> ipv6, uint32_t interface) [member function]
+    cls.add_method('SetValue', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Ptr< ns3::Ipv6 >', 'ipv6'), param('uint32_t', 'interface')])
+    ## ipv6-packet-probe.h (module 'internet'): static void ns3::Ipv6PacketProbe::SetValueByPath(std::string path, ns3::Ptr<ns3::Packet const> packet, ns3::Ptr<ns3::Ipv6> ipv6, uint32_t interface) [member function]
+    cls.add_method('SetValueByPath', 
+                   'void', 
+                   [param('std::string', 'path'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Ptr< ns3::Ipv6 >', 'ipv6'), param('uint32_t', 'interface')], 
+                   is_static=True)
+    return
+
 def register_Ns3LoopbackNetDevice_methods(root_module, cls):
     ## loopback-net-device.h (module 'internet'): ns3::LoopbackNetDevice::LoopbackNetDevice(ns3::LoopbackNetDevice const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::LoopbackNetDevice const &', 'arg0')])
@@ -15783,15 +16201,128 @@
                    visibility='protected', is_virtual=True)
     return
 
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_functions(root_module):
     module = root_module
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     register_functions_ns3_internal(module.get_submodule('internal'), root_module)
     return
 
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def register_functions_ns3_internal(module, root_module):
     return
 
diff -Naur ns-3.17/src/internet/doc/internet-stack.rst ns-3.18/src/internet/doc/internet-stack.rst
--- ns-3.17/src/internet/doc/internet-stack.rst	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/doc/internet-stack.rst	2013-10-26 07:07:29.899364390 -0700
@@ -14,48 +14,83 @@
 IPv6, Neighbor Discovery, and other related protocols.
 
 Internet Nodes are not subclasses of class Node; they are simply Nodes that have
-had a bunch of IPv4-related objects aggregated to them. They can be put together
+had a bunch of IP-related objects aggregated to them. They can be put together
 by hand, or via a helper function :cpp:func:`InternetStackHelper::Install ()`
 which does the following to all nodes passed in as arguments:::
 
     void
     InternetStackHelper::Install (Ptr<Node> node) const
     {
-      if (node->GetObject<Ipv4> () != 0)
+      if (m_ipv4Enabled)
         {
-          NS_FATAL_ERROR ("InternetStackHelper::Install(): Aggregating "
-                          "an InternetStack to a node with an existing Ipv4 object");
-          return;
+          /* IPv4 stack */
+          if (node->GetObject<Ipv4> () != 0)
+            {
+              NS_FATAL_ERROR ("InternetStackHelper::Install (): Aggregating " 
+                              "an InternetStack to a node with an existing Ipv4 object");
+              return;
+            }
+
+          CreateAndAggregateObjectFromTypeId (node, "ns3::ArpL3Protocol");
+          CreateAndAggregateObjectFromTypeId (node, "ns3::Ipv4L3Protocol");
+          CreateAndAggregateObjectFromTypeId (node, "ns3::Icmpv4L4Protocol");
+          // Set routing
+          Ptr<Ipv4> ipv4 = node->GetObject<Ipv4> ();
+          Ptr<Ipv4RoutingProtocol> ipv4Routing = m_routing->Create (node);
+          ipv4->SetRoutingProtocol (ipv4Routing);
         }
 
-      CreateAndAggregateObjectFromTypeId (node, "ns3::ArpL3Protocol");
-      CreateAndAggregateObjectFromTypeId (node, "ns3::Ipv4L3Protocol");
-      CreateAndAggregateObjectFromTypeId (node, "ns3::Icmpv4L4Protocol");
-      CreateAndAggregateObjectFromTypeId (node, "ns3::UdpL4Protocol");
-      node->AggregateObject (m_tcpFactory.Create<Object> ());
-      Ptr<PacketSocketFactory> factory = CreateObject<PacketSocketFactory> ();
-      node->AggregateObject (factory);
-      // Set routing
-      Ptr<Ipv4> ipv4 = node->GetObject<Ipv4> ();
-      Ptr<Ipv4RoutingProtocol> ipv4Routing = m_routing->Create (node);
-      ipv4->SetRoutingProtocol (ipv4Routing);
+      if (m_ipv6Enabled)
+        {
+          /* IPv6 stack */
+          if (node->GetObject<Ipv6> () != 0)
+            {
+              NS_FATAL_ERROR ("InternetStackHelper::Install (): Aggregating " 
+                              "an InternetStack to a node with an existing Ipv6 object");
+              return;
+            }
+
+          CreateAndAggregateObjectFromTypeId (node, "ns3::Ipv6L3Protocol");
+          CreateAndAggregateObjectFromTypeId (node, "ns3::Icmpv6L4Protocol");
+          // Set routing
+          Ptr<Ipv6> ipv6 = node->GetObject<Ipv6> ();
+          Ptr<Ipv6RoutingProtocol> ipv6Routing = m_routingv6->Create (node);
+          ipv6->SetRoutingProtocol (ipv6Routing);
+
+          /* register IPv6 extensions and options */
+          ipv6->RegisterExtensions ();
+          ipv6->RegisterOptions ();
+        }
+
+      if (m_ipv4Enabled || m_ipv6Enabled)
+        {
+          /* UDP and TCP stacks */
+          CreateAndAggregateObjectFromTypeId (node, "ns3::UdpL4Protocol");
+          node->AggregateObject (m_tcpFactory.Create<Object> ());
+          Ptr<PacketSocketFactory> factory = CreateObject<PacketSocketFactory> ();
+          node->AggregateObject (factory);
+        }
     }
 
 Where multiple implementations exist in |ns3| (TCP, IP routing), these objects
 are added by a factory object (TCP) or by a routing helper (m_routing).
 
 Note that the routing protocol is configured and set outside this
-function. By default, the following protocols are added to Ipv4:::
+function. By default, the following protocols are added:::
 
-    InternetStackHelper::InternetStackHelper ()
+    void InternetStackHelper::Initialize ()
     {
       SetTcp ("ns3::TcpL4Protocol");
-      static Ipv4StaticRoutingHelper staticRouting;
-      static Ipv4GlobalRoutingHelper globalRouting;
-      static Ipv4ListRoutingHelper listRouting;
+      Ipv4StaticRoutingHelper staticRouting;
+      Ipv4GlobalRoutingHelper globalRouting;
+      Ipv4ListRoutingHelper listRouting;
+      Ipv6ListRoutingHelper listRoutingv6;
+      Ipv6StaticRoutingHelper staticRoutingv6;
       listRouting.Add (staticRouting, 0);
       listRouting.Add (globalRouting, -10);
+      listRoutingv6.Add (staticRoutingv6, 0);
       SetRoutingHelper (listRouting);
+      SetRoutingHelper (listRoutingv6);
     }
 
 By default, IPv4 and IPv6 are enabled.
@@ -63,14 +98,14 @@
 Internet Node structure
 +++++++++++++++++++++++
 
-An IPv4-capable Node (an |ns3| Node augmented by aggregation to have one or more
+An IP-capable Node (an |ns3| Node augmented by aggregation to have one or more
 IP stacks) has the following internal structure.
 
 Layer-3 protocols
 ~~~~~~~~~~~~~~~~~
 
 At the lowest layer, sitting above the NetDevices, are the "layer 3" protocols,
-including IPv4, IPv6, and ARP. The class
+including IPv4, IPv6, ARP and so on. The class
 :cpp:class:`Ipv4L3Protocol` is an implementation class whose public interface is
 typically class :cpp:class:`Ipv4`, but the
 Ipv4L3Protocol public API is also used internally at present.
@@ -211,11 +246,11 @@
   local address, destination port, destination address) associated with the
   socket, and a receive callback for the socket.
 
-Ipv4-capable node interfaces
-++++++++++++++++++++++++++++
+IP-capable node interfaces
+++++++++++++++++++++++++++
 
 Many of the implementation details, or internal objects themselves, of
-Ipv4-capable Node objects are not exposed at the simulator public API. This
+IP-capable Node objects are not exposed at the simulator public API. This
 allows for different implementations; for instance, replacing the native |ns3|
 models with ported TCP/IP stack code. 
  
diff -Naur ns-3.17/src/internet/doc/ipv6.rst ns-3.18/src/internet/doc/ipv6.rst
--- ns-3.17/src/internet/doc/ipv6.rst	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/doc/ipv6.rst	2013-10-26 07:07:29.899364390 -0700
@@ -1,7 +1,405 @@
 .. include:: replace.txt
 
-IPv6 
+IPv6
 ----
 
-*Placeholder chapter*
+This chapter describes the |ns3| IPv6 model capabilities and limitations along with its
+usage and examples.
+
+IPv6 model description
+**********************
+
+The IPv6 model is loosely patterned after the Linux implementation;
+the implementation is not complete as some features of IPv6 are not of
+much interest to simulation studies, and some features of IPv6 are simply
+not modeled yet in |ns3|.
+
+The base class :cpp:class:`Ipv6` 
+defines a generic API, while the class :cpp:class:`Ipv6L3Protocol` is the actual class
+implementing the protocol. The actual classes used by the IPv6 stack are located mainly 
+in the directory ``src/internet``. 
+
+The implementation of IPv6 is contained in the following files:
+
+::
+
+    src/internet/model/icmpv6-header.{cc,h}
+    src/internet/model/icmpv6-l4-protocol.{cc,h}
+    src/internet/model/ipv6.{cc,h}
+    src/internet/model/ipv6-address-generator.{cc,h}
+    src/internet/model/ipv6-autoconfigured-prefix.{cc,h}
+    src/internet/model/ipv6-end-point.{cc,h}
+    src/internet/model/ipv6-end-point-demux.{cc,h}
+    src/internet/model/ipv6-extension.{cc,h}
+    src/internet/model/ipv6-extension-demux.{cc,h}
+    src/internet/model/ipv6-extension-header.{cc,h}
+    src/internet/model/ipv6-header.{cc,h}
+    src/internet/model/ipv6-interface.{cc,h}
+    src/internet/model/ipv6-interface-address.{cc,h}
+    src/internet/model/ipv6-l3-protocol.{cc,h}
+    src/internet/model/ipv6-list-routing.{cc,h}
+    src/internet/model/ipv6-option.{cc,h}
+    src/internet/model/ipv6-option-demux.{cc,h}
+    src/internet/model/ipv6-option-header.{cc,h}
+    src/internet/model/ipv6-packet-info-tag.{cc,h}
+    src/internet/model/ipv6-pmtu-cache.{cc,h}
+    src/internet/model/ipv6-raw-socket-factory.{cc,h}
+    src/internet/model/ipv6-raw-socket-factory-impl.{cc,h}
+    src/internet/model/ipv6-raw-socket-impl.{cc,h}
+    src/internet/model/ipv6-route.{cc,h}
+    src/internet/model/ipv6-routing-protocol.{cc,h}
+    src/internet/model/ipv6-routing-table-entry.{cc,h}
+    src/internet/model/ipv6-static-routing.{cc,h}
+    src/internet/model/ndisc-cache.{cc,h}
+    src/network/utils/inet6-socket-address.{cc,h}
+    src/network/utils/ipv6-address.{cc,h}
+
+Also some helpers are involved with IPv6:
+
+::
+
+    src/internet/helper/internet-stack-helper.{cc,h}
+    src/internet/helper/ipv6-address-helper.{cc,h}
+    src/internet/helper/ipv6-interface-container.{cc,h}
+    src/internet/helper/ipv6-list-routing-helper.{cc,h}
+    src/internet/helper/ipv6-routing-helper.{cc,h}
+    src/internet/helper/ipv6-static-routing-helper.{cc,h}
+
+The model files can be roughly divided into:
+
+* protocol models (e.g., ipv6, ipv6-l3-protocol, icmpv6-l4-protocol, etc.)
+* routing models (i.e., anything with 'routing' in its name)
+* sockets and interfaces (e.g., ipv6-raw-socket, ipv6-interface, ipv6-end-point, etc.)
+* address-related things
+* headers, option headers, extension headers, etc.
+* accessory classes (e.g., ndisc-cache)
+
+
+Usage
+*****
+
+The following description is based on using the typical helpers found in the example code.
+
+IPv6 does not need to be activated in a node. it is automatically added to the 
+available protocols once the Internet Stack is installed.
+
+In order to *not* install IPv6 along with IPv4, it is possible to use
+:cpp:class:`ns3::InternetStackHelper` method `SetIpv6StackInstall (bool enable)` 
+before installing the InternetStack in the nodes.
+
+Note that to have an IPv6-only network (i.e., to not install the IPv4 stack in a node)
+one should use :cpp:class:`ns3::InternetStackHelper` method `SetIpv4StackInstall (bool enable)` 
+before the stack installation.
+
+As an example, in the following code node 0 will have both IPv4 and IPv6, node 1 only 
+only IPv6 and node 2 only IPv4:
+
+::
+
+    NodeContainer n;
+    n.Create (3);
+
+    InternetStackHelper internet;
+    InternetStackHelper internetV4only;
+    InternetStackHelper internetV6only;
+
+    internetV4only.SetIpv6StackInstall (false);
+    internetV6only.SetIpv4StackInstall (false);
+    
+    internet.Install (n.Get (0));
+    internetV6only.Install (n.Get (1));
+    internetV4only.Install (n.Get (2));
+   
+
+
+IPv6 addresses assignment
+=========================
+
+In order to use IPv6 on a network, the first thing to do is assigning IPv6 addresses.
+
+Any IPv6-enabled |ns3| node will have at least one NetDevice: the :cpp:class:`ns3::LoopbackNetDevice`.
+The loopback device address is ``::1``.
+All the other NetDevices will have one or more IPv6 addresses:
+
+* One link-local address: ``fe80::interface ID``, where ``interface ID`` is derived from the NetDevice MAC address.
+* Zero or more global addresses, e.g., ``2001:db8::1``.
+
+Typically the first address on an interface will be the link-local one, with the global 
+address(es) being the following ones.
+
+IPv6 global addresses might be:
+
+* manually assigned
+* auto-generated
+
+|ns3| can use both methods, and it's quite important to understand the implications of both.
+
+Manually assigned IPv6 adddresses
++++++++++++++++++++++++++++++++++
+
+This is probably the easiest and most used method. As an example:
+
+::
+
+    Ptr<Node> n0 = CreateObject<Node> ();
+    Ptr<Node> n1 = CreateObject<Node> ();
+    NodeContainer net (n0, n1);
+    CsmaHelper csma;
+    NetDeviceContainer ndc = csma.Install (net); 
+    
+    NS_LOG_INFO ("Assign IPv6 Addresses.");
+    Ipv6AddressHelper ipv6;
+    ipv6.SetBase (Ipv6Address ("2001:db8::"), Ipv6Prefix (64));
+    Ipv6InterfaceContainer ic = ipv6.Assign (ndc);
+
+This method will add two global IPv6 addresses to the nodes. Note that, as usual for IPv6,
+all the nodes will also have a link-local address. Typically the first address on an 
+interface will be the link-local one, with the global address(es) being the following ones.
+
+Auto-generated IPv6 adddresses
+##############################
+
+This is accomplished by relying on the RADVD protocol, implemented by the class
+:cpp:class:`Radvd`. At the time there is no helper for this application, and the
+use is rather difficult (see ``examples/ipv6/radvd.cc``).
+
+Upon using this method, the nodes will acquire dynamically (i.e., during the simulation)
+one (or more) global address(es) according to the RADVD configuration. 
+These addresses will be bases on the RADVD announced prefix and the node's EUI-64.
+
+Random-generated IPv6 adddresses
+################################
+
+While IPv6 real nodes will use randomly generated addresses to protect privacy, |ns3|
+does NOT have this capability. This feature haven't been so far considered as interesting
+for simulation.
+
+Duplicate Address Detection (DAD)
+#################################
+
+Nodes will perform DAD (it can be disabled using an :cpp:class:`Icmpv6L4Protocol` attribute).
+Upon receiving a DAD, however, nodes will not react to it. As is: DAD reaction is 
+incomplete so far. 
+The main reason relies on the missing random-generated address capability. Moreover, 
+since |ns3| nodes will usually be well-behaving, therea should't be any Duplicate Address.
+This might be changed in the future, so as to avoid issues with real-world 
+integrated simulations.
+
+Host and Router behaviour in IPv6 and |ns3|
+===========================================
+
+In IPv6 there is a clear distinction between *routers* and *hosts*. As one might expect,
+routers can forward packets from an interface to another interface, while hosts drop
+packets not directed to them.
+
+Unfortunately, forwarding is not the only thing affected by this distinction, and forwarding
+itself might be fine-tuned, e.g., to forward packets incoming from an interface and drop 
+packets from another interface.
+
+In |ns3| a node is configured to be an *host* by default. There are two main ways to change 
+this behaviour:
+
+* Using :cpp:class:`ns3::Ipv6InterfaceContainer` `SetForwarding(uint32_t i, bool router)` where ``i`` is the interface index in the container.
+* Changing the :cpp:class:`ns3::Ipv6` attribute ``IpForward``.
+
+Either one can be used during the simulation.
+
+A fine-grained setup can be accomplished by using :cpp:class:`ns3::Ipv6Interface` `SetForwarding (bool forward);`
+which allows to change the behaviour on a per-interface-basis.
+
+Note that the node-wide configuration only serves as a convenient method to enable/disable the 
+:cpp:class:`ns3::Ipv6Interface` specific setting. An Ipv6Interface added to a node
+with forwarding enabled will be set to be forwarding as well.
+This is really important when a node has interfaces added during the simulation. 
+
+According to the :cpp:class:`ns3::Ipv6Interface` forwarding state, the following happens:
+
+* Forwarding OFF
+
+ * The node will NOT reply to Router Solicitation
+ * The node will react to Router Advertisement
+ * The node will periodically send Router Solicitation
+ * Routing protocols MUST DROP packets not directed to the node
+
+* Forwarding ON
+
+ * The node will reply to Router Solicitation
+ * The node will NOT react to Router Advertisement
+ * The node will NOT send Router Solicitation
+ * Routing protocols MUST forward packets
+
+The behaviour is matching ip-sysctl.txt (http://www.kernel.org/doc/Documentation/networking/ip-sysctl.txt)
+with the difference that it's not possible to override the behaviour using esoteric settings 
+(e.g., forwarding but accept router advertisements, accept_ra=2, or forwarding but send router solicitations
+forwarding=2).
+
+Consider carefully the implications of packet forwarding. As an example, a node will NOT send
+ICMPv6 PACKET_TOO_BIG messages from an interface with frowarding off. This is completely normal,
+as the Routing protocol will drop the packet before attempting to forward it.
+
+
+Helpers
+=======
+
+Typically the helpers used in IPv6 setup are:
+
+* :cpp:class:`ns3::InternetStackHelper`
+* :cpp:class:`ns3::Ipv6AddressHelper`
+* :cpp:class:`ns3::Ipv6InterfaceContainer`
+
+The use is almost identical to the corresponding IPv4 case, e.g.:
+
+::
+
+    NodeContainer n;
+    n.Create (4);
+    
+    NS_LOG_INFO ("Create IPv6 Internet Stack");
+    InternetStackHelper internetv6;
+    internetv6.Install (n);
+    
+    NS_LOG_INFO ("Create channels.");
+    CsmaHelper csma;
+    NetDeviceContainer d = csma.Install (n);
+    
+    NS_LOG_INFO ("Create networks and assign IPv6 Addresses.");
+    Ipv6AddressHelper ipv6;
+    ipv6.SetBase (Ipv6Address ("2001:db8::"), Ipv6Prefix (64));
+    Ipv6InterfaceContainer iic = ipv6.Assign (d);
+
+Additionally, a common task is to enable forwarding on one of the nodes and to
+setup a default route toward it in the other nodes, e.g.:
+
+::
+
+    iic.SetForwarding (0, true);
+    iic.SetDefaultRouteInAllNodes (0);
+
+This will enable forwarding on the node *0* and will setup a default route in 
+:cpp:class:`ns3::Ipv6StaticRouting` on all the other nodes. Note that this 
+requires that Ipv6StaticRouting is present in the nodes. 
+
+The IPv6 routing helpers enable the user to perform specific tasks on the
+particular routing algorith and to print the routing tables. 
+
+
+Attributes
+==========
+
+Many classes in the |ns3| IPv6 implementation contain attributes. The most
+useful ones are:
+
+* :cpp:class:`ns3::Ipv6`
+ 
+ * `IpForward`, boolean, default false. Globally enable or disable IP forwarding for all current and future IPv6 devices.
+ * `MtuDiscover`, boolean, default true. If disabled, every interface will have its MTU set to 1280 bytes.
+
+* :cpp:class:`ns3::Ipv6L3Protocol`
+
+ * `DefaultTtl`, uint8_t, default 64. The TTL value set by default on all outgoing packets generated on this node.
+ * `SendIcmpv6Redirect`, boolean, default true. Send the ICMPv6 Redirect when appropriate.
+ 
+* :cpp:class:`ns3::Icmpv6L4Protocol`
+
+ * `DAD`, boolean, default true. Always do DAD (Duplicate Address Detection) check.
+ 
+* :cpp:class:`ns3::NdiscCache`
+
+ * `UnresolvedQueueSize`, uint32_t, default 3. Size of the queue for packets pending an NA reply.
+ 
+Output
+======
+
+The IPv6 stack provides some useful trace sources:
+
+* :cpp:class:`ns3::Ipv6L3Protocol`
+
+ * `Tx`, Send IPv6 packet to outgoing interface.
+ * `Rx`, Receive IPv6 packet from incoming interface.
+ * `Drop`, Drop IPv6 packet.
+
+* :cpp:class:`ns3::Ipv6Extension`
+
+ * `Drop`, Drop IPv6 packet.
+
+The latest trace source is generated when a packet contains an unknown option blocking its processing.
+
+Mind that :cpp:class:`ns3::NdiscCache` could drop packets as well, and they are not logged 
+in a trace source (yet). This might generate some confusion in the sent/received packets counters.
+
+Advanced Usage
+==============
+
+IPv6 maximum transmission unit (MTU) and fragmentation
+++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+|ns3| NetDevices define the MTU according to the L2 simulated Device. IPv6 requires
+that the minimum MTU is 1280 bytes, so all NetDevices are required to support at least
+this MTU. This is the link-MTU.
+
+In order to support different MTUs in a source-destination path, |ns3| IPv6 model can
+perform fragmentation.
+This can be either triggered by receiving a packet bigger than the link-MTU from the L4
+protocols (UDP, TCP, etc.), or by receving an ICMPv6 PACKET_TOO_BIG message.
+The model mimics RFC 1981, with the following notable exceptions:
+
+* L4 protocols are not informed of the Path MTU change
+* TCP can not change its Segment Size according to the Path-MTU.
+
+Both limitations are going to be removed in due time.
+
+The Path-MTU cache is currently based on the source-destination IPv6 addresses. Further
+classifications (e.g., flow label) are possible but not yet implemented.
+
+The Path-MTU default validity time is 10 minutes. After the cache entry expiration, the
+Path-MTU information is removed and the next packet will (eventually) trigger a new ICMPv6
+PACKET_TOO_BIG message.
+Note that 1) this is consistent with the RFC specification and 2) L4 protocols are 
+responsible for retransmitting the packets.
+
+Examples
+========
+
+The examples for IPv6 are in the directory ``examples/ipv6``. These examples focus on
+the most interesting IPv6 peculiarities, such as fragmentation, redirect and so on.
+
+Moreover, most TCP and UDP examples located in ``examples/udp``, ``examples/tcp``, etc. 
+have a command-line option to use IPv6 instead of IPv4.
+
+Troubleshooting
+===============
+
+There are just a few pitfalls to avoid while using |ns3| IPv6.
+
+Routing loops
++++++++++++++
+
+Since the only (so far) routing scheme available for IPv6 is :cpp:class:`ns3::Ipv6StaticRouting`,
+default router have to be setup manually. When there are two or more routers in a network 
+(e.g., node A and node B), avoid using the helper function `SetDefaultRouteInAllNodes` 
+for more than one router.
+
+The consequence would be to install a default route to B in A and a default route pointing to 
+A in B, generating a loop. 
+
+Global address leakage
+++++++++++++++++++++++
+
+Remember that addresses in IPv6 are *global* by definition. When using IPv6 with an emulation
+|ns3| capability, avoid at all costs address leakage toward the global Internet. 
+It is advisable to setup an external firewall to prevent leakage.
+
+2001:DB8::/32 addresses
++++++++++++++++++++++++
+
+IPv6 standard (RFC 3849) defines the ``2001:DB8::/32`` address class for the *documentation*.
+This manual uses this convention. The addresses in this class are, however, only usable in
+a document, and routers should discard them.
+
+Validation
+**********
+
+The IPv6 protocols has not yet been extensively validated against real implementations.
+The actual tests involve mainly performing checks of the .pcap trace files with Wireshark, 
+and the results are positive.
 
diff -Naur ns-3.17/src/internet/helper/internet-stack-helper.cc ns-3.18/src/internet/helper/internet-stack-helper.cc
--- ns-3.17/src/internet/helper/internet-stack-helper.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/helper/internet-stack-helper.cc	2013-10-26 07:07:29.899364390 -0700
@@ -174,6 +174,7 @@
 #include "ns3/ipv6-extension.h"
 #include "ns3/ipv6-extension-demux.h"
 #include "ns3/ipv6-extension-header.h"
+#include "ns3/icmpv6-l4-protocol.h"
 #include "ns3/global-router-interface.h"
 #include <limits>
 #include <map>
@@ -233,7 +234,10 @@
   : m_routing (0),
     m_routingv6 (0),
     m_ipv4Enabled (true),
-    m_ipv6Enabled (true)
+    m_ipv6Enabled (true),
+    m_ipv4ArpJitterEnabled (true),
+    m_ipv6NsRsJitterEnabled (true)
+
 {
   Initialize ();
 }
@@ -268,6 +272,8 @@
   m_ipv4Enabled = o.m_ipv4Enabled;
   m_ipv6Enabled = o.m_ipv6Enabled;
   m_tcpFactory = o.m_tcpFactory;
+  m_ipv4ArpJitterEnabled = o.m_ipv4ArpJitterEnabled;
+  m_ipv6NsRsJitterEnabled = o.m_ipv6NsRsJitterEnabled;
 }
 
 InternetStackHelper &
@@ -291,6 +297,8 @@
   m_routingv6 = 0;
   m_ipv4Enabled = true;
   m_ipv6Enabled = true;
+  m_ipv4ArpJitterEnabled = true;
+  m_ipv6NsRsJitterEnabled = true;
   Initialize ();
 }
 
@@ -319,6 +327,16 @@
   m_ipv6Enabled = enable;
 }
 
+void InternetStackHelper::SetIpv4ArpJitter (bool enable)
+{
+  m_ipv4ArpJitterEnabled = enable;
+}
+
+void InternetStackHelper::SetIpv6NsRsJitter (bool enable)
+{
+  m_ipv6NsRsJitterEnabled = enable;
+}
+
 int64_t
 InternetStackHelper::AssignStreams (NodeContainer c, int64_t stream)
 {
@@ -342,6 +360,24 @@
           NS_ASSERT (fe);  // should always exist in the demux
           currentStream += fe->AssignStreams (currentStream);
         }
+      Ptr<Ipv4> ipv4 = node->GetObject<Ipv4> ();
+      if (ipv4 != 0)
+        {
+          Ptr<ArpL3Protocol> arpL3Protocol = ipv4->GetObject<ArpL3Protocol> ();
+          if (arpL3Protocol != 0)
+            {
+              currentStream += arpL3Protocol->AssignStreams (currentStream);
+            }
+        }
+      Ptr<Ipv6> ipv6 = node->GetObject<Ipv6> ();
+      if (ipv6 != 0)
+        {
+          Ptr<Icmpv6L4Protocol> icmpv6L4Protocol = ipv6->GetObject<Icmpv6L4Protocol> ();
+          if (icmpv6L4Protocol != 0)
+            {
+              currentStream += icmpv6L4Protocol->AssignStreams (currentStream);
+            }
+        }
     }
   return (currentStream - stream);
 }
@@ -398,6 +434,12 @@
       CreateAndAggregateObjectFromTypeId (node, "ns3::ArpL3Protocol");
       CreateAndAggregateObjectFromTypeId (node, "ns3::Ipv4L3Protocol");
       CreateAndAggregateObjectFromTypeId (node, "ns3::Icmpv4L4Protocol");
+      if (m_ipv4ArpJitterEnabled == false)
+        {
+          Ptr<ArpL3Protocol> arp = node->GetObject<ArpL3Protocol> ();
+          NS_ASSERT (arp);
+          arp->SetAttribute ("RequestJitter", StringValue ("ns3::ConstantRandomVariable[Constant=0.0]"));
+        }
       // Set routing
       Ptr<Ipv4> ipv4 = node->GetObject<Ipv4> ();
       Ptr<Ipv4RoutingProtocol> ipv4Routing = m_routing->Create (node);
@@ -416,6 +458,12 @@
 
       CreateAndAggregateObjectFromTypeId (node, "ns3::Ipv6L3Protocol");
       CreateAndAggregateObjectFromTypeId (node, "ns3::Icmpv6L4Protocol");
+      if (m_ipv6NsRsJitterEnabled == false)
+        {
+          Ptr<Icmpv6L4Protocol> icmpv6l4 = node->GetObject<Icmpv6L4Protocol> ();
+          NS_ASSERT (icmpv6l4);
+          icmpv6l4->SetAttribute ("SolicitationJitter", StringValue ("ns3::ConstantRandomVariable[Constant=0.0]"));
+        }
       // Set routing
       Ptr<Ipv6> ipv6 = node->GetObject<Ipv6> ();
       Ptr<Ipv6RoutingProtocol> ipv6Routing = m_routingv6->Create (node);
diff -Naur ns-3.17/src/internet/helper/internet-stack-helper.h ns-3.18/src/internet/helper/internet-stack-helper.h
--- ns-3.17/src/internet/helper/internet-stack-helper.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/helper/internet-stack-helper.h	2013-10-26 07:07:29.899364390 -0700
@@ -178,7 +178,19 @@
    */
   void SetIpv6StackInstall (bool enable);
 
- /**
+  /**
+   * \brief Enable/disable IPv4 ARP Jitter.
+   * \param enable enable state
+   */
+  void SetIpv4ArpJitter (bool enable);
+
+  /**
+   * \brief Enable/disable IPv6 NS and RS Jitter.
+   * \param enable enable state
+   */
+  void SetIpv6NsRsJitter (bool enable);
+
+  /**
   * Assign a fixed random variable stream number to the random variables
   * used by this model.  Return the number of streams (possibly zero) that
   * have been assigned.  The Install() method should have previously been
@@ -303,6 +315,16 @@
    * \brief IPv6 install state (enabled/disabled) ?
    */
   bool m_ipv6Enabled;
+
+  /**
+   * \brief IPv4 ARP Jitter state (enabled/disabled) ?
+   */
+  bool m_ipv4ArpJitterEnabled;
+
+  /**
+   * \brief IPv6 IPv6 NS and RS Jitter state (enabled/disabled) ?
+   */
+  bool m_ipv6NsRsJitterEnabled;
 };
 
 } // namespace ns3
diff -Naur ns-3.17/src/internet/helper/ipv4-routing-helper.cc ns-3.18/src/internet/helper/ipv4-routing-helper.cc
--- ns-3.17/src/internet/helper/ipv4-routing-helper.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/helper/ipv4-routing-helper.cc	2013-10-26 07:07:29.899364390 -0700
@@ -17,10 +17,12 @@
  *
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
+
 #include "ns3/node.h"
 #include "ns3/node-list.h"
 #include "ns3/simulator.h"
 #include "ns3/ipv4-routing-protocol.h"
+#include "ns3/ipv4-list-routing.h"
 #include "ipv4-routing-helper.h"
 
 namespace ns3 {
diff -Naur ns-3.17/src/internet/helper/ipv4-routing-helper.h ns-3.18/src/internet/helper/ipv4-routing-helper.h
--- ns-3.17/src/internet/helper/ipv4-routing-helper.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/helper/ipv4-routing-helper.h	2013-10-26 07:07:29.903364389 -0700
@@ -17,12 +17,14 @@
  *
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
+
 #ifndef IPV4_ROUTING_HELPER_H
 #define IPV4_ROUTING_HELPER_H
 
 #include "ns3/ptr.h"
 #include "ns3/nstime.h"
 #include "ns3/output-stream-wrapper.h"
+#include "ns3/ipv4-list-routing.h"
 
 namespace ns3 {
 
@@ -107,11 +109,47 @@
    */
   void PrintRoutingTableEvery (Time printInterval, Ptr<Node> node, Ptr<OutputStreamWrapper> stream) const;
 
+  /**
+   * \brief Request a specified routing protocol <T> from Ipv4RoutingProtocol protocol
+   *
+   * If protocol is Ipv4ListRouting, then protocol will be searched in the list,
+   * otherwise a simple DynamicCast will be performed
+   *
+   * \param protocol Smart pointer to Ipv4RoutingProtocol object
+   * \return a Smart Pointer to the requested protocol (zero if the protocol can't be found)
+   */
+  template<class T>
+  static Ptr<T> GetRouting (Ptr<Ipv4RoutingProtocol> protocol);
+  
 private:
   void Print (Ptr<Node> node, Ptr<OutputStreamWrapper> stream) const;
   void PrintEvery (Time printInterval, Ptr<Node> node, Ptr<OutputStreamWrapper> stream) const;
 };
 
+
+template<class T>
+Ptr<T> Ipv4RoutingHelper::GetRouting (Ptr<Ipv4RoutingProtocol> protocol)
+{
+  Ptr<T> ret = DynamicCast<T> (protocol);
+  if (ret == 0)
+    {
+      // trying to check if protocol is a list routing
+      Ptr<Ipv4ListRouting> lrp = DynamicCast<Ipv4ListRouting> (protocol);
+      if (lrp != 0)
+        {
+          for (uint32_t i = 0; i < lrp->GetNRoutingProtocols ();  i++)
+            {
+              int16_t priority;
+              ret = GetRouting<T> (lrp->GetRoutingProtocol (i, priority)); // potential recursion, if inside ListRouting is ListRouting
+              if (ret != 0)
+                break;
+            }
+        }
+    }
+
+  return ret;
+}
+
 } // namespace ns3
 
 
diff -Naur ns-3.17/src/internet/helper/ipv6-address-helper.cc ns-3.18/src/internet/helper/ipv6-address-helper.cc
--- ns-3.17/src/internet/helper/ipv6-address-helper.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/helper/ipv6-address-helper.cc	2013-10-26 07:07:29.899364390 -0700
@@ -23,7 +23,9 @@
 #include "ns3/ptr.h"
 #include "ns3/node.h"
 #include "ns3/net-device.h"
+#include "ns3/mac16-address.h"
 #include "ns3/mac48-address.h"
+#include "ns3/mac64-address.h"
 #include "ns3/ipv6.h"
 #include "ns3/ipv6-address-generator.h"
 
@@ -51,8 +53,8 @@
                             Ipv6Address base)
 {
   NS_LOG_FUNCTION (this << network << prefix << base);
-  // XXX for now we do not enforce the prefix because the underlying
-  // Ipv6AddressGenerator does not handle prefixes well that are not 64 bits
+  /// \todo for now we do not enforce the prefix because the underlying
+  /// Ipv6AddressGenerator does not handle prefixes well that are not 64 bits
   Ipv6AddressGenerator::Init (network, Ipv6Prefix (64), base);
 }
 
@@ -60,16 +62,30 @@
 Ipv6Address Ipv6AddressHelper::NewAddress (Address addr)
 {
   NS_LOG_FUNCTION (this << addr);
-  if (Mac48Address::IsMatchingType (addr))
+  if (Mac64Address::IsMatchingType (addr))
+    {
+      Ipv6Address network = Ipv6AddressGenerator::GetNetwork (Ipv6Prefix (64));
+      Ipv6Address address = Ipv6Address::MakeAutoconfiguredAddress (Mac64Address::ConvertFrom (addr), network);
+      Ipv6AddressGenerator::AddAllocated (address);
+      return address;
+    }
+  else if (Mac48Address::IsMatchingType (addr))
     {
       Ipv6Address network = Ipv6AddressGenerator::GetNetwork (Ipv6Prefix (64));
       Ipv6Address address = Ipv6Address::MakeAutoconfiguredAddress (Mac48Address::ConvertFrom (addr), network);
       Ipv6AddressGenerator::AddAllocated (address);
       return address;
-    } 
+    }
+  else if (Mac16Address::IsMatchingType (addr))
+    {
+      Ipv6Address network = Ipv6AddressGenerator::GetNetwork (Ipv6Prefix (64));
+      Ipv6Address address = Ipv6Address::MakeAutoconfiguredAddress (Mac16Address::ConvertFrom (addr), network);
+      Ipv6AddressGenerator::AddAllocated (address);
+      return address;
+    }
   else
     {
-      NS_FATAL_ERROR ("Did not pass in a Mac48Address");
+      NS_FATAL_ERROR ("Did not pass in a valid Mac Address (16, 48 or 64 bits)");
     }
   /* never reached */
   return Ipv6Address ("::");
diff -Naur ns-3.17/src/internet/helper/ipv6-address-helper.h ns-3.18/src/internet/helper/ipv6-address-helper.h
--- ns-3.17/src/internet/helper/ipv6-address-helper.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/helper/ipv6-address-helper.h	2013-10-26 07:07:29.899364390 -0700
@@ -35,7 +35,7 @@
  * \class Ipv6AddressHelper
  * \brief Helper class to auto-assign global IPv6 unicast addresses
  *
- * Assign global unicast IPv6 addresses based on RFC 4291 definition.
+ * Assign global unicast IPv6 addresses based on \RFC{4291} definition.
  *
  *   |         n bits          | 64-n bits |       64 bits              |
  *   +-------------------------+-----------+----------------------------+
@@ -63,16 +63,16 @@
  * that causes the subnet ID to roll over will trigger an assertion.  
  * 
  * By default, the prefix is 32 bits and the network is '2001:db8::/32'
- * (RFC 5156 section 2.6 Documentation prefix).  The prefix may range
+ * (\RFC{5156} section 2.6 Documentation prefix).  The prefix may range
  * from length 0 to 64, with the value 64 having a special meaning that
  * no subnet ID boundary is enforced (equivalent to value 0).
  * 
- * There are two variants of interface ID supported (RFC 4291, Sec. 2.5.1)
+ * There are two variants of interface ID supported (\RFC{4291}, Sec. 2.5.1)
  * The default is a "local" scope, but a "universal" scoped ID may be
  * formed by calling "NewAddress (Address addr)" with a 48-bit MAC address.
  * If this method is called, the addressed returned will include a
  * modified EUI-64-format identifier created from the MAC address as 
- * specified in RFC 4291.
+ * specified in \RFC{4291}.
  */
 class Ipv6AddressHelper
 {
@@ -110,6 +110,7 @@
    *  
    * \param network The IPv6 network
    * \param prefix The prefix
+   * \deprecated
    */
   void NewNetwork (Ipv6Address network, Ipv6Prefix prefix) NS_DEPRECATED;
 
@@ -174,29 +175,6 @@
    */
   Ipv6InterfaceContainer AssignWithoutAddress (const NetDeviceContainer &c);
 
-private:
-  /**
-   * \internal
-   * \brief The IPv6 network.
-   */
-  uint8_t m_network[16];
-
-  /**
-   * \internal
-   * \brief The prefix (mask).
-   */
-  uint8_t m_prefix[16];
-
-  /**
-   * \internal
-   * \brief The base interface ID
-   */
-  uint64_t m_base;
-  /**
-   * \internal
-   * \brief The current interface ID
-   */
-  uint64_t m_iid;
 };
 
 } /* namespace ns3 */
diff -Naur ns-3.17/src/internet/helper/ipv6-interface-container.cc ns-3.18/src/internet/helper/ipv6-interface-container.cc
--- ns-3.17/src/internet/helper/ipv6-interface-container.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/helper/ipv6-interface-container.cc	2013-10-26 07:07:29.903364389 -0700
@@ -1,6 +1,7 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
  * Copyright (c) 2008-2009 Strasbourg University
+ *               2013 Universita' di Firenze
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -16,6 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * Author: Sebastien Vincent <vincent@clarinet.u-strasbg.fr>
+ *         Tommaso Pecorella <tommaso.pecorella@unifi.it>
  */
 
 #include "ns3/node-list.h"
@@ -24,20 +26,19 @@
 #include "ipv6-interface-container.h"
 #include "ns3/ipv6-static-routing-helper.h"
 
-namespace ns3 
-{
+namespace ns3 {
 
 Ipv6InterfaceContainer::Ipv6InterfaceContainer ()
 {
 }
 
-Ipv6InterfaceContainer::Iterator 
+Ipv6InterfaceContainer::Iterator
 Ipv6InterfaceContainer::Begin (void) const
 {
   return m_interfaces.begin ();
 }
 
-Ipv6InterfaceContainer::Iterator 
+Ipv6InterfaceContainer::Iterator
 Ipv6InterfaceContainer::End (void) const
 {
   return m_interfaces.end ();
@@ -81,6 +82,10 @@
 
 void Ipv6InterfaceContainer::SetRouter (uint32_t i, bool router)
 {
+  // This function is deprecated and should be substituted by:
+  // SetForwarding (RouterInterfaceIndex, true);
+  // SetDefaultRouteInAllNodes (RouterInterfaceIndex);
+
   Ptr<Ipv6> ipv6 = m_interfaces[i].first;
   ipv6->SetForwarding (m_interfaces[i].second, router);
 
@@ -88,7 +93,7 @@
     {
       uint32_t other;
       /* assume first global address is index 1 (0 is link-local) */
-      Ipv6Address routerAddress = ipv6->GetAddress (m_interfaces[i].second, 1).GetAddress ();
+      Ipv6Address routerAddress = ipv6->GetAddress (m_interfaces[i].second, 0).GetAddress ();
 
       for (other = 0; other < m_interfaces.size (); other++)
         {
@@ -105,11 +110,82 @@
     }
 }
 
+void Ipv6InterfaceContainer::SetForwarding (uint32_t i, bool router)
+{
+  Ptr<Ipv6> ipv6 = m_interfaces[i].first;
+  ipv6->SetForwarding (m_interfaces[i].second, router);
+}
+
+void Ipv6InterfaceContainer::SetDefaultRouteInAllNodes (uint32_t router)
+{
+  Ptr<Ipv6> ipv6 = m_interfaces[router].first;
+  uint32_t other;
+
+  Ipv6Address routerAddress = GetLinkLocalAddress (router);
+  NS_ASSERT_MSG (routerAddress != Ipv6Address::GetAny (), "No link-local address found on router, aborting");
+
+  for (other = 0; other < m_interfaces.size (); other++)
+    {
+      if (other != router)
+        {
+          Ptr<Ipv6StaticRouting> routing = 0;
+          Ipv6StaticRoutingHelper routingHelper;
+
+          ipv6 = m_interfaces[other].first;
+          routing = routingHelper.GetStaticRouting (ipv6);
+          routing->SetDefaultRoute (routerAddress, m_interfaces[other].second);
+        }
+    }
+}
+
+void Ipv6InterfaceContainer::SetDefaultRouteInAllNodes (Ipv6Address routerAddress)
+{
+  uint32_t routerIndex = 0;
+  bool found = false;
+  for (uint32_t index = 0; index < m_interfaces.size (); index++)
+    {
+      Ptr<Ipv6> ipv6 = m_interfaces[index].first;
+      for (uint32_t i = 0; i < ipv6->GetNAddresses (m_interfaces[index].second); i++)
+        {
+          Ipv6Address addr = ipv6->GetAddress (m_interfaces[index].second, i).GetAddress ();
+          if (addr == routerAddress)
+            {
+              routerIndex = index;
+              found = true;
+              break;
+            }
+        }
+      if (found)
+        {
+          break;
+        }
+    }
+  NS_ASSERT_MSG (found != true, "No such address in the interfaces. Aborting.");
+
+  for (uint32_t other = 0; other < m_interfaces.size (); other++)
+    {
+      if (other != routerIndex)
+        {
+          Ptr<Ipv6StaticRouting> routing = 0;
+          Ipv6StaticRoutingHelper routingHelper;
+
+          Ptr<Ipv6> ipv6 = m_interfaces[other].first;
+          routing = routingHelper.GetStaticRouting (ipv6);
+          routing->SetDefaultRoute (routerAddress, m_interfaces[other].second);
+        }
+    }
+}
+
+
 void Ipv6InterfaceContainer::SetDefaultRoute (uint32_t i, uint32_t router)
 {
+  NS_ASSERT_MSG (i != router, "A node shouldn't set itself as the default router, isn't it? Aborting.");
+
   Ptr<Ipv6> ipv6 = m_interfaces[i].first;
-  Ptr<Ipv6> ipv6Router = m_interfaces[router].first;
-  Ipv6Address routerAddress = ipv6Router->GetAddress (m_interfaces[router].second, 1).GetAddress ();
+
+  Ipv6Address routerAddress = GetLinkLocalAddress (router);
+  NS_ASSERT_MSG (routerAddress != Ipv6Address::GetAny (), "No link-local address found on router, aborting");
+
   Ptr<Ipv6StaticRouting> routing = 0;
   Ipv6StaticRoutingHelper routingHelper;
 
@@ -117,5 +193,100 @@
   routing->SetDefaultRoute (routerAddress, m_interfaces[i].second);
 }
 
+
+void Ipv6InterfaceContainer::SetDefaultRoute (uint32_t i, Ipv6Address routerAddr)
+{
+  uint32_t routerIndex = 0;
+  bool found = false;
+  for (uint32_t index = 0; index < m_interfaces.size (); index++)
+    {
+      Ptr<Ipv6> ipv6 = m_interfaces[index].first;
+      for (uint32_t i = 0; i < ipv6->GetNAddresses (m_interfaces[index].second); i++)
+        {
+          Ipv6Address addr = ipv6->GetAddress (m_interfaces[index].second, i).GetAddress ();
+          if (addr == routerAddr)
+            {
+              routerIndex = index;
+              found = true;
+              break;
+            }
+        }
+      if (found)
+        {
+          break;
+        }
+    }
+  NS_ASSERT_MSG (found != true, "No such address in the interfaces. Aborting.");
+
+  NS_ASSERT_MSG (i != routerIndex, "A node shouldn't set itself as the default router, isn't it? Aborting.");
+
+  Ptr<Ipv6> ipv6 = m_interfaces[i].first;
+  Ipv6Address routerLinkLocalAddress = GetLinkLocalAddress (routerIndex);
+  Ptr<Ipv6StaticRouting> routing = 0;
+  Ipv6StaticRoutingHelper routingHelper;
+
+  routing = routingHelper.GetStaticRouting (ipv6);
+  routing->SetDefaultRoute (routerLinkLocalAddress, m_interfaces[i].second);
+}
+
+
+Ipv6Address Ipv6InterfaceContainer::GetLinkLocalAddress (uint32_t index)
+{
+  Ptr<Ipv6> ipv6 = m_interfaces[index].first;
+  for (uint32_t i = 0; i < ipv6->GetNAddresses (m_interfaces[index].second); i++)
+    {
+      Ipv6InterfaceAddress iAddress;
+      iAddress = ipv6->GetAddress (m_interfaces[index].second, i);
+      if (iAddress.GetScope () == Ipv6InterfaceAddress::LINKLOCAL)
+        {
+          return iAddress.GetAddress ();
+        }
+    }
+  return Ipv6Address::GetAny ();
+}
+
+Ipv6Address Ipv6InterfaceContainer::GetLinkLocalAddress (Ipv6Address address)
+{
+  if (address.IsLinkLocal ())
+    {
+      return address;
+    }
+
+  uint32_t nodeIndex = 0;
+  bool found = false;
+  for (uint32_t index = 0; index < m_interfaces.size (); index++)
+    {
+      Ptr<Ipv6> ipv6 = m_interfaces[index].first;
+      for (uint32_t i = 0; i < ipv6->GetNAddresses (m_interfaces[index].second); i++)
+        {
+          Ipv6Address addr = ipv6->GetAddress (m_interfaces[index].second, i).GetAddress ();
+          if (addr == address)
+            {
+              nodeIndex = index;
+              found = true;
+              break;
+            }
+        }
+      if (found)
+        {
+          break;
+        }
+    }
+  NS_ASSERT_MSG (found != true, "No such address in the interfaces. Aborting.");
+
+  Ptr<Ipv6> ipv6 = m_interfaces[nodeIndex].first;
+  for (uint32_t i = 0; i < ipv6->GetNAddresses (m_interfaces[nodeIndex].second); i++)
+    {
+      Ipv6InterfaceAddress iAddress;
+      iAddress = ipv6->GetAddress (m_interfaces[nodeIndex].second, i);
+      if (iAddress.GetScope () == Ipv6InterfaceAddress::LINKLOCAL)
+        {
+          return iAddress.GetAddress ();
+        }
+    }
+  return Ipv6Address::GetAny ();
+}
+
+
 } /* namespace ns3 */
 
diff -Naur ns-3.17/src/internet/helper/ipv6-interface-container.h ns-3.18/src/internet/helper/ipv6-interface-container.h
--- ns-3.17/src/internet/helper/ipv6-interface-container.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/helper/ipv6-interface-container.h	2013-10-26 07:07:29.899364390 -0700
@@ -1,6 +1,7 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
  * Copyright (c) 2008-2009 Strasbourg University
+ *               2013 Universita' di Firenze
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -16,6 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * Author: Sebastien Vincent <vincent@clarinet.u-strasbg.fr>
+ *         Tommaso Pecorella <tommaso.pecorella@unifi.it>
  */
 
 #ifndef IPV6_INTERFACE_CONTAINER_H
@@ -27,6 +29,7 @@
 
 #include "ns3/ipv6.h"
 #include "ns3/ipv6-address.h"
+#include "ns3/deprecated.h"
 
 namespace ns3
 {
@@ -81,6 +84,20 @@
   Ipv6Address GetAddress (uint32_t i, uint32_t j) const;
 
   /**
+   * \brief Get the link-local address for the specified index.
+   * \param i index
+   * \return the link-local address, or "::" if the interface has no link local address.
+   */
+  Ipv6Address GetLinkLocalAddress (uint32_t i);
+
+  /**
+   * \brief Get the link-local address for the node with the specified global address.
+   * \param address the address to find.
+   * \return the link-local address, or "::" if the interface has no link local address.
+   */
+  Ipv6Address GetLinkLocalAddress (Ipv6Address address);
+
+  /**
    * \brief Add a couple IPv6/interface.
    * \param ipv6 IPv6 address
    * \param interface interface index
@@ -149,7 +166,28 @@
    * \param i index
    * \param router true : is a router, false : is an host
    */
-  void SetRouter (uint32_t i, bool router);
+  void SetRouter (uint32_t i, bool router) NS_DEPRECATED;
+
+  /**
+   * \brief Set the state of the stack (act as a router or as an host) for the specified index.
+   * This automatically sets all the node's interfaces to the same forwarding state.
+   * \param i index
+   * \param state true : is a router, false : is an host
+   */
+  void SetForwarding (uint32_t i, bool state);
+
+  /**
+   * \brief Set the default route for all the devices (except the router itself).
+   * \param router the default router index
+   */
+  void SetDefaultRouteInAllNodes (uint32_t router);
+
+  /**
+   * \brief Set the default route for all the devices (except the router itself).
+   * Note that the route will be set to the link-local address of the node with the specified address.
+   * \param routerAddr the default router address
+   */
+  void SetDefaultRouteInAllNodes (Ipv6Address routerAddr);
 
   /**
    * \brief Set the default route for the specified index.
@@ -158,6 +196,14 @@
    */
   void SetDefaultRoute (uint32_t i, uint32_t router);
 
+  /**
+   * \brief Set the default route for the specified index.
+   * Note that the route will be set to the link-local address of the node with the specified address.
+   * \param i index
+   * \param routerAddr the default router address
+   */
+  void SetDefaultRoute (uint32_t i, Ipv6Address routerAddr);
+
 private:
   typedef std::vector<std::pair<Ptr<Ipv6>, uint32_t> > InterfaceVector;
 
diff -Naur ns-3.17/src/internet/helper/ipv6-routing-helper.cc ns-3.18/src/internet/helper/ipv6-routing-helper.cc
--- ns-3.17/src/internet/helper/ipv6-routing-helper.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/helper/ipv6-routing-helper.cc	2013-10-26 07:07:29.899364390 -0700
@@ -22,6 +22,7 @@
 #include "ns3/node-list.h"
 #include "ns3/simulator.h"
 #include "ns3/ipv6-routing-protocol.h"
+#include "ns3/ipv6-list-routing.h"
 #include "ipv6-routing-helper.h"
 
 namespace ns3 {
diff -Naur ns-3.17/src/internet/helper/ipv6-routing-helper.h ns-3.18/src/internet/helper/ipv6-routing-helper.h
--- ns-3.17/src/internet/helper/ipv6-routing-helper.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/helper/ipv6-routing-helper.h	2013-10-26 07:07:29.903364389 -0700
@@ -24,6 +24,7 @@
 #include "ns3/ptr.h"
 #include "ns3/nstime.h"
 #include "ns3/output-stream-wrapper.h"
+#include "ns3/ipv6-list-routing.h"
 
 namespace ns3 {
 
@@ -110,11 +111,46 @@
    */
   void PrintRoutingTableEvery (Time printInterval, Ptr<Node> node, Ptr<OutputStreamWrapper> stream) const;
 
+  /**
+   * \brief Request a specified routing protocol <T> from Ipv6RoutingProtocol protocol
+   *
+   * If protocol is Ipv6ListRouting, then protocol will be searched in the list,
+   * otherwise a simple DynamicCast will be performed
+   *
+   * \param protocol Smart pointer to Ipv6RoutingProtocol object
+   * \return a Smart Pointer to the requested protocol (zero if the protocol can't be found)
+   */
+  template<class T>
+  static Ptr<T> GetRouting (Ptr<Ipv6RoutingProtocol> protocol);
+  
 private:
   void Print (Ptr<Node> node, Ptr<OutputStreamWrapper> stream) const;
   void PrintEvery (Time printInterval, Ptr<Node> node, Ptr<OutputStreamWrapper> stream) const;
 };
 
+template<class T>
+Ptr<T> Ipv6RoutingHelper::GetRouting (Ptr<Ipv6RoutingProtocol> protocol)
+{
+  Ptr<T> ret = DynamicCast<T> (protocol);
+  if (ret == 0)
+    {
+      // trying to check if protocol is a list routing
+      Ptr<Ipv6ListRouting> lrp = DynamicCast<Ipv6ListRouting> (protocol);
+      if (lrp != 0)
+        {
+          for (uint32_t i = 0; i < lrp->GetNRoutingProtocols ();  i++)
+            {
+              int16_t priority;
+              ret = GetRouting<T> (lrp->GetRoutingProtocol (i, priority)); // potential recursion, if inside ListRouting is ListRouting
+              if (ret != 0)
+                break;
+            }
+        }
+    }
+
+  return ret;
+}
+
 } // namespace ns3
 
 
diff -Naur ns-3.17/src/internet/model/arp-l3-protocol.cc ns-3.18/src/internet/model/arp-l3-protocol.cc
--- ns-3.17/src/internet/model/arp-l3-protocol.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/arp-l3-protocol.cc	2013-10-26 07:07:29.927364390 -0700
@@ -23,6 +23,8 @@
 #include "ns3/net-device.h"
 #include "ns3/object-vector.h"
 #include "ns3/trace-source-accessor.h"
+#include "ns3/pointer.h"
+#include "ns3/string.h"
 
 #include "ipv4-l3-protocol.h"
 #include "arp-l3-protocol.h"
@@ -49,6 +51,10 @@
                    ObjectVectorValue (),
                    MakeObjectVectorAccessor (&ArpL3Protocol::m_cacheList),
                    MakeObjectVectorChecker<ArpCache> ())
+    .AddAttribute ("RequestJitter", "The jitter in ms a node is allowed to wait before sending an ARP request. Some jitter aims to prevent collisions. By default, the model will wait for a duration in ms defined by a uniform random-variable between 0 and RequestJitter",
+                   StringValue ("ns3::UniformRandomVariable[Min=0.0|Max=10.0]"),
+                   MakePointerAccessor (&ArpL3Protocol::m_requestJitter),
+                   MakePointerChecker<RandomVariableStream> ())
     .AddTraceSource ("Drop",
                      "Packet dropped because not enough room in pending queue for a specific cache entry.",
                      MakeTraceSourceAccessor (&ArpL3Protocol::m_dropTrace))
@@ -66,6 +72,14 @@
   NS_LOG_FUNCTION (this);
 }
 
+int64_t
+ArpL3Protocol::AssignStreams (int64_t stream)
+{
+  NS_LOG_FUNCTION (this << stream);
+  m_requestJitter->SetStream (stream);
+  return 1;
+}
+
 void 
 ArpL3Protocol::SetNode (Ptr<Node> node)
 {
@@ -173,9 +187,9 @@
       NS_LOG_LOGIC (cache->GetInterface ()->GetAddress (i).GetLocal () << ", ");
     }
 
-  /**
+  /** \internal
    * Note: we do not update the ARP cache when we receive an ARP request
-   * from an unknown node. See bug #107
+   *  from an unknown node. See \bugid{107}
    */
   bool found = false;
   for (uint32_t i = 0; i < cache->GetInterface ()->GetNAddresses (); i++)
@@ -257,14 +271,14 @@
               NS_LOG_LOGIC ("node="<<m_node->GetId ()<<
                             ", dead entry for " << destination << " expired -- send arp request");
               entry->MarkWaitReply (packet);
-              SendArpRequest (cache, destination);
+              Simulator::Schedule (Time (MilliSeconds (m_requestJitter->GetValue ())), &ArpL3Protocol::SendArpRequest, this, cache, destination);
             } 
           else if (entry->IsAlive ()) 
             {
               NS_LOG_LOGIC ("node="<<m_node->GetId ()<<
                             ", alive entry for " << destination << " expired -- send arp request");
               entry->MarkWaitReply (packet);
-              SendArpRequest (cache, destination);
+              Simulator::Schedule (Time (MilliSeconds (m_requestJitter->GetValue ())), &ArpL3Protocol::SendArpRequest, this, cache, destination);
             } 
           else if (entry->IsWaitReply ()) 
             {
@@ -304,7 +318,7 @@
                     ", no entry for " << destination << " -- send arp request");
       entry = cache->Add (destination);
       entry->MarkWaitReply (packet);
-      SendArpRequest (cache, destination);
+      Simulator::Schedule (Time (MilliSeconds (m_requestJitter->GetValue ())), &ArpL3Protocol::SendArpRequest, this, cache, destination);
     }
   return false;
 }
diff -Naur ns-3.17/src/internet/model/arp-l3-protocol.h ns-3.18/src/internet/model/arp-l3-protocol.h
--- ns-3.17/src/internet/model/arp-l3-protocol.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/arp-l3-protocol.h	2013-10-26 07:07:29.935364391 -0700
@@ -26,6 +26,7 @@
 #include "ns3/address.h"
 #include "ns3/ptr.h"
 #include "ns3/traced-callback.h"
+#include "ns3/random-variable-stream.h"
 
 namespace ns3 {
 
@@ -76,6 +77,17 @@
                Ptr<NetDevice> device,
                Ptr<ArpCache> cache,
                Address *hardwareDestination);
+
+  /**
+   * Assign a fixed random variable stream number to the random variables
+   * used by this model.  Return the number of streams (possibly zero) that
+   * have been assigned.
+   *
+   * \param stream first stream index to use
+   * \return the number of stream indices assigned by this model
+   */
+  int64_t AssignStreams (int64_t stream);
+
 protected:
   virtual void DoDispose (void);
   /*
@@ -93,6 +105,8 @@
   CacheList m_cacheList;
   Ptr<Node> m_node;
   TracedCallback<Ptr<const Packet> > m_dropTrace;
+  Ptr<RandomVariableStream> m_requestJitter;
+
 };
 
 } // namespace ns3
diff -Naur ns-3.17/src/internet/model/global-route-manager.h ns-3.18/src/internet/model/global-route-manager.h
--- ns-3.17/src/internet/model/global-route-manager.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/global-route-manager.h	2013-10-26 07:07:29.903364389 -0700
@@ -35,7 +35,7 @@
  * Then, it can compute shortest paths on a per-node basis to all routers, 
  * and finally configure each of the node's forwarding tables.
  *
- * The design is guided by OSPFv2 RFC 2328 section 16.1.1 and quagga ospfd.
+ * The design is guided by OSPFv2 \RFC{2328} section 16.1.1 and quagga ospfd.
  */
 class GlobalRouteManager
 {
diff -Naur ns-3.17/src/internet/model/global-route-manager-impl.cc ns-3.18/src/internet/model/global-route-manager-impl.cc
--- ns-3.17/src/internet/model/global-route-manager-impl.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/global-route-manager-impl.cc	2013-10-26 07:07:29.923364390 -0700
@@ -772,6 +772,7 @@
 // shortest path calculation.
 //
           l = v->GetLSA ()->GetLinkRecord (i);
+          NS_ASSERT (l != 0);
           if (l->GetLinkType () == GlobalRoutingLinkRecord::StubNetwork)
             {
               NS_LOG_LOGIC ("Found a Stub record to " << l->GetLinkId ());
@@ -841,6 +842,7 @@
 //
       if (v->GetLSA ()->GetLSType () == GlobalRoutingLSA::RouterLSA)
         {
+          NS_ASSERT (l != 0);
           distance = v->GetDistanceFromRoot () + l->GetMetric ();
         }
       else
diff -Naur ns-3.17/src/internet/model/global-route-manager-impl.h ns-3.18/src/internet/model/global-route-manager-impl.h
--- ns-3.17/src/internet/model/global-route-manager-impl.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/global-route-manager-impl.h	2013-10-26 07:07:29.915364390 -0700
@@ -40,7 +40,7 @@
 class Ipv4GlobalRouting;
 
 /**
- * @brief Vertex used in shortest path first (SPF) computations. See RFC 2328,
+ * @brief Vertex used in shortest path first (SPF) computations. See \RFC{2328},
  * Section 16.
  *
  * Each router in the simulation is associated with an SPFVertex object.  When
@@ -695,7 +695,7 @@
  * Then, it can compute shortest paths on a per-node basis to all routers, 
  * and finally configure each of the node's forwarding tables.
  *
- * The design is guided by OSPFv2 RFC 2328 section 16.1.1 and quagga ospfd.
+ * The design is guided by OSPFv2 \RFC{2328} section 16.1.1 and quagga ospfd.
  */
 class GlobalRouteManagerImpl
 {
@@ -706,7 +706,7 @@
  * @brief Delete all static routes on all nodes that have a
  * GlobalRouterInterface
  *
- * TODO:  separate manually assigned static routes from static routes that
+ * \todo  separate manually assigned static routes from static routes that
  * the global routing code injects, and only delete the latter
  * @internal
  *
diff -Naur ns-3.17/src/internet/model/global-router-interface.h ns-3.18/src/internet/model/global-router-interface.h
--- ns-3.17/src/internet/model/global-router-interface.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/global-router-interface.h	2013-10-26 07:07:29.911364390 -0700
@@ -246,14 +246,14 @@
  * 
  * Roughly equivalent to a global incarnation of the OSPF link state header
  * combined with a list of Link Records.  Since it's global, there's
- * no need for age or sequence number.  See RFC 2328, Appendix A.
+ * no need for age or sequence number.  See \RFC{2328}, Appendix A.
  */
 class GlobalRoutingLSA
 {
 public:
 /**
  * @enum LSType
- * @brief corresponds to LS type field of RFC 2328 OSPF LSA header
+ * @brief corresponds to LS type field of \RFC{2328} OSPF LSA header
  */
   enum LSType {
     Unknown = 0,        /**< Uninitialized Type */
diff -Naur ns-3.17/src/internet/model/global-routing.h ns-3.18/src/internet/model/global-routing.h
--- ns-3.17/src/internet/model/global-routing.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/global-routing.h	2013-10-26 07:07:29.927364390 -0700
@@ -73,7 +73,7 @@
  * concerning the links to which it is attached.
  *
  * The format of the data exported conforms to the OSPFv2 standard
- * (http://www.ietf.org/rfc/rfc2328.txt).  In particular, the
+ * \RFC{2328}.  In particular, the
  * information is exported in the form of ns3::GlobalLSA objects that
  * semantically match the Link State Advertisements of OSPF.
  *
diff -Naur ns-3.17/src/internet/model/icmpv6-header.cc ns-3.18/src/internet/model/icmpv6-header.cc
--- ns-3.17/src/internet/model/icmpv6-header.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/icmpv6-header.cc	2013-10-26 07:07:29.931364390 -0700
@@ -1470,7 +1470,7 @@
 Icmpv6OptionHeader::Icmpv6OptionHeader ()
 {
   NS_LOG_FUNCTION (this);
-  /* TODO */
+  /** \todo */
   m_type = 0;
   m_len = 0;
 }
@@ -1895,6 +1895,7 @@
 
   SetType (i.ReadU8 ());
   SetLength (i.ReadU8 ());
+  NS_ASSERT (GetLength () * 8 - 2 <= 32);
   i.Read (mac, (GetLength () * 8) - 2);
 
   m_addr.CopyFrom (mac, (GetLength () * 8)-2);
diff -Naur ns-3.17/src/internet/model/icmpv6-l4-protocol.cc ns-3.18/src/internet/model/icmpv6-l4-protocol.cc
--- ns-3.17/src/internet/model/icmpv6-l4-protocol.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/icmpv6-l4-protocol.cc	2013-10-26 07:07:29.927364390 -0700
@@ -28,6 +28,8 @@
 #include "ns3/boolean.h"
 #include "ns3/ipv6-routing-protocol.h"
 #include "ns3/ipv6-route.h"
+#include "ns3/pointer.h"
+#include "ns3/string.h"
 
 #include "ipv6-raw-socket-factory-impl.h"
 #include "ipv6-l3-protocol.h"
@@ -72,6 +74,11 @@
                    BooleanValue (true),
                    MakeBooleanAccessor (&Icmpv6L4Protocol::m_alwaysDad),
                    MakeBooleanChecker ())
+    .AddAttribute ("SolicitationJitter", "The jitter in ms a node is allowed to wait before sending any solicitation . Some jitter aims to prevent collisions. By default, the model will wait for a duration in ms defined by a uniform random-variable between 0 and SolicitationJitter",
+                   StringValue ("ns3::UniformRandomVariable[Min=0.0|Max=10.0]"),
+                   MakePointerAccessor (&Icmpv6L4Protocol::m_solicitationJitter),
+                   MakePointerChecker<RandomVariableStream> ())
+
   ;
   return tid;
 }
@@ -103,6 +110,13 @@
   IpL4Protocol::DoDispose ();
 }
 
+int64_t Icmpv6L4Protocol::AssignStreams (int64_t stream)
+{
+  NS_LOG_FUNCTION (this << stream);
+  m_solicitationJitter->SetStream (stream);
+  return 1;
+}
+
 void Icmpv6L4Protocol::NotifyNewAggregate ()
 {
   NS_LOG_FUNCTION (this);
@@ -168,13 +182,13 @@
       return;
     }
 
-  /* TODO : disable multicast loopback to prevent NS probing to be received by the sender */
+  /** \todo disable multicast loopback to prevent NS probing to be received by the sender */
 
   Ptr<Packet> p = ForgeNS ("::",Ipv6Address::MakeSolicitedAddress (target), target, interface->GetDevice ()->GetAddress ());
 
   /* update last packet UID */
   interface->SetNsDadUid (target, p->GetUid ());
-  interface->Send (p, Ipv6Address::MakeSolicitedAddress (target));
+  Simulator::Schedule (Time (MilliSeconds (m_solicitationJitter->GetValue ())), &Ipv6Interface::Send, interface, p, Ipv6Address::MakeSolicitedAddress (target));
 }
 
 enum IpL4Protocol::RxStatus Icmpv6L4Protocol::Receive (Ptr<Packet> packet, Ipv4Header const &header,  Ptr<Ipv4Interface> interface)
@@ -222,7 +236,7 @@
     case Icmpv6Header::ICMPV6_ECHO_REPLY:
       // EchoReply does not contain any info about L4
       // so we can not forward it up.
-      // TODO: implement request / reply consistency check.
+      /// \todo implement request / reply consistency check.
       break;
     case Icmpv6Header::ICMPV6_ERROR_DESTINATION_UNREACHABLE:
       HandleDestinationUnreachable (p, header.GetSourceAddress (), header.GetDestinationAddress (), interface);
@@ -252,7 +266,7 @@
 
   Ptr<Ipv6L3Protocol> ipv6 = m_node->GetObject<Ipv6L3Protocol> ();
 
-  // TODO assuming the ICMP is carrying a extensionless IP packet
+  /// \todo assuming the ICMP is carrying a extensionless IP packet
 
   uint8_t nextHeader = ipHeader.GetNextHeader ();
 
@@ -292,9 +306,15 @@
   bool next = true;
   bool hasLla = false;
   bool hasMtu = false;
+  Ipv6Address defaultRouter = Ipv6Address::GetZero ();
 
   p->RemoveHeader (raHeader);
 
+  if (raHeader.GetLifeTime())
+    {
+      defaultRouter = src;
+    }
+
   while (next == true)
     {
       uint8_t type = 0;
@@ -305,7 +325,7 @@
         case Icmpv6Header::ICMPV6_OPT_PREFIX:
           p->RemoveHeader (prefixHdr);
           ipv6->AddAutoconfiguredAddress (ipv6->GetInterfaceForDevice (interface->GetDevice ()), prefixHdr.GetPrefix (), prefixHdr.GetPrefixLength (),
-                                          prefixHdr.GetFlags (), prefixHdr.GetValidTime (), prefixHdr.GetPreferredTime (), src);
+                                          prefixHdr.GetFlags (), prefixHdr.GetValidTime (), prefixHdr.GetPreferredTime (), defaultRouter);
           break;
         case Icmpv6Header::ICMPV6_OPT_MTU:
           /* take in account the first MTU option */
@@ -313,7 +333,7 @@
             {
               p->RemoveHeader (mtuHdr);
               hasMtu = true;
-              /* XXX case of multiple prefix on single interface */
+              /** \todo case of multiple prefix on single interface */
               /* interface->GetDevice ()->SetMtu (m.GetMtu ()); */
             }
           break;
@@ -589,14 +609,16 @@
 
   if (!entry)
     {
-      /* ouch!! we are victim of a DAD */
+      /* ouch!! we might be victim of a DAD */
+      
       Ipv6InterfaceAddress ifaddr;
       bool found = false;
       uint32_t i = 0;
-      uint32_t nb = 0;
+      uint32_t nb = interface->GetNAddresses ();
 
       for (i = 0; i < nb; i++)
         {
+          ifaddr = interface->GetAddress (i);
           if (ifaddr.GetAddress () == target)
             {
               found = true;
@@ -611,6 +633,7 @@
               interface->SetState (ifaddr.GetAddress (), Ipv6InterfaceAddress::INVALID);
             }
         }
+
       /* we have not initiated any communication with the target so... discard the NA */
       return;
     }
@@ -826,6 +849,10 @@
   origPkt->RemoveHeader (ipHeader);
   uint8_t payload[8];
   origPkt->CopyData (payload, 8);
+
+  Ptr<Ipv6L3Protocol> ipv6 = m_node->GetObject<Ipv6L3Protocol> ();
+  ipv6->SetPmtu(ipHeader.GetDestinationAddress(), tooBig.GetMtu ());
+
   Forward (src, tooBig, tooBig.GetMtu (), ipHeader, payload);
 }
 
@@ -857,6 +884,12 @@
   m_downTarget (packet, src, dst, PROT_NUMBER, 0);
 }
 
+void Icmpv6L4Protocol::DelayedSendMessage (Ptr<Packet> packet, Ipv6Address src, Ipv6Address dst, uint8_t ttl)
+{
+  NS_LOG_FUNCTION (this << packet << src << dst << (uint32_t)ttl);
+  SendMessage (packet, src, dst, ttl);
+}
+
 void Icmpv6L4Protocol::SendMessage (Ptr<Packet> packet, Ipv6Address dst, Icmpv6Header& icmpv6Hdr, uint8_t ttl)
 {
   NS_LOG_FUNCTION (this << packet << dst << icmpv6Hdr << (uint32_t)ttl);
@@ -951,7 +984,15 @@
   p->AddHeader (llOption);
   ns.CalculatePseudoHeaderChecksum (src, dst, p->GetSize () + ns.GetSerializedSize (), PROT_NUMBER);
   p->AddHeader (ns);
-  SendMessage (p, src, dst, 255);
+  if (!dst.IsMulticast ())
+    {
+      SendMessage (p, src, dst, 255);
+    }
+  else
+    {
+      NS_LOG_LOGIC ("Destination is Multicast, using DelayedSendMessage");
+      Simulator::Schedule (Time (MilliSeconds (m_solicitationJitter->GetValue ())), &Icmpv6L4Protocol::DelayedSendMessage, this, p, src, dst, 255);
+    }
 }
 
 void Icmpv6L4Protocol::SendRS (Ipv6Address src, Ipv6Address dst,  Address hardwareAddress)
@@ -971,7 +1012,15 @@
 
   rs.CalculatePseudoHeaderChecksum (src, dst, p->GetSize () + rs.GetSerializedSize (), PROT_NUMBER);
   p->AddHeader (rs);
-  SendMessage (p, src, dst, 255);
+  if (!dst.IsMulticast ())
+    {
+      SendMessage (p, src, dst, 255);
+    }
+  else
+    {
+      NS_LOG_LOGIC ("Destination is Multicast, using DelayedSendMessage");
+      Simulator::Schedule (Time (MilliSeconds (m_solicitationJitter->GetValue ())), &Icmpv6L4Protocol::DelayedSendMessage, this, p, src, dst, 255);
+    }
 }
 
 void Icmpv6L4Protocol::SendErrorDestinationUnreachable (Ptr<Packet> malformedPacket, Ipv6Address dst, uint8_t code)
@@ -1072,7 +1121,7 @@
   SendMessage (p, dst, header, 255);
 }
 
-void Icmpv6L4Protocol::SendRedirection (Ptr<Packet> redirectedPacket, Ipv6Address dst, Ipv6Address redirTarget, Ipv6Address redirDestination, Address redirHardwareTarget)
+void Icmpv6L4Protocol::SendRedirection (Ptr<Packet> redirectedPacket, Ipv6Address src, Ipv6Address dst, Ipv6Address redirTarget, Ipv6Address redirDestination, Address redirHardwareTarget)
 {
   NS_LOG_FUNCTION (this << redirectedPacket << dst << redirTarget << redirDestination << redirHardwareTarget);
   uint32_t llaSize = 0;
@@ -1117,7 +1166,10 @@
   Icmpv6Redirection redirectionHeader;
   redirectionHeader.SetTarget (redirTarget);
   redirectionHeader.SetDestination (redirDestination);
-  SendMessage (p, dst, redirectionHeader, 64);
+  redirectionHeader.CalculatePseudoHeaderChecksum (src, dst, p->GetSize () + redirectionHeader.GetSerializedSize (), PROT_NUMBER);
+  p->AddHeader (redirectionHeader);
+
+  SendMessage (p, src, dst, 64);
 }
 
 Ptr<Packet> Icmpv6L4Protocol::ForgeNA (Ipv6Address src, Ipv6Address dst, Address* hardwareAddress, uint8_t flags)
@@ -1231,8 +1283,26 @@
       /* try to find the cache */
       cache = FindCache (device);
     }
-
-  return cache->Lookup (dst);
+  if (cache)
+    {
+      NdiscCache::Entry* entry = cache->Lookup (dst);
+      if (entry)
+        {
+          if (entry->IsReachable () || entry->IsDelay ())
+            {
+              *hardwareDestination = entry->GetMacAddress ();
+              return true;
+            }
+          else if (entry->IsStale ())
+            {
+              entry->StartDelayTimer ();
+              entry->MarkDelay ();
+              *hardwareDestination = entry->GetMacAddress ();
+              return true;
+            }
+        }
+    }
+  return false;
 }
 
 bool Icmpv6L4Protocol::Lookup (Ptr<Packet> p, Ipv6Address dst, Ptr<NetDevice> device, Ptr<NdiscCache> cache, Address* hardwareDestination)
@@ -1244,6 +1314,10 @@
       /* try to find the cache */
       cache = FindCache (device);
     }
+  if (!cache)
+    {
+      return false;
+    }
 
   NdiscCache::Entry* entry = cache->Lookup (dst);
   if (entry)
@@ -1341,8 +1415,8 @@
 
       if (!ipv6->IsForwarding (ipv6->GetInterfaceForDevice (interface->GetDevice ())) && addr.IsLinkLocal ())
         {
-          /* XXX because all nodes start at the same time, there will be many of RS arround 1 second of simulation time
-           * TODO Add random delays before sending RS
+          /* \todo Add random delays before sending RS
+           * because all nodes start at the same time, there will be many of RS arround 1 second of simulation time
            */
           Simulator::Schedule (Seconds (0.0), &Icmpv6L4Protocol::SendRS, PeekPointer (icmpv6), ifaddr.GetAddress (), Ipv6Address::GetAllRoutersMulticast (), interface->GetDevice ()->GetAddress ());
         }
diff -Naur ns-3.17/src/internet/model/icmpv6-l4-protocol.h ns-3.18/src/internet/model/icmpv6-l4-protocol.h
--- ns-3.17/src/internet/model/icmpv6-l4-protocol.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/icmpv6-l4-protocol.h	2013-10-26 07:07:29.935364391 -0700
@@ -26,6 +26,8 @@
 #include <list>
 
 #include "ns3/ipv6-address.h"
+#include "ns3/random-variable-stream.h"
+
 #include "icmpv6-header.h"
 #include "ip-l4-protocol.h"
 
@@ -190,6 +192,15 @@
   void SendMessage (Ptr<Packet> packet, Ipv6Address src, Ipv6Address dst, uint8_t ttl);
 
   /**
+   * \brief Helper function used during delayed solicitation. Calls SendMessage internally
+   * \param packet the packet to send which contains ICMPv6 header
+   * \param src source address
+   * \param dst destination address
+   * \param ttl next hop limit
+   */
+  void DelayedSendMessage (Ptr<Packet> packet, Ipv6Address src, Ipv6Address dst, uint8_t ttl);
+
+  /**
    * \brief Send a packet via ICMPv6.
    * \param packet the packet to send
    * \param dst destination address
@@ -274,12 +285,13 @@
   /**
    * \brief Send an ICMPv6 Redirection.
    * \param redirectedPacket the redirected packet
-   * \param dst destination IPv6 address
+   * \param src IPv6 address to send the redirect from
+   * \param dst IPv6 address to send the redirect to
    * \param redirTarget IPv6 target address for Icmpv6Redirection
    * \param redirDestination IPv6 destination address for Icmpv6Redirection
    * \param redirHardwareTarget L2 target address for Icmpv6OptionRdirected
    */
-  void SendRedirection (Ptr<Packet> redirectedPacket, Ipv6Address dst, Ipv6Address redirTarget, Ipv6Address redirDestination, Address redirHardwareTarget);
+  void SendRedirection (Ptr<Packet> redirectedPacket, Ipv6Address src, Ipv6Address dst, Ipv6Address redirTarget, Ipv6Address redirDestination, Address redirHardwareTarget);
 
   /**
    * \brief Forge a Neighbor Solicitation.
@@ -395,6 +407,16 @@
    */
   bool IsAlwaysDad () const;
 
+  /**
+   * Assign a fixed random variable stream number to the random variables
+   * used by this model.  Return the number of streams (possibly zero) that
+   * have been assigned.
+   *
+   * \param stream first stream index to use
+   * \return the number of stream indices assigned by this model
+   */
+  int64_t AssignStreams (int64_t stream);
+
 protected:
   /**
    * \brief Dispose this object.
@@ -420,6 +442,11 @@
   bool m_alwaysDad;
 
   /**
+   * \brief Random jitter before sending solicitations
+   */
+  Ptr<RandomVariableStream> m_solicitationJitter;
+
+  /**
    * \brief Notify an ICMPv6 reception to upper layers (if requested).
    * \param source the ICMP source
    * \param icmp the ICMP header
diff -Naur ns-3.17/src/internet/model/ipv4-global-routing.cc ns-3.18/src/internet/model/ipv4-global-routing.cc
--- ns-3.17/src/internet/model/ipv4-global-routing.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/ipv4-global-routing.cc	2013-10-26 07:07:29.931364390 -0700
@@ -230,7 +230,7 @@
       // create a Ipv4Route object from the selected routing table entry
       rtentry = Create<Ipv4Route> ();
       rtentry->SetDestination (route->GetDest ());
-      // XXX handle multi-address case
+      /// \todo handle multi-address case
       rtentry->SetSource (m_ipv4->GetAddress (route->GetInterface (), 0).GetLocal ());
       rtentry->SetGateway (route->GetGateway ());
       uint32_t interfaceIdx = route->GetInterface ();
@@ -489,11 +489,11 @@
   if (header.GetDestination ().IsBroadcast ())
     {
       NS_LOG_LOGIC ("For me (Ipv4Addr broadcast address)");
-      // TODO:  Local Deliver for broadcast
-      // TODO:  Forward broadcast
+      /// \todo  Local Deliver for broadcast
+      /// \todo  Forward broadcast
     }
 
-  // TODO:  Configurable option to enable RFC 1222 Strong End System Model
+  /// \todo  Configurable option to enable \RFC{1222} Strong End System Model
   // Right now, we will be permissive and allow a source to send us
   // a packet to one of our other interface addresses; that is, the
   // destination unicast address does not match one of the iif addresses,
diff -Naur ns-3.17/src/internet/model/ipv4.h ns-3.18/src/internet/model/ipv4.h
--- ns-3.17/src/internet/model/ipv4.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/ipv4.h	2013-10-26 07:07:29.907364389 -0700
@@ -248,6 +248,15 @@
    */
   virtual bool RemoveAddress (uint32_t interface, uint32_t addressIndex) = 0;
 
+   /**
+   * \brief Remove the given address on named Ipv4 interface
+   *
+   * \param interface Interface number of an Ipv4 interface
+   * \param address The address to remove
+   * \returns true if the operation succeeded
+   */
+  virtual bool RemoveAddress (uint32_t interface, Ipv4Address address) = 0;
+
   /**
    * \brief Return the first primary source address with scope less than 
    * or equal to the requested scope, to use in sending a packet to 
diff -Naur ns-3.17/src/internet/model/ipv4-header.cc ns-3.18/src/internet/model/ipv4-header.cc
--- ns-3.17/src/internet/model/ipv4-header.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/ipv4-header.cc	2013-10-26 07:07:29.907364389 -0700
@@ -117,45 +117,45 @@
     {
       case DscpDefault:
         return "Default";
-      case CS1:
+      case DSCP_CS1:
         return "CS1";
-      case AF11:
+      case DSCP_AF11:
         return "AF11";
-      case AF12:
+      case DSCP_AF12:
         return "AF12";
-      case AF13:
+      case DSCP_AF13:
         return "AF13";
-      case CS2:
+      case DSCP_CS2:
         return "CS2";
-      case AF21:
+      case DSCP_AF21:
         return "AF21";
-      case AF22:
+      case DSCP_AF22:
         return "AF22";
-      case AF23:
+      case DSCP_AF23:
         return "AF23";
-      case CS3:
+      case DSCP_CS3:
         return "CS3";
-      case AF31:
+      case DSCP_AF31:
         return "AF31";
-      case AF32:
+      case DSCP_AF32:
         return "AF32";
-      case AF33:
+      case DSCP_AF33:
         return "AF33";
-      case CS4:
+      case DSCP_CS4:
         return "CS4";
-      case AF41:
+      case DSCP_AF41:
         return "AF41";
-      case AF42:
+      case DSCP_AF42:
         return "AF42";
-      case AF43:
+      case DSCP_AF43:
         return "AF43";
-      case CS5:
+      case DSCP_CS5:
         return "CS5";
-      case EF:
+      case DSCP_EF:
         return "EF";
-      case CS6:
+      case DSCP_CS6:
         return "CS6";
-      case CS7:
+      case DSCP_CS7:
         return "CS7";
       default:
         return "Unrecognized DSCP";
@@ -177,13 +177,13 @@
   NS_LOG_FUNCTION (this << ecn);
   switch (ecn)
     {
-      case NotECT:
+      case ECN_NotECT:
         return "Not-ECT";
-      case ECT1:
+      case ECN_ECT1:
         return "ECT (1)";
-      case ECT0:
+      case ECN_ECT0:
         return "ECT (0)";
-      case CE:
+      case ECN_CE:
         return "CE";      
       default:
         return "Unknown ECN";
diff -Naur ns-3.17/src/internet/model/ipv4-header.h ns-3.18/src/internet/model/ipv4-header.h
--- ns-3.17/src/internet/model/ipv4-header.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/ipv4-header.h	2013-10-26 07:07:29.911364390 -0700
@@ -57,39 +57,40 @@
    * \enum DscpType
    * \brief DiffServ Code Points 
    * Code Points defined in
-   * Assured Forwarding (AF) RFC 2597
-   * Expedited Forwarding (EF) RFC 2598
-   * Default and Class Selector (CS) RFC 2474
+   * Assured Forwarding (AF) \RFC{2597}
+   * Expedited Forwarding (EF) \RFC{2598}
+   * Default and Class Selector (CS) \RFC{2474}
    */
   enum DscpType
     {
       DscpDefault = 0x00,
 
-      CS1 = 0x20,
-      AF11 = 0x28,
-      AF12 = 0x30,
-      AF13 = 0x38,
-
-      CS2 = 0x40,
-      AF21 = 0x48,
-      AF22 = 0x50,
-      AF23 = 0x58,
-
-      CS3 = 0x60,
-      AF31 = 0x68,
-      AF32 = 0x70,
-      AF33 = 0x78,
-
-      CS4 = 0x80,
-      AF41 = 0x88,
-      AF42 = 0x90,
-      AF43 = 0x98,
+      // Prefixed with "DSCP" to avoid name clash (bug 1723)
+      DSCP_CS1 = 0x20,
+      DSCP_AF11 = 0x28,
+      DSCP_AF12 = 0x30,
+      DSCP_AF13 = 0x38,
+
+      DSCP_CS2 = 0x40,
+      DSCP_AF21 = 0x48,
+      DSCP_AF22 = 0x50,
+      DSCP_AF23 = 0x58,
+
+      DSCP_CS3 = 0x60,
+      DSCP_AF31 = 0x68,
+      DSCP_AF32 = 0x70,
+      DSCP_AF33 = 0x78,
+
+      DSCP_CS4 = 0x80,
+      DSCP_AF41 = 0x88,
+      DSCP_AF42 = 0x90,
+      DSCP_AF43 = 0x98,
 
-      CS5 = 0xA0,
-      EF = 0xB8,
+      DSCP_CS5 = 0xA0,
+      DSCP_EF = 0xB8,
       
-      CS6 = 0xC0,
-      CS7 = 0xE0
+      DSCP_CS6 = 0xC0,
+      DSCP_CS7 = 0xE0
       
     };
   /**
@@ -100,14 +101,15 @@
 
   /**
    * \enum EcnType
-   * \brief ECN Type defined in RFC 3168
+   * \brief ECN Type defined in \RFC{3168}
    */
   enum EcnType
     {
-      NotECT = 0x00,
-      ECT1 = 0x01,
-      ECT0 = 0x02,
-      CE = 0x03
+      // Prefixed with "ECN" to avoid name clash (bug 1723)
+      ECN_NotECT = 0x00,
+      ECN_ECT1 = 0x01,
+      ECN_ECT0 = 0x02,
+      ECN_CE = 0x03
     }; 
   /**
    * \brief Set ECN Field
diff -Naur ns-3.17/src/internet/model/ipv4-interface.cc ns-3.18/src/internet/model/ipv4-interface.cc
--- ns-3.17/src/internet/model/ipv4-interface.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/ipv4-interface.cc	2013-10-26 07:07:29.919364390 -0700
@@ -207,8 +207,8 @@
   // Check for a loopback device
   if (DynamicCast<LoopbackNetDevice> (m_device))
     {
-      // XXX additional checks needed here (such as whether multicast
-      // goes to loopback)?
+      /// \todo additional checks needed here (such as whether multicast
+      /// goes to loopback)?
       m_device->Send (p, m_device->GetBroadcast (), 
                       Ipv4L3Protocol::PROT_NUMBER);
       return;
@@ -346,5 +346,28 @@
   return (addr);  // quiet compiler
 }
 
+Ipv4InterfaceAddress
+Ipv4Interface::RemoveAddress(Ipv4Address address)
+{
+  NS_LOG_FUNCTION(this << address);
+
+  if (address == address.GetLoopback())
+    {
+      NS_LOG_WARN ("Cannot remove loopback address.");
+      return Ipv4InterfaceAddress();
+    }
+
+  for(Ipv4InterfaceAddressListI it = m_ifaddrs.begin(); it != m_ifaddrs.end(); it++)
+    {
+      if((*it).GetLocal() == address)
+        {
+          Ipv4InterfaceAddress ifAddr = *it;
+          m_ifaddrs.erase(it);
+          return ifAddr;
+        }
+    }
+  return Ipv4InterfaceAddress();
+}
+
 } // namespace ns3
 
diff -Naur ns-3.17/src/internet/model/ipv4-interface.h ns-3.18/src/internet/model/ipv4-interface.h
--- ns-3.17/src/internet/model/ipv4-interface.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/ipv4-interface.h	2013-10-26 07:07:29.923364390 -0700
@@ -152,6 +152,15 @@
    */
   Ipv4InterfaceAddress RemoveAddress (uint32_t index);
 
+  /**
+   * \brief Remove the given Ipv4 address from the interface.
+   * \param address The Ipv4 address to remove
+   * \returns The removed Ipv4 interface address 
+   * \returns The null interface address if the interface did not contain the 
+   * address or if loopback address was passed as argument
+   */
+  Ipv4InterfaceAddress RemoveAddress (Ipv4Address address);
+
 protected:
   virtual void DoDispose (void);
 private:
diff -Naur ns-3.17/src/internet/model/ipv4-l3-protocol.cc ns-3.18/src/internet/model/ipv4-l3-protocol.cc
--- ns-3.17/src/internet/model/ipv4-l3-protocol.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/ipv4-l3-protocol.cc	2013-10-26 07:07:29.915364390 -0700
@@ -687,9 +687,9 @@
     }
 }
 
-// XXX when should we set ip_id?   check whether we are incrementing
-// m_identification on packets that may later be dropped in this stack
-// and whether that deviates from Linux
+/// \todo when should we set ip_id?   check whether we are incrementing
+/// m_identification on packets that may later be dropped in this stack
+/// and whether that deviates from Linux
 Ipv4Header
 Ipv4L3Protocol::BuildHeader (
   Ipv4Address source,
@@ -979,6 +979,29 @@
   return false;
 }
 
+bool
+Ipv4L3Protocol::RemoveAddress (uint32_t i, Ipv4Address address)
+{
+  NS_LOG_FUNCTION (this << i << address);
+
+  if (address == Ipv4Address::GetLoopback())
+    {
+      NS_LOG_WARN ("Cannot remove loopback address.");
+      return false;
+    }
+  Ptr<Ipv4Interface> interface = GetInterface (i);
+  Ipv4InterfaceAddress ifAddr = interface->RemoveAddress (address);
+  if (ifAddr != Ipv4InterfaceAddress ())
+    {
+      if (m_routingProtocol != 0)
+        {
+          m_routingProtocol->NotifyRemoveAddress (i, ifAddr);
+        }
+      return true;
+    }
+  return false;
+}
+
 Ipv4Address 
 Ipv4L3Protocol::SelectSourceAddress (Ptr<const NetDevice> device,
                                      Ipv4Address dst, Ipv4InterfaceAddress::InterfaceAddressScope_e scope)
@@ -1329,7 +1352,7 @@
       m_moreFragment = moreFragment;
     }
 
-  m_fragments.insert (it, std::make_pair<Ptr<Packet>, uint16_t> (fragment, fragmentOffset));
+  m_fragments.insert (it, std::pair<Ptr<Packet>, uint16_t> (fragment, fragmentOffset));
 }
 
 bool
diff -Naur ns-3.17/src/internet/model/ipv4-l3-protocol.h ns-3.18/src/internet/model/ipv4-l3-protocol.h
--- ns-3.17/src/internet/model/ipv4-l3-protocol.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/ipv4-l3-protocol.h	2013-10-26 07:07:29.911364390 -0700
@@ -194,6 +194,7 @@
   Ipv4InterfaceAddress GetAddress (uint32_t interfaceIndex, uint32_t addressIndex) const;
   uint32_t GetNAddresses (uint32_t interface) const;
   bool RemoveAddress (uint32_t interfaceIndex, uint32_t addressIndex);
+  bool RemoveAddress (uint32_t interface, Ipv4Address address);
   Ipv4Address SelectSourceAddress (Ptr<const NetDevice> device,
                                    Ipv4Address dst, Ipv4InterfaceAddress::InterfaceAddressScope_e scope);
 
diff -Naur ns-3.17/src/internet/model/ipv4-packet-probe.cc ns-3.18/src/internet/model/ipv4-packet-probe.cc
--- ns-3.17/src/internet/model/ipv4-packet-probe.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/internet/model/ipv4-packet-probe.cc	2013-10-26 07:07:29.931364390 -0700
@@ -0,0 +1,124 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2011 Bucknell University
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Authors: L. Felipe Perrone (perrone@bucknell.edu)
+ *          Tiago G. Rodrigues (tgr002@bucknell.edu)
+ *
+ * Modified by: Mitch Watrous (watrous@u.washington.edu)
+ */
+
+#include "ns3/ipv4-packet-probe.h"
+#include "ns3/object.h"
+#include "ns3/log.h"
+#include "ns3/names.h"
+#include "ns3/config.h"
+#include "ns3/trace-source-accessor.h"
+
+NS_LOG_COMPONENT_DEFINE ("Ipv4PacketProbe");
+
+namespace ns3 {
+
+NS_OBJECT_ENSURE_REGISTERED (Ipv4PacketProbe);
+
+TypeId
+Ipv4PacketProbe::GetTypeId ()
+{
+  static TypeId tid = TypeId ("ns3::Ipv4PacketProbe")
+    .SetParent<Probe> ()
+    .AddConstructor<Ipv4PacketProbe> ()
+    .AddTraceSource ( "Output",
+                      "The packet plus its IPv4 object and interface that serve as the output for this probe",
+                      MakeTraceSourceAccessor (&Ipv4PacketProbe::m_output))
+    .AddTraceSource ( "OutputBytes",
+                      "The number of bytes in the packet",
+                      MakeTraceSourceAccessor (&Ipv4PacketProbe::m_outputBytes))
+  ;
+  return tid;
+}
+
+Ipv4PacketProbe::Ipv4PacketProbe ()
+{
+  NS_LOG_FUNCTION (this);
+  m_packet    = 0;
+  m_packetSizeOld = 0;
+  m_ipv4      = 0;
+  m_interface = 0;
+}
+
+Ipv4PacketProbe::~Ipv4PacketProbe ()
+{
+  NS_LOG_FUNCTION (this);
+}
+
+void
+Ipv4PacketProbe::SetValue (Ptr<const Packet> packet, Ptr<Ipv4> ipv4, uint32_t interface)
+{
+  NS_LOG_FUNCTION (this << packet << ipv4 << interface);
+  m_packet    = packet;
+  m_ipv4      = ipv4;
+  m_interface = interface;
+  m_output (packet, ipv4, interface);
+
+  uint32_t packetSizeNew = packet->GetSize ();
+  m_outputBytes (m_packetSizeOld, packetSizeNew);
+  m_packetSizeOld = packetSizeNew;
+}
+
+void
+Ipv4PacketProbe::SetValueByPath (std::string path, Ptr<const Packet> packet, Ptr<Ipv4> ipv4, uint32_t interface)
+{
+  NS_LOG_FUNCTION (path << packet << ipv4 << interface);
+  Ptr<Ipv4PacketProbe> probe = Names::Find<Ipv4PacketProbe> (path);
+  NS_ASSERT_MSG (probe, "Error:  Can't find probe for path " << path);
+  probe->SetValue (packet, ipv4, interface);
+}
+
+bool
+Ipv4PacketProbe::ConnectByObject (std::string traceSource, Ptr<Object> obj)
+{
+  NS_LOG_FUNCTION (this << traceSource << obj);
+  NS_LOG_DEBUG ("Name of probe (if any) in names database: " << Names::FindPath (obj));
+  bool connected = obj->TraceConnectWithoutContext (traceSource, MakeCallback (&ns3::Ipv4PacketProbe::TraceSink, this));
+  return connected;
+}
+
+void
+Ipv4PacketProbe::ConnectByPath (std::string path)
+{
+  NS_LOG_FUNCTION (this << path);
+  NS_LOG_DEBUG ("Name of probe to search for in config database: " << path);
+  Config::ConnectWithoutContext (path, MakeCallback (&ns3::Ipv4PacketProbe::TraceSink, this));
+}
+
+void
+Ipv4PacketProbe::TraceSink (Ptr<const Packet> packet, Ptr<Ipv4> ipv4, uint32_t interface)
+{
+  NS_LOG_FUNCTION (this << packet << ipv4 << interface);
+  if (IsEnabled ())
+    {
+      m_packet    = packet;
+      m_ipv4      = ipv4;
+      m_interface = interface;
+      m_output (packet, ipv4, interface);
+
+      uint32_t packetSizeNew = packet->GetSize ();
+      m_outputBytes (m_packetSizeOld, packetSizeNew);
+      m_packetSizeOld = packetSizeNew;
+    }
+}
+
+} // namespace ns3
diff -Naur ns-3.17/src/internet/model/ipv4-packet-probe.h ns-3.18/src/internet/model/ipv4-packet-probe.h
--- ns-3.17/src/internet/model/ipv4-packet-probe.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/internet/model/ipv4-packet-probe.h	2013-10-26 07:07:29.907364389 -0700
@@ -0,0 +1,124 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2011 Bucknell University
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Authors: L. Felipe Perrone (perrone@bucknell.edu)
+ *          Tiago G. Rodrigues (tgr002@bucknell.edu)
+ *
+ * Modified by: Mitch Watrous (watrous@u.washington.edu)
+ */
+
+#ifndef IPV4_PACKET_PROBE_H
+#define IPV4_PACKET_PROBE_H
+
+#include "ns3/object.h"
+#include "ns3/callback.h"
+#include "ns3/boolean.h"
+#include "ns3/nstime.h"
+#include "ns3/packet.h"
+#include "ns3/ipv4.h"
+#include "ns3/traced-value.h"
+#include "ns3/simulator.h"
+#include "ns3/probe.h"
+
+namespace ns3 {
+
+/**
+ * This class is designed to probe an underlying ns3 TraceSource
+ * exporting a packet, an IPv4 object, and an interface.  This probe
+ * exports a trace source "Output" with arguments of type Ptr<const Packet>,
+ * Ptr<Ipv4>, and uint32_t.  The Output trace source emits a value
+ * when either the trace source emits a new value, or when SetValue ()
+ * is called.
+ */
+class Ipv4PacketProbe : public Probe
+{
+public:
+  static TypeId GetTypeId ();
+  Ipv4PacketProbe ();
+  virtual ~Ipv4PacketProbe ();
+
+  /**
+   * \brief Set a probe value
+   *
+   * \param packet set the traced packet equal to this
+   * \param ipv4 set the IPv4 object for the traced packet equal to this
+   * \param interface set the IPv4 interface for the traced packet equal to this
+   */
+  void SetValue (Ptr<const Packet> packet, Ptr<Ipv4> ipv4, uint32_t interface);
+
+  /**
+   * \brief Set a probe value by its name in the Config system
+   *
+   * \param path config path to access the probe
+   * \param packet set the traced packet equal to this
+   * \param ipv4 set the IPv4 object for the traced packet equal to this
+   * \param interface set the IPv4 interface for the traced packet equal to this
+   */
+  static void SetValueByPath (std::string path, Ptr<const Packet> packet, Ptr<Ipv4> ipv4, uint32_t interface);
+
+  /**
+   * \brief connect to a trace source attribute provided by a given object
+   *
+   * \param traceSource the name of the attribute TraceSource to connect to
+   * \param obj ns3::Object to connect to
+   * \return true if the trace source was successfully connected
+   */
+  virtual bool ConnectByObject (std::string traceSource, Ptr<Object> obj);
+
+  /**
+   * \brief connect to a trace source provided by a config path
+   *
+   * \param path Config path to bind to
+   *
+   * Note, if an invalid path is provided, the probe will not be connected
+   * to anything.
+   */
+  virtual void ConnectByPath (std::string path);
+
+private:
+  /**
+   * \brief Method to connect to an underlying ns3::TraceSource with
+   * arguments of type Ptr<const Packet>, Ptr<Ipv4>, and uint32_t
+   *
+   * \param packet the traced packet
+   * \param ipv4 the IPv4 object for the traced packet
+   * \param interface the IPv4 interface for the traced packet
+   *
+   * \internal
+   */
+  void TraceSink (Ptr<const Packet> packet, Ptr<Ipv4> ipv4, uint32_t interface);
+
+  TracedCallback<Ptr<const Packet>, Ptr<Ipv4>, uint32_t> m_output;
+  TracedCallback<uint32_t, uint32_t> m_outputBytes;
+
+  /// The traced packet.
+  Ptr<const Packet> m_packet;
+
+  /// The IPv4 object for the traced packet.
+  Ptr<Ipv4> m_ipv4;
+
+  /// The IPv4 interface for the traced packet.
+  uint32_t m_interface;
+
+  /// The size of the traced packet.
+  uint32_t m_packetSizeOld;
+};
+
+
+} // namespace ns3
+
+#endif // IPV4_PACKET_PROBE_H
diff -Naur ns-3.17/src/internet/model/ipv4-route.h ns-3.18/src/internet/model/ipv4-route.h
--- ns-3.17/src/internet/model/ipv4-route.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/ipv4-route.h	2013-10-26 07:07:29.911364390 -0700
@@ -145,6 +145,7 @@
   /**
    * \param oif outgoing interface
    * \return TTL for this route
+   * \deprecated
    */
   uint32_t GetOutputTtl (uint32_t oif) NS_DEPRECATED;
 
diff -Naur ns-3.17/src/internet/model/ipv4-static-routing.cc ns-3.18/src/internet/model/ipv4-static-routing.cc
--- ns-3.17/src/internet/model/ipv4-static-routing.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/ipv4-static-routing.cc	2013-10-26 07:07:29.927364390 -0700
@@ -34,7 +34,7 @@
 #include "ipv4-static-routing.h"
 #include "ipv4-routing-table-entry.h"
 
-NS_LOG_COMPONENT_DEFINE ("Ipv4StaticRoung");
+NS_LOG_COMPONENT_DEFINE ("Ipv4StaticRouting");
 
 using std::make_pair;
 
@@ -516,12 +516,12 @@
   if (ipHeader.GetDestination ().IsBroadcast ())
     {
       NS_LOG_LOGIC ("For me (Ipv4Addr broadcast address)");
-      // TODO:  Local Deliver for broadcast
-      // TODO:  Forward broadcast
+      /// \todo Local Deliver for broadcast
+      /// \todo Forward broadcast
     }
 
   NS_LOG_LOGIC ("Unicast destination");
-  // TODO:  Configurable option to enable RFC 1222 Strong End System Model
+  /// \todo Configurable option to enable \RFC{1222} Strong End System Model
   // Right now, we will be permissive and allow a source to send us
   // a packet to one of our other interface addresses; that is, the
   // destination unicast address does not match one of the iif addresses,
diff -Naur ns-3.17/src/internet/model/ipv6-address-generator.h ns-3.18/src/internet/model/ipv6-address-generator.h
--- ns-3.17/src/internet/model/ipv6-address-generator.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/ipv6-address-generator.h	2013-10-26 07:07:29.923364390 -0700
@@ -31,7 +31,7 @@
  * network address; used in topology code. It also keeps track of all
  * addresses assigned to perform duplicate detection.
  *
- * Global unicast IPv6 addresses based on RFC 4291 definition:
+ * Global unicast IPv6 addresses based on \RFC{4291} definition:
  *
  *     |         n bits          |   m bits  |       128-n-m bits         |
  *     +-------------------------+-----------+----------------------------+
@@ -48,7 +48,7 @@
  * the subnet ID.
  *
  * The interface ID is often an EUI-64 address derived from the MAC address,
- * but can also be a pseudo-random value (RFC 3041).  This implementation
+ * but can also be a pseudo-random value (\RFC{3041}).  This implementation
  * does not generate EUI-64-based interface IDs.
  */
 class Ipv6AddressGenerator
diff -Naur ns-3.17/src/internet/model/ipv6-autoconfigured-prefix.cc ns-3.18/src/internet/model/ipv6-autoconfigured-prefix.cc
--- ns-3.17/src/internet/model/ipv6-autoconfigured-prefix.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/ipv6-autoconfigured-prefix.cc	2013-10-26 07:07:29.927364390 -0700
@@ -118,30 +118,42 @@
 
 void Ipv6AutoconfiguredPrefix::StartPreferredTimer ()
 {
-  NS_LOG_INFO ("Start PreferredTimer for " << m_prefix);
-  m_preferredTimer.SetFunction (&Ipv6AutoconfiguredPrefix::FunctionPreferredTimeout, this);
-  m_preferredTimer.SetDelay (Seconds (m_preferredLifeTime));
-  m_preferredTimer.Schedule ();
+  if (m_preferredLifeTime != 0xffffffff)
+    {
+      NS_LOG_INFO ("Start PreferredTimer for " << m_prefix);
+      m_preferredTimer.SetFunction (&Ipv6AutoconfiguredPrefix::FunctionPreferredTimeout, this);
+      m_preferredTimer.SetDelay (Seconds (m_preferredLifeTime));
+      m_preferredTimer.Schedule ();
+    }
 }
 
 void Ipv6AutoconfiguredPrefix::StartValidTimer ()
 {
-  NS_LOG_INFO ("Start ValidTimer for " << m_prefix);
-  m_validTimer.SetFunction (&Ipv6AutoconfiguredPrefix::FunctionValidTimeout, this);
-  m_validTimer.SetDelay (Seconds (m_validLifeTime - m_preferredLifeTime));
-  m_validTimer.Schedule ();
+  if (m_validLifeTime != 0xffffffff)
+    {
+      NS_LOG_INFO ("Start ValidTimer for " << m_prefix);
+      m_validTimer.SetFunction (&Ipv6AutoconfiguredPrefix::FunctionValidTimeout, this);
+      m_validTimer.SetDelay (Seconds (m_validLifeTime - m_preferredLifeTime));
+      m_validTimer.Schedule ();
+    }
 }
 
 void Ipv6AutoconfiguredPrefix::StopPreferredTimer ()
 {
-  NS_LOG_INFO ("Stop PreferredTimer for " << m_prefix);
-  m_preferredTimer.Cancel ();
+  if (m_preferredTimer.IsRunning())
+    {
+      NS_LOG_INFO ("Stop PreferredTimer for " << m_prefix);
+      m_preferredTimer.Cancel ();
+    }
 }
 
 void Ipv6AutoconfiguredPrefix::StopValidTimer ()
 {
-  NS_LOG_INFO ("Stop ValidTimer for " << m_prefix);
-  m_validTimer.Cancel ();
+  if (m_validTimer.IsRunning())
+    {
+      NS_LOG_INFO ("Stop ValidTimer for " << m_prefix);
+      m_validTimer.Cancel ();
+    }
 }
 
 void Ipv6AutoconfiguredPrefix::RemoveMe ()
diff -Naur ns-3.17/src/internet/model/ipv6.cc ns-3.18/src/internet/model/ipv6.cc
--- ns-3.17/src/internet/model/ipv6.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/ipv6.cc	2013-10-26 07:07:29.919364390 -0700
@@ -40,13 +40,11 @@
                    MakeBooleanAccessor (&Ipv6::SetIpForward,
                                         &Ipv6::GetIpForward),
                    MakeBooleanChecker ())
-#if 0
-    .AddAttribute ("MtuDiscover", "If enabled, every outgoing IPv6 packet will have the DF flag set.",
-                   BooleanValue (false),
-                   MakeBooleanAccessor (&UdpSocket::SetMtuDiscover,
-                                        &UdpSocket::GetMtuDiscover),
+    .AddAttribute ("MtuDiscover", "If disabled, every interface will have its MTU set to 1280 bytes.",
+                   BooleanValue (true),
+                   MakeBooleanAccessor (&Ipv6::SetMtuDiscover,
+                                        &Ipv6::GetMtuDiscover),
                    MakeBooleanChecker ())
-#endif
   ;
   return tid;
 }
diff -Naur ns-3.17/src/internet/model/ipv6-extension.cc ns-3.18/src/internet/model/ipv6-extension.cc
--- ns-3.17/src/internet/model/ipv6-extension.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/ipv6-extension.cc	2013-10-26 07:07:29.919364390 -0700
@@ -54,7 +54,7 @@
                    UintegerValue (0),
                    MakeUintegerAccessor (&Ipv6Extension::GetExtensionNumber),
                    MakeUintegerChecker<uint8_t> ())
-    .AddTraceSource ("Drop", "Drop ipv6 packet",
+    .AddTraceSource ("Drop", "Drop IPv6 packet",
                      MakeTraceSourceAccessor (&Ipv6Extension::m_dropTrace))
   ;
   return tid;
@@ -347,7 +347,7 @@
   uint32_t identification = fragmentHeader.GetIdentification ();
   Ipv6Address src = ipv6Header.GetSourceAddress ();
 
-  std::pair<Ipv6Address, uint32_t> fragmentsId = std::make_pair<Ipv6Address, uint32_t> (src, identification);
+  std::pair<Ipv6Address, uint32_t> fragmentsId = std::pair<Ipv6Address, uint32_t> (src, identification);
   Ptr<Fragments> fragments;
 
   Ipv6Header ipHeader = ipv6Header;
@@ -441,7 +441,7 @@
               hopbyhopHeader->SetNextHeader (Ipv6Header::IPV6_EXT_FRAGMENTATION);
             }
 
-          unfragmentablePart.push_back (std::make_pair<Ipv6ExtensionHeader *, uint8_t> (hopbyhopHeader, Ipv6Header::IPV6_EXT_HOP_BY_HOP));
+          unfragmentablePart.push_back (std::pair<Ipv6ExtensionHeader *, uint8_t> (hopbyhopHeader, Ipv6Header::IPV6_EXT_HOP_BY_HOP));
           unfragmentablePartSize += extensionHeaderLength;
         }
       else if (nextHeader == Ipv6Header::IPV6_EXT_ROUTING)
@@ -465,7 +465,7 @@
               routingHeader->SetNextHeader (Ipv6Header::IPV6_EXT_FRAGMENTATION);
             }
 
-          unfragmentablePart.push_back (std::make_pair<Ipv6ExtensionHeader *, uint8_t> (routingHeader, Ipv6Header::IPV6_EXT_ROUTING));
+          unfragmentablePart.push_back (std::pair<Ipv6ExtensionHeader *, uint8_t> (routingHeader, Ipv6Header::IPV6_EXT_ROUTING));
           unfragmentablePartSize += extensionHeaderLength;
         }
       else if (nextHeader == Ipv6Header::IPV6_EXT_DESTINATION)
@@ -485,7 +485,7 @@
               destinationHeader->SetNextHeader (Ipv6Header::IPV6_EXT_FRAGMENTATION);
             }
 
-          unfragmentablePart.push_back (std::make_pair<Ipv6ExtensionHeader *, uint8_t> (destinationHeader, Ipv6Header::IPV6_EXT_DESTINATION));
+          unfragmentablePart.push_back (std::pair<Ipv6ExtensionHeader *, uint8_t> (destinationHeader, Ipv6Header::IPV6_EXT_DESTINATION));
           unfragmentablePartSize += extensionHeaderLength;
         }
     }
@@ -530,15 +530,24 @@
         {
           if (it->second == Ipv6Header::IPV6_EXT_HOP_BY_HOP)
             {
-              fragment->AddHeader (*dynamic_cast<Ipv6ExtensionHopByHopHeader *> (it->first));
+              Ipv6ExtensionHopByHopHeader * p =
+                dynamic_cast<Ipv6ExtensionHopByHopHeader *> (it->first);
+              NS_ASSERT (p != 0);
+              fragment->AddHeader (*p);
             }
           else if (it->second == Ipv6Header::IPV6_EXT_ROUTING)
             {
-              fragment->AddHeader (*dynamic_cast<Ipv6ExtensionLooseRoutingHeader *> (it->first));
+              Ipv6ExtensionLooseRoutingHeader * p =
+                dynamic_cast<Ipv6ExtensionLooseRoutingHeader *> (it->first);
+              NS_ASSERT (p != 0);
+              fragment->AddHeader (*p);
             }
           else if (it->second == Ipv6Header::IPV6_EXT_DESTINATION)
             {
-              fragment->AddHeader (*dynamic_cast<Ipv6ExtensionDestinationHeader *> (it->first));
+              Ipv6ExtensionDestinationHeader * p =
+                dynamic_cast<Ipv6ExtensionDestinationHeader *> (it->first);
+              NS_ASSERT (p != 0);
+              fragment->AddHeader (*p);
             }
         }
 
@@ -611,7 +620,7 @@
       m_moreFragment = moreFragment;
     }
 
-  m_packetFragments.insert (it, std::make_pair<Ptr<Packet>, uint16_t> (fragment, fragmentOffset));
+  m_packetFragments.insert (it, std::pair<Ptr<Packet>, uint16_t> (fragment, fragmentOffset));
 }
 
 void Ipv6ExtensionFragment::Fragments::SetUnfragmentablePart (Ptr<Packet> unfragmentablePart)
@@ -1027,7 +1036,7 @@
 {
   NS_LOG_FUNCTION (this << packet << offset << ipv6Header << dst << nextHeader << isDropped);
 
-  /* TODO */
+  /** \todo */
 
   return 0;
 }
@@ -1065,7 +1074,7 @@
 {
   NS_LOG_FUNCTION (this << packet << offset << ipv6Header << dst << nextHeader << isDropped);
 
-  /* TODO */
+  /** \todo */
 
   return true;
 }
diff -Naur ns-3.17/src/internet/model/ipv6-extension-header.cc ns-3.18/src/internet/model/ipv6-extension-header.cc
--- ns-3.17/src/internet/model/ipv6-extension-header.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/ipv6-extension-header.cc	2013-10-26 07:07:29.911364390 -0700
@@ -239,7 +239,7 @@
   Buffer::Iterator i = start;
 
   i.WriteU8 (GetNextHeader ());
-  i.WriteU8 ((GetLength () >> 3) - 1);
+  i.WriteU8 ((GetSerializedSize () >> 3) - 1);
   OptionField::Serialize (i);
 }
 
@@ -294,8 +294,7 @@
   Buffer::Iterator i = start;
 
   i.WriteU8 (GetNextHeader ());
-  i.WriteU8 ((GetLength () >> 3) - 1);
-
+  i.WriteU8 ((GetSerializedSize () >> 3) - 1);
   OptionField::Serialize (i);
 }
 
@@ -613,23 +612,23 @@
 
 void Ipv6ExtensionESPHeader::Print (std::ostream &os) const
 {
-  /* TODO */
+  /** \todo */
 }
 
 uint32_t Ipv6ExtensionESPHeader::GetSerializedSize () const
 {
-  /* TODO */
+  /** \todo */
   return 0;
 }
 
 void Ipv6ExtensionESPHeader::Serialize (Buffer::Iterator start) const
 {
-  /* TODO */
+  /** \todo */
 }
 
 uint32_t Ipv6ExtensionESPHeader::Deserialize (Buffer::Iterator start) 
 {
-  /* TODO */
+  /** \todo */
   return 0;
 }
 
@@ -659,23 +658,23 @@
 
 void Ipv6ExtensionAHHeader::Print (std::ostream &os) const
 {
-  /* TODO */
+  /** \todo */
 }
 
 uint32_t Ipv6ExtensionAHHeader::GetSerializedSize () const
 {
-  /* TODO */
+  /** \todo */
   return 0;
 }
 
 void Ipv6ExtensionAHHeader::Serialize (Buffer::Iterator start) const
 {
-  /* TODO */
+  /** \todo */
 }
 
 uint32_t Ipv6ExtensionAHHeader::Deserialize (Buffer::Iterator start) 
 {
-  /* TODO */ 
+  /** \todo */ 
   return 0;
 }
 
diff -Naur ns-3.17/src/internet/model/ipv6.h ns-3.18/src/internet/model/ipv6.h
--- ns-3.17/src/internet/model/ipv6.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/ipv6.h	2013-10-26 07:07:29.919364390 -0700
@@ -218,6 +218,15 @@
   virtual bool RemoveAddress (uint32_t interface, uint32_t addressIndex) = 0;
 
   /**
+   * \brief Remove the given address on named Ipv6 interface
+   *
+   * \param interface Interface number of an IPv6 interface
+   * \param address the address to remove
+   * \returns true if the operation succeeded
+   */
+  virtual bool RemoveAddress (uint32_t interface, Ipv6Address address) = 0;
+
+  /**
    * \brief Set metric on specified Ipv6 interface.
    *
    * \param interface The interface number of an IPv6 interface
@@ -244,6 +253,13 @@
   virtual uint16_t GetMtu (uint32_t interface) const = 0;
 
   /**
+   * \brief Set the Path MTU for the specified IPv6 destination address.
+   * \param dst Ipv6 destination address
+   * \param pmtu the Path MTU
+   */
+  virtual void SetPmtu (Ipv6Address dst, uint32_t pmtu) = 0;
+
+  /**
    * \brief If the specified interface index is in "up" state.
    * \param interface Interface number of IPv6 interface
    * \returns true if the underlying interface is in the "up" state,
@@ -311,6 +327,18 @@
    * \return forwarding state (enabled or not)
    */
   virtual bool GetIpForward (void) const = 0;
+
+  /**
+   * \brief Set IPv6 MTU discover state.
+   * \param mtuDiscover IPv6 MTU discover enabled or not
+   */
+  virtual void SetMtuDiscover (bool mtuDiscover) = 0;
+
+  /**
+   * \brief Get IPv6 MTU discover state.
+   * \return MTU discover state (enabled or not)
+   */
+  virtual bool GetMtuDiscover (void) const = 0;
 };
 
 } // namespace ns3 
diff -Naur ns-3.17/src/internet/model/ipv6-interface-address.cc ns-3.18/src/internet/model/ipv6-interface-address.cc
--- ns-3.17/src/internet/model/ipv6-interface-address.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/ipv6-interface-address.cc	2013-10-26 07:07:29.919364390 -0700
@@ -95,6 +95,12 @@
       /* link-local address is always /64 prefix */
       m_prefix = Ipv6Prefix (64);
     }
+  else if (address.IsLinkLocalMulticast ())
+    {
+      m_scope = LINKLOCAL;
+      /* link-local multicast address is always /16 prefix */
+      m_prefix = Ipv6Prefix (16);
+    }
   else
     {
       m_scope = GLOBAL;
diff -Naur ns-3.17/src/internet/model/ipv6-interface.cc ns-3.18/src/internet/model/ipv6-interface.cc
--- ns-3.17/src/internet/model/ipv6-interface.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/ipv6-interface.cc	2013-10-26 07:07:29.927364390 -0700
@@ -25,6 +25,8 @@
 #include "ipv6-interface.h"
 #include "ns3/net-device.h"
 #include "loopback-net-device.h"
+#include "ns3/mac16-address.h"
+#include "ns3/mac64-address.h"
 #include "ipv6-l3-protocol.h"
 #include "icmpv6-l4-protocol.h"
 #include "ndisc-cache.h"
@@ -87,11 +89,21 @@
     {
       Address addr = GetDevice ()->GetAddress ();
 
-      if (Mac48Address::IsMatchingType (addr))
+      if (Mac64Address::IsMatchingType (addr))
+        {
+          Ipv6InterfaceAddress ifaddr = Ipv6InterfaceAddress (Ipv6Address::MakeAutoconfiguredLinkLocalAddress (Mac64Address::ConvertFrom (addr)), Ipv6Prefix (64));
+          AddAddress (ifaddr);
+        }
+      else if (Mac48Address::IsMatchingType (addr))
         {
           Ipv6InterfaceAddress ifaddr = Ipv6InterfaceAddress (Ipv6Address::MakeAutoconfiguredLinkLocalAddress (Mac48Address::ConvertFrom (addr)), Ipv6Prefix (64));
           AddAddress (ifaddr);
         }
+      else if (Mac16Address::IsMatchingType (addr))
+        {
+          Ipv6InterfaceAddress ifaddr = Ipv6InterfaceAddress (Ipv6Address::MakeAutoconfiguredLinkLocalAddress (Mac16Address::ConvertFrom (addr)), Ipv6Prefix (64));
+          AddAddress (ifaddr);
+        }
       else
         {
           NS_ASSERT_MSG (false, "IPv6 autoconf for this kind of address not implemented.");
@@ -103,7 +115,10 @@
     }
 
   Ptr<Icmpv6L4Protocol> icmpv6 = m_node->GetObject<Ipv6L3Protocol> ()->GetIcmpv6 ();
-  m_ndCache = icmpv6->CreateCache (m_device, this);
+  if (m_device->NeedsArp ())
+    {
+      m_ndCache = icmpv6->CreateCache (m_device, this);
+    }
 }
 
 void Ipv6Interface::SetNode (Ptr<Node> node)
@@ -288,6 +303,29 @@
   return addr;  /* quiet compiler */
 }
 
+Ipv6InterfaceAddress 
+Ipv6Interface::RemoveAddress(Ipv6Address address)
+{
+  NS_LOG_FUNCTION(this << address);
+
+  if (address == address.GetLoopback())
+    {
+      NS_LOG_WARN ("Cannot remove loopback address.");
+      return Ipv6InterfaceAddress();
+    }
+
+  for (Ipv6InterfaceAddressListI it = m_addresses.begin (); it != m_addresses.end (); ++it)
+    {
+      if((*it).GetAddress() == address)
+        {
+          Ipv6InterfaceAddress iface = (*it);
+          m_addresses.erase(it);
+          return iface;
+        }
+    }
+  return Ipv6InterfaceAddress();
+}
+
 Ipv6InterfaceAddress Ipv6Interface::GetAddressMatchingDestination (Ipv6Address dst)
 {
   NS_LOG_FUNCTION (this << dst);
@@ -320,7 +358,7 @@
   /* check if destination is localhost (::1) */
   if (DynamicCast<LoopbackNetDevice> (m_device))
     {
-      /* XXX additional checks needed here (such as whether multicast
+      /** \todo additional checks needed here (such as whether multicast
        * goes to loopback)?
        */
       m_device->Send (p, m_device->GetBroadcast (), Ipv6L3Protocol::PROT_NUMBER);
diff -Naur ns-3.17/src/internet/model/ipv6-interface.h ns-3.18/src/internet/model/ipv6-interface.h
--- ns-3.17/src/internet/model/ipv6-interface.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/ipv6-interface.h	2013-10-26 07:07:29.907364389 -0700
@@ -228,6 +228,15 @@
   Ipv6InterfaceAddress RemoveAddress (uint32_t index);
 
   /**
+   * \brief Remove the given Ipv6 address from the interface.
+   * \param address The Ipv6 address to remove
+   * \returns The removed Ipv6 interface address 
+   * \returns The null interface address if the interface did not contain the 
+   * address or if loopback address was passed as argument
+   */
+  Ipv6InterfaceAddress RemoveAddress (Ipv6Address address);
+
+  /**
    * \brief Update state of an interface address.
    * \param address IPv6 address
    * \param state new state
diff -Naur ns-3.17/src/internet/model/ipv6-l3-protocol.cc ns-3.18/src/internet/model/ipv6-l3-protocol.cc
--- ns-3.17/src/internet/model/ipv6-l3-protocol.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/ipv6-l3-protocol.cc	2013-10-26 07:07:29.919364390 -0700
@@ -28,6 +28,8 @@
 #include "ns3/object-vector.h"
 #include "ns3/ipv6-routing-protocol.h"
 #include "ns3/ipv6-route.h"
+#include "ns3/mac16-address.h"
+#include "ns3/mac64-address.h"
 
 #include "loopback-net-device.h"
 #include "ipv6-l3-protocol.h"
@@ -42,6 +44,9 @@
 #include "icmpv6-l4-protocol.h"
 #include "ndisc-cache.h"
 
+/// Minimum IPv6 MTU, as defined by \RFC{2460}
+#define IPV6_MIN_MTU 1280
+
 namespace ns3 {
 
 NS_OBJECT_ENSURE_REGISTERED (Ipv6L3Protocol);
@@ -86,6 +91,7 @@
   : m_nInterfaces (0)
 {
   NS_LOG_FUNCTION_NOARGS ();
+  m_pmtuCache = CreateObject<Ipv6PmtuCache> ();
 }
 
 Ipv6L3Protocol::~Ipv6L3Protocol ()
@@ -129,6 +135,7 @@
 
   m_node = 0;
   m_routingProtocol = 0;
+  m_pmtuCache = 0;
   Object::DoDispose ();
 }
 
@@ -263,11 +270,19 @@
 
   if (flags & (1 << 6)) /* auto flag */
     {
-      /* XXX : add other L2 address case */
-      if (Mac48Address::IsMatchingType (addr))
+      // In case of new MacAddress types, remember to change Ipv6L3Protocol::RemoveAutoconfiguredAddress as well
+      if (Mac64Address::IsMatchingType (addr))
+        {
+          address = Ipv6InterfaceAddress (Ipv6Address::MakeAutoconfiguredAddress (Mac64Address::ConvertFrom (addr), network));
+        }
+      else if (Mac48Address::IsMatchingType (addr))
         {
           address = Ipv6InterfaceAddress (Ipv6Address::MakeAutoconfiguredAddress (Mac48Address::ConvertFrom (addr), network));
         }
+      else if (Mac16Address::IsMatchingType (addr))
+        {
+          address = Ipv6InterfaceAddress (Ipv6Address::MakeAutoconfiguredAddress (Mac16Address::ConvertFrom (addr), network));
+        }
       else
         {
           NS_FATAL_ERROR ("Unknown method to make autoconfigured address for this kind of device.");
@@ -293,7 +308,10 @@
       /* add default router
        * if a previous default route exists, the new ones is simply added
        */
-      GetRoutingProtocol ()->NotifyAddRoute (Ipv6Address::GetAny (), Ipv6Prefix ((uint8_t)0), defaultRouter, interface, network);
+      if (!defaultRouter.IsAny())
+        {
+          GetRoutingProtocol ()->NotifyAddRoute (Ipv6Address::GetAny (), Ipv6Prefix ((uint8_t)0), defaultRouter, interface, network);
+        }
 
       Ptr<Ipv6AutoconfiguredPrefix> aPrefix = CreateObject<Ipv6AutoconfiguredPrefix> (m_node, interface, network, mask, preferredTime, validTime, defaultRouter);
       aPrefix->StartPreferredTimer ();
@@ -309,7 +327,25 @@
   Address addr = iface->GetDevice ()->GetAddress ();
   uint32_t max = iface->GetNAddresses ();
   uint32_t i = 0;
-  Ipv6Address toFound = Ipv6Address::MakeAutoconfiguredAddress (Mac48Address::ConvertFrom (addr), network);
+  Ipv6Address toFound;
+
+  if (Mac64Address::IsMatchingType (addr))
+    {
+      toFound = Ipv6Address::MakeAutoconfiguredAddress (Mac64Address::ConvertFrom (addr), network);
+    }
+  else if (Mac48Address::IsMatchingType (addr))
+    {
+      toFound = Ipv6Address::MakeAutoconfiguredAddress (Mac48Address::ConvertFrom (addr), network);
+    }
+  else if (Mac16Address::IsMatchingType (addr))
+    {
+      toFound = Ipv6Address::MakeAutoconfiguredAddress (Mac16Address::ConvertFrom (addr), network);
+    }
+  else
+    {
+      NS_FATAL_ERROR ("Unknown method to make autoconfigured address for this kind of device.");
+      return;
+    }
 
   for (i = 0; i < max; i++)
     {
@@ -378,6 +414,29 @@
   return false;
 }
 
+bool 
+Ipv6L3Protocol::RemoveAddress (uint32_t i, Ipv6Address address)
+{
+  NS_LOG_FUNCTION (this << i << address);
+
+  if (address == Ipv6Address::GetLoopback())
+    {
+      NS_LOG_WARN ("Cannot remove loopback address.");
+      return false;
+    }
+  Ptr<Ipv6Interface> interface = GetInterface (i);
+  Ipv6InterfaceAddress ifAddr = interface->RemoveAddress (address);
+  if (ifAddr != Ipv6InterfaceAddress ())
+  {
+    if (m_routingProtocol != 0)
+    {
+      m_routingProtocol->NotifyRemoveAddress (i, ifAddr);
+    }
+    return true;
+  }
+  return false;
+}
+
 void Ipv6L3Protocol::SetMetric (uint32_t i, uint16_t metric)
 {
   NS_LOG_FUNCTION (this << i << metric);
@@ -395,10 +454,24 @@
 uint16_t Ipv6L3Protocol::GetMtu (uint32_t i) const
 {
   NS_LOG_FUNCTION (this << i);
+
+  // RFC 1981, if PMTU is disabled, return the minimum MTU
+  if (!m_mtuDiscover)
+    {
+      return IPV6_MIN_MTU;
+    }
+
   Ptr<Ipv6Interface> interface = GetInterface (i);
   return interface->GetDevice ()->GetMtu ();
 }
 
+void Ipv6L3Protocol::SetPmtu (Ipv6Address dst, uint32_t pmtu)
+{
+  NS_LOG_FUNCTION (this << dst << int(pmtu));
+  m_pmtuCache->SetPmtu (dst, pmtu);
+}
+
+
 bool Ipv6L3Protocol::IsUp (uint32_t i) const
 {
   NS_LOG_FUNCTION (this << i);
@@ -502,6 +575,18 @@
   return m_ipForward;
 }
 
+void Ipv6L3Protocol::SetMtuDiscover (bool mtuDiscover)
+{
+  NS_LOG_FUNCTION (this << int(mtuDiscover));
+  m_mtuDiscover = mtuDiscover;
+}
+
+bool Ipv6L3Protocol::GetMtuDiscover () const
+{
+  NS_LOG_FUNCTION (this);
+  return m_mtuDiscover;
+}
+
 void Ipv6L3Protocol::SetSendIcmpv6Redirect (bool sendIcmpv6Redirect)
 {
   NS_LOG_FUNCTION (this << sendIcmpv6Redirect);
@@ -794,10 +879,30 @@
   // Check packet size
   std::list<Ptr<Packet> > fragments;
 
-  if (packet->GetSize () > (size_t)(dev->GetMtu () + 40)) /* 40 => size of IPv6 header */
+  // Check if we have a Path MTU stored. If so, use it. Else, use the link MTU.
+  size_t targetMtu = (size_t)(m_pmtuCache->GetPmtu (ipHeader.GetDestinationAddress()));
+  if (targetMtu == 0)
+    {
+      targetMtu = dev->GetMtu ();
+    }
+
+  if (packet->GetSize () > targetMtu + 40) /* 40 => size of IPv6 header */
     {
       // Router => drop
-      if (m_ipForward)
+
+      bool fromMe = false;
+      for (uint32_t i=0; i<GetNInterfaces(); i++ )
+        {
+          for (uint32_t j=0; j<GetNAddresses(i); j++ )
+            {
+              if (GetAddress(i,j).GetAddress() == ipHeader.GetSourceAddress())
+                {
+                  fromMe = true;
+                  break;
+                }
+            }
+        }
+      if (!fromMe)
         {
           Ptr<Icmpv6L4Protocol> icmpv6 = GetIcmpv6 ();
           if ( icmpv6 )
@@ -814,7 +919,8 @@
 
       // To get specific method GetFragments from Ipv6ExtensionFragmentation
       Ipv6ExtensionFragment *ipv6Fragment = dynamic_cast<Ipv6ExtensionFragment *> (PeekPointer (ipv6ExtensionDemux->GetExtension (Ipv6Header::IPV6_EXT_FRAGMENTATION)));
-      ipv6Fragment->GetFragments (packet, outInterface->GetDevice ()->GetMtu (), fragments);
+      NS_ASSERT (ipv6Fragment != 0);
+      ipv6Fragment->GetFragments (packet, targetMtu, fragments);
     }
 
   if (!route->GetGateway ().IsEqual (Ipv6Address::GetAny ()))
@@ -879,11 +985,19 @@
     }
 }
 
-void Ipv6L3Protocol::IpForward (Ptr<Ipv6Route> rtentry, Ptr<const Packet> p, const Ipv6Header& header)
+void Ipv6L3Protocol::IpForward (Ptr<const NetDevice> idev, Ptr<Ipv6Route> rtentry, Ptr<const Packet> p, const Ipv6Header& header)
 {
   NS_LOG_FUNCTION (this << rtentry << p << header);
   NS_LOG_LOGIC ("Forwarding logic for node: " << m_node->GetId ());
 
+  // Drop RFC 3849 packets: 2001:db8::/32
+  if (header.GetDestinationAddress().IsDocumentation())
+    {
+      NS_LOG_WARN ("Received a packet for 2001:db8::/32 (documentation class).  Drop.");
+      m_dropTrace (header, p, DROP_ROUTE_ERROR, m_node->GetObject<Ipv6> (), 0);
+      return;
+    }
+
   // Forwarding
   Ipv6Header ipHeader = header;
   Ptr<Packet> packet = p->Copy ();
@@ -916,9 +1030,12 @@
    * exists.
    */
 
-  if (m_sendIcmpv6Redirect &&
-      ((!rtentry->GetGateway ().IsAny () && rtentry->GetGateway ().CombinePrefix (Ipv6Prefix (64)) == header.GetSourceAddress ().CombinePrefix (Ipv6Prefix (64)))
-      || (rtentry->GetDestination ().CombinePrefix (Ipv6Prefix (64)) == header.GetSourceAddress ().CombinePrefix (Ipv6Prefix (64)))))
+  /* Theoretically we should also check if the redirect target is on the same network
+   * as the source node. On the other hand, we are sure that the router we're redirecting to
+   * used a link-local address. As a consequence, they MUST be on the same network, the link-local net.
+   */
+
+  if (m_sendIcmpv6Redirect && (rtentry->GetOutputDevice ()==idev))
     {
       NS_LOG_LOGIC ("ICMPv6 redirect!");
       Ptr<Icmpv6L4Protocol> icmpv6 = GetIcmpv6 ();
@@ -934,21 +1051,22 @@
         }
 
       copy->AddHeader (header);
+      Ipv6Address linkLocal = GetInterface (GetInterfaceForDevice (rtentry->GetOutputDevice ()))->GetLinkLocalAddress ().GetAddress ();
 
       if (icmpv6->Lookup (target, rtentry->GetOutputDevice (), 0, &hardwareTarget))
         {
-          icmpv6->SendRedirection (copy, src, target, dst, hardwareTarget);
+          icmpv6->SendRedirection (copy, linkLocal, src, target, dst, hardwareTarget);
         }
       else
         {
-          icmpv6->SendRedirection (copy, src, target, dst, Address ());
+          icmpv6->SendRedirection (copy, linkLocal, src, target, dst, Address ());
         }
     }
 
   SendRealOut (rtentry, packet, ipHeader);
 }
 
-void Ipv6L3Protocol::IpMulticastForward (Ptr<Ipv6MulticastRoute> mrtentry, Ptr<const Packet> p, const Ipv6Header& header)
+void Ipv6L3Protocol::IpMulticastForward (Ptr<const NetDevice> idev, Ptr<Ipv6MulticastRoute> mrtentry, Ptr<const Packet> p, const Ipv6Header& header)
 {
   NS_LOG_FUNCTION (this << mrtentry << p << header);
   NS_LOG_LOGIC ("Multicast forwarding logic for node: " << m_node->GetId ());
diff -Naur ns-3.17/src/internet/model/ipv6-l3-protocol.h ns-3.18/src/internet/model/ipv6-l3-protocol.h
--- ns-3.17/src/internet/model/ipv6-l3-protocol.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/ipv6-l3-protocol.h	2013-10-26 07:07:29.931364390 -0700
@@ -28,6 +28,7 @@
 #include "ns3/ipv6.h"
 #include "ns3/ipv6-address.h"
 #include "ns3/ipv6-header.h"
+#include "ns3/ipv6-pmtu-cache.h"
 
 namespace ns3
 {
@@ -249,6 +250,14 @@
   bool RemoveAddress (uint32_t interfaceIndex, uint32_t addressIndex);
 
   /**
+   * \brief Remove a specified Ipv6 address from an interface.
+   * \param interfaceIndex interface index
+   * \param address Ipv6Address to be removed from the interface
+   * \returns true if the operation succeeded
+   */
+  bool RemoveAddress (uint32_t interface, Ipv6Address address);
+
+  /**
    * \brief Set metric for an interface.
    * \param i index
    * \param metric
@@ -270,6 +279,13 @@
   uint16_t GetMtu (uint32_t i) const;
 
   /**
+   * \brief Set the Path MTU for the specified IPv6 destination address.
+   * \param dst Ipv6 destination address
+   * \param pmtu the Path MTU
+   */
+  virtual void SetPmtu (Ipv6Address dst, uint32_t pmtu);
+
+  /**
    * \brief Is specified interface up ?
    * \param i interface index
    */
@@ -420,19 +436,21 @@
 
   /**
    * \brief Forward a packet.
+   * \param idev Pointer to ingress network device
    * \param rtentry route 
    * \param p packet to forward
    * \param header IPv6 header to add to the packet
    */
-  void IpForward (Ptr<Ipv6Route> rtentry, Ptr<const Packet> p, const Ipv6Header& header);
+  void IpForward (Ptr<const NetDevice> idev, Ptr<Ipv6Route> rtentry, Ptr<const Packet> p, const Ipv6Header& header);
 
   /**
    * \brief Forward a packet in multicast.
+   * \param idev Pointer to ingress network device
    * \param mrtentry route 
    * \param p packet to forward
    * \param header IPv6 header to add to the packet
    */
-  void IpMulticastForward (Ptr<Ipv6MulticastRoute> mrtentry, Ptr<const Packet> p, const Ipv6Header& header);
+  void IpMulticastForward (Ptr<const NetDevice> idev, Ptr<Ipv6MulticastRoute> mrtentry, Ptr<const Packet> p, const Ipv6Header& header);
 
   /**
    * \brief Deliver a packet.
@@ -475,6 +493,18 @@
   virtual bool GetIpForward () const;
 
   /**
+   * \brief Set IPv6 MTU discover state.
+   * \param mtuDiscover IPv6 MTU discover enabled or not
+   */
+  virtual void SetMtuDiscover (bool mtuDiscover);
+
+  /**
+   * \brief Get IPv6 MTU discover state.
+   * \return MTU discover state (enabled or not)
+   */
+  virtual bool GetMtuDiscover (void) const;
+
+  /**
    * \brief Set the ICMPv6 Redirect sending state.
    * \param sendIcmpv6Redirect ICMPv6 Redirect sending enabled or not
    */
@@ -497,6 +527,16 @@
   bool m_ipForward;
 
   /**
+   * \brief MTU Discover (i.e. Path MTU) state.
+   */
+  bool m_mtuDiscover;
+
+  /**
+   * \brief Path MTU Cache.
+   */
+  Ptr<Ipv6PmtuCache> m_pmtuCache;
+
+  /**
    * \brief List of transport protocol.
    */
   L4List_t m_protocols;
diff -Naur ns-3.17/src/internet/model/ipv6-list-routing.cc ns-3.18/src/internet/model/ipv6-list-routing.cc
--- ns-3.17/src/internet/model/ipv6-list-routing.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/ipv6-list-routing.cc	2013-10-26 07:07:29.927364390 -0700
@@ -147,7 +147,7 @@
       return retVal;
     }
 
-  // TODO:  Configurable option to enable RFC 1222 Strong End System Model
+  /// \todo  Configurable option to enable \RFC{1222} Strong End System Model
   // Right now, we will be permissive and allow a source to send us
   // a packet to one of our other interface addresses; that is, the
   // destination unicast address does not match one of the iif addresses,
diff -Naur ns-3.17/src/internet/model/ipv6-option-header.cc ns-3.18/src/internet/model/ipv6-option-header.cc
--- ns-3.17/src/internet/model/ipv6-option-header.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/ipv6-option-header.cc	2013-10-26 07:07:29.923364390 -0700
@@ -317,6 +317,7 @@
 Ipv6OptionRouterAlertHeader::Ipv6OptionRouterAlertHeader ()
   : m_value (0)
 {
+  SetType (5);
   SetLength (2);
 }
 
diff -Naur ns-3.17/src/internet/model/ipv6-option-header.h ns-3.18/src/internet/model/ipv6-option-header.h
--- ns-3.17/src/internet/model/ipv6-option-header.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/ipv6-option-header.h	2013-10-26 07:07:29.927364390 -0700
@@ -40,7 +40,7 @@
    * \struct Alignment
    * \brief represents the alignment requirements of an option header
    *
-   * Represented as factor*n+offset (eg. 8n+2) See RFC 2460.
+   * Represented as factor*n+offset (eg. 8n+2) See \RFC{2460}.
    * No alignment is represented as 1n+0.
    */
   struct Alignment
diff -Naur ns-3.17/src/internet/model/ipv6-packet-info-tag.h ns-3.18/src/internet/model/ipv6-packet-info-tag.h
--- ns-3.17/src/internet/model/ipv6-packet-info-tag.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/ipv6-packet-info-tag.h	2013-10-26 07:07:29.903364389 -0700
@@ -33,8 +33,7 @@
 /**
  * \brief This class implements a tag that carries socket ancillary 
  * data to the socket interface. This is used like 
- * socket option of IP_PKTINFO/IPV6_PKTINFO in RFC 3542
- * See: http://tools.ietf.org/html/rfc3542
+ * socket option of IP_PKTINFO/IPV6_PKTINFO in \RFC{3542}
  *
  * This tag in the send direction is presently not enabled but we
  * would accept a patch along those lines in the future. To include
diff -Naur ns-3.17/src/internet/model/ipv6-packet-probe.cc ns-3.18/src/internet/model/ipv6-packet-probe.cc
--- ns-3.17/src/internet/model/ipv6-packet-probe.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/internet/model/ipv6-packet-probe.cc	2013-10-26 07:07:29.919364390 -0700
@@ -0,0 +1,125 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2011 Bucknell University
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Authors: L. Felipe Perrone (perrone@bucknell.edu)
+ *          Tiago G. Rodrigues (tgr002@bucknell.edu)
+ *
+ * Modified by: Mitch Watrous (watrous@u.washington.edu)
+ * Adapted to Ipv6 by: Tommaso Pecorella (tommaso.pecorella@unifi.it)
+ */
+
+#include "ns3/ipv6-packet-probe.h"
+#include "ns3/object.h"
+#include "ns3/log.h"
+#include "ns3/names.h"
+#include "ns3/config.h"
+#include "ns3/trace-source-accessor.h"
+
+NS_LOG_COMPONENT_DEFINE ("Ipv6PacketProbe");
+
+namespace ns3 {
+
+NS_OBJECT_ENSURE_REGISTERED (Ipv6PacketProbe);
+
+TypeId
+Ipv6PacketProbe::GetTypeId ()
+{
+  static TypeId tid = TypeId ("ns3::Ipv6PacketProbe")
+    .SetParent<Probe> ()
+    .AddConstructor<Ipv6PacketProbe> ()
+    .AddTraceSource ( "Output",
+                      "The packet plus its IPv6 object and interface that serve as the output for this probe",
+                      MakeTraceSourceAccessor (&Ipv6PacketProbe::m_output))
+    .AddTraceSource ( "OutputBytes",
+                      "The number of bytes in the packet",
+                      MakeTraceSourceAccessor (&Ipv6PacketProbe::m_outputBytes))
+  ;
+  return tid;
+}
+
+Ipv6PacketProbe::Ipv6PacketProbe ()
+{
+  NS_LOG_FUNCTION (this);
+  m_packet    = 0;
+  m_packetSizeOld = 0;
+  m_ipv6      = 0;
+  m_interface = 0;
+}
+
+Ipv6PacketProbe::~Ipv6PacketProbe ()
+{
+  NS_LOG_FUNCTION (this);
+}
+
+void
+Ipv6PacketProbe::SetValue (Ptr<const Packet> packet, Ptr<Ipv6> ipv6, uint32_t interface)
+{
+  NS_LOG_FUNCTION (this << packet << ipv6 << interface);
+  m_packet    = packet;
+  m_ipv6      = ipv6;
+  m_interface = interface;
+  m_output (packet, ipv6, interface);
+
+  uint32_t packetSizeNew = packet->GetSize ();
+  m_outputBytes (m_packetSizeOld, packetSizeNew);
+  m_packetSizeOld = packetSizeNew;
+}
+
+void
+Ipv6PacketProbe::SetValueByPath (std::string path, Ptr<const Packet> packet, Ptr<Ipv6> ipv6, uint32_t interface)
+{
+  NS_LOG_FUNCTION (path << packet << ipv6 << interface);
+  Ptr<Ipv6PacketProbe> probe = Names::Find<Ipv6PacketProbe> (path);
+  NS_ASSERT_MSG (probe, "Error:  Can't find probe for path " << path);
+  probe->SetValue (packet, ipv6, interface);
+}
+
+bool
+Ipv6PacketProbe::ConnectByObject (std::string traceSource, Ptr<Object> obj)
+{
+  NS_LOG_FUNCTION (this << traceSource << obj);
+  NS_LOG_DEBUG ("Name of probe (if any) in names database: " << Names::FindPath (obj));
+  bool connected = obj->TraceConnectWithoutContext (traceSource, MakeCallback (&ns3::Ipv6PacketProbe::TraceSink, this));
+  return connected;
+}
+
+void
+Ipv6PacketProbe::ConnectByPath (std::string path)
+{
+  NS_LOG_FUNCTION (this << path);
+  NS_LOG_DEBUG ("Name of probe to search for in config database: " << path);
+  Config::ConnectWithoutContext (path, MakeCallback (&ns3::Ipv6PacketProbe::TraceSink, this));
+}
+
+void
+Ipv6PacketProbe::TraceSink (Ptr<const Packet> packet, Ptr<Ipv6> ipv6, uint32_t interface)
+{
+  NS_LOG_FUNCTION (this << packet << ipv6 << interface);
+  if (IsEnabled ())
+    {
+      m_packet    = packet;
+      m_ipv6      = ipv6;
+      m_interface = interface;
+      m_output (packet, ipv6, interface);
+
+      uint32_t packetSizeNew = packet->GetSize ();
+      m_outputBytes (m_packetSizeOld, packetSizeNew);
+      m_packetSizeOld = packetSizeNew;
+    }
+}
+
+} // namespace ns3
diff -Naur ns-3.17/src/internet/model/ipv6-packet-probe.h ns-3.18/src/internet/model/ipv6-packet-probe.h
--- ns-3.17/src/internet/model/ipv6-packet-probe.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/internet/model/ipv6-packet-probe.h	2013-10-26 07:07:29.903364389 -0700
@@ -0,0 +1,125 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2011 Bucknell University
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Authors: L. Felipe Perrone (perrone@bucknell.edu)
+ *          Tiago G. Rodrigues (tgr002@bucknell.edu)
+ *
+ * Modified by: Mitch Watrous (watrous@u.washington.edu)
+ * Adapted to Ipv6 by: Tommaso Pecorella (tommaso.pecorella@unifi.it)
+ */
+
+#ifndef IPV6_PACKET_PROBE_H
+#define IPV6_PACKET_PROBE_H
+
+#include "ns3/object.h"
+#include "ns3/callback.h"
+#include "ns3/boolean.h"
+#include "ns3/nstime.h"
+#include "ns3/packet.h"
+#include "ns3/ipv6.h"
+#include "ns3/traced-value.h"
+#include "ns3/simulator.h"
+#include "ns3/probe.h"
+
+namespace ns3 {
+
+/**
+ * This class is designed to probe an underlying ns3 TraceSource
+ * exporting a packet, an IPv6 object, and an interface.  This probe
+ * exports a trace source "Output" with arguments of type Ptr<const Packet>,
+ * Ptr<Ipv6>, and uint32_t.  The Output trace source emits a value
+ * when either the trace source emits a new value, or when SetValue ()
+ * is called.
+ */
+class Ipv6PacketProbe : public Probe
+{
+public:
+  static TypeId GetTypeId ();
+  Ipv6PacketProbe ();
+  virtual ~Ipv6PacketProbe ();
+
+  /**
+   * \brief Set a probe value
+   *
+   * \param packet set the traced packet equal to this
+   * \param ipv6 set the IPv6 object for the traced packet equal to this
+   * \param interface set the IPv6 interface for the traced packet equal to this
+   */
+  void SetValue (Ptr<const Packet> packet, Ptr<Ipv6> ipv6, uint32_t interface);
+
+  /**
+   * \brief Set a probe value by its name in the Config system
+   *
+   * \param path config path to access the probe
+   * \param packet set the traced packet equal to this
+   * \param ipv6 set the IPv6 object for the traced packet equal to this
+   * \param interface set the IPv6 interface for the traced packet equal to this
+   */
+  static void SetValueByPath (std::string path, Ptr<const Packet> packet, Ptr<Ipv6> ipv6, uint32_t interface);
+
+  /**
+   * \brief connect to a trace source attribute provided by a given object
+   *
+   * \param traceSource the name of the attribute TraceSource to connect to
+   * \param obj ns3::Object to connect to
+   * \return true if the trace source was successfully connected
+   */
+  virtual bool ConnectByObject (std::string traceSource, Ptr<Object> obj);
+
+  /**
+   * \brief connect to a trace source provided by a config path
+   *
+   * \param path Config path to bind to
+   *
+   * Note, if an invalid path is provided, the probe will not be connected
+   * to anything.
+   */
+  virtual void ConnectByPath (std::string path);
+
+private:
+  /**
+   * \brief Method to connect to an underlying ns3::TraceSource with
+   * arguments of type Ptr<const Packet>, Ptr<Ipv6>, and uint32_t
+   *
+   * \param packet the traced packet
+   * \param ipv6 the IPv6 object for the traced packet
+   * \param interface the IPv6 interface for the traced packet
+   *
+   * \internal
+   */
+  void TraceSink (Ptr<const Packet> packet, Ptr<Ipv6> ipv6, uint32_t interface);
+
+  TracedCallback<Ptr<const Packet>, Ptr<Ipv6>, uint32_t> m_output;
+  TracedCallback<uint32_t, uint32_t> m_outputBytes;
+
+  /// The traced packet.
+  Ptr<const Packet> m_packet;
+
+  /// The IPv6 object for the traced packet.
+  Ptr<Ipv6> m_ipv6;
+
+  /// The IPv6 interface for the traced packet.
+  uint32_t m_interface;
+
+  /// The size of the traced packet.
+  uint32_t m_packetSizeOld;
+};
+
+
+} // namespace ns3
+
+#endif // IPV6_PACKET_PROBE_H
diff -Naur ns-3.17/src/internet/model/ipv6-pmtu-cache.cc ns-3.18/src/internet/model/ipv6-pmtu-cache.cc
--- ns-3.17/src/internet/model/ipv6-pmtu-cache.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/internet/model/ipv6-pmtu-cache.cc	2013-10-26 07:07:29.931364390 -0700
@@ -0,0 +1,116 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Universita' di Firenze
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Tommaso Pecorella <tommaso.pecorella@unifi.it>
+ */
+
+#include "ipv6-pmtu-cache.h"
+#include "ns3/log.h"
+#include "ns3/simulator.h"
+
+NS_LOG_COMPONENT_DEFINE ("Ipv6PmtuCache");
+
+namespace ns3 {
+
+NS_OBJECT_ENSURE_REGISTERED (Ipv6PmtuCache);
+
+TypeId Ipv6PmtuCache::GetTypeId ()
+{
+  static TypeId tid = TypeId ("ns3::Ipv6PmtuCache")
+    .SetParent<Object> ()
+    .AddAttribute ("CacheExpiryTime",
+                   "Validity time for a Path MTU entry. Default is 10 minutes, minimum is 5 minutes.",
+                   TimeValue (Seconds (60 * 10)),
+                   MakeTimeAccessor (&Ipv6PmtuCache::m_validityTime),
+                   MakeTimeChecker (Time (Seconds (60 * 5))))
+  ;
+  return tid;
+}
+
+Ipv6PmtuCache::Ipv6PmtuCache ()
+{
+}
+
+Ipv6PmtuCache::~Ipv6PmtuCache ()
+{
+}
+
+void Ipv6PmtuCache::DoDispose ()
+{
+  for (pathMtuTimerIter iter = m_pathMtuTimer.begin (); iter != m_pathMtuTimer.end (); iter++)
+    {
+      iter->second.Cancel ();
+    }
+  m_pathMtuTimer.clear ();
+  m_pathMtu.clear ();
+}
+
+uint32_t Ipv6PmtuCache::GetPmtu (Ipv6Address dst)
+{
+  NS_LOG_FUNCTION (this << dst);
+
+  if (m_pathMtu.find (dst) != m_pathMtu.end ())
+    {
+      return m_pathMtu[dst];
+    }
+  return 0;
+}
+
+void Ipv6PmtuCache::SetPmtu (Ipv6Address dst, uint32_t pmtu)
+{
+  NS_LOG_FUNCTION (this << dst << pmtu);
+
+  m_pathMtu[dst] = pmtu;
+  if (m_pathMtuTimer.find (dst) != m_pathMtuTimer.end ())
+    {
+      m_pathMtuTimer[dst].Cancel ();
+    }
+  EventId pMtuTimer;
+  pMtuTimer = Simulator::Schedule (m_validityTime, &Ipv6PmtuCache::ClearPmtu, this, dst);
+  m_pathMtuTimer[dst] = pMtuTimer;
+}
+
+Time Ipv6PmtuCache::GetPmtuValidityTime () const
+{
+  NS_LOG_FUNCTION (this);
+  return m_validityTime;
+}
+
+bool Ipv6PmtuCache::SetPmtuValidityTime (Time validity)
+{
+  NS_LOG_FUNCTION (this << validity);
+
+  if (validity > Seconds (60 * 5))
+    {
+      m_validityTime = validity;
+      return true;
+    }
+
+  NS_LOG_LOGIC ("rejecting a PMTU validity timer lesser than 5 minutes");
+  return false;
+}
+
+void Ipv6PmtuCache::ClearPmtu (Ipv6Address dst)
+{
+  NS_LOG_FUNCTION (this << dst);
+
+  m_pathMtu.erase (dst);
+  m_pathMtuTimer.erase (dst);
+}
+
+}
+
diff -Naur ns-3.17/src/internet/model/ipv6-pmtu-cache.h ns-3.18/src/internet/model/ipv6-pmtu-cache.h
--- ns-3.17/src/internet/model/ipv6-pmtu-cache.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/internet/model/ipv6-pmtu-cache.h	2013-10-26 07:07:29.903364389 -0700
@@ -0,0 +1,125 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Universita' di Firenze
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Tommaso Pecorella <tommaso.pecorella@unifi.it>
+ */
+
+#ifndef IPV6_PMTU_CACHE_H
+#define IPV6_PMTU_CACHE_H
+
+#include <map>
+
+#include "ns3/object.h"
+#include "ns3/nstime.h"
+#include "ns3/type-id.h"
+#include "ns3/event-id.h"
+#include "ns3/ipv6-address.h"
+
+namespace ns3 {
+
+/**
+ * \ingroup ipv6
+ * \brief This class implements the Path MTU cache, as defined by \RFC{1981}.
+ *
+ * The Path MTU is stored according to the destination address, and it is
+ * cleared upon expiration (default validity time is 10 minutes).
+ *
+ * The "infinite lifetime" PMTU entry type is not implemented, since it is
+ * useful only in an very limited number of cases. See the RFC for further
+ * details.
+ */
+
+class Ipv6PmtuCache : public Object
+{
+public:
+  class Entry;
+
+  /**
+   * \brief Get the type ID
+   * \return type ID
+   */
+  static TypeId GetTypeId ();
+
+  /**
+   * \brief Constructor.
+   */
+  Ipv6PmtuCache ();
+
+  /**
+   * \brief Destructor.
+   */
+  ~Ipv6PmtuCache ();
+
+  /**
+   * \brief Dispose object.
+   */
+  virtual void DoDispose ();
+
+  /**
+   * \brief Gets the known Path MTU for the specific destination
+   * \param dst the destination
+   * \return the Path MTU (zero if unknown)
+   */
+  uint32_t GetPmtu (Ipv6Address dst);
+
+  /**
+   * \brief Sets the Path MTU for the specific destination
+   * \param dst the destination
+   * \param pmtu the Path MTU
+   */
+  void SetPmtu (Ipv6Address dst, uint32_t pmtu);
+
+  /**
+   * \brief Gets the Path MTU validity time
+   * \return the Path MTU validity time
+   */
+  Time GetPmtuValidityTime () const;
+
+  /**
+   * \brief Sets the Path MTU validity time (minimum is 5 minutes)
+   * \param validity the Path MTU validity time
+   * \return true if the change was successful
+   */
+  bool SetPmtuValidityTime (Time validity);
+
+private:
+  /**
+   * \brief Clears the Path MTU for the specific destination
+   * \param dst the destination
+   */
+  void ClearPmtu (Ipv6Address dst);
+
+  /**
+   * \brief Path MTU table
+   */
+  std::map<Ipv6Address, uint32_t> m_pathMtu;
+
+  typedef std::map<Ipv6Address, EventId> ::iterator pathMtuTimerIter;
+  /**
+   * \brief Path MTU Expiration table
+   */
+  std::map<Ipv6Address, EventId> m_pathMtuTimer;
+
+  /**
+   * \brief Path MTU entry validity time
+   */
+  Time m_validityTime;
+};
+
+}
+
+#endif /* IPV6_PMTU_CACHE_H */
diff -Naur ns-3.17/src/internet/model/ipv6-raw-socket-impl.cc ns-3.18/src/internet/model/ipv6-raw-socket-impl.cc
--- ns-3.17/src/internet/model/ipv6-raw-socket-impl.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/ipv6-raw-socket-impl.cc	2013-10-26 07:07:29.915364390 -0700
@@ -244,7 +244,14 @@
                 }
             }
 
-          ipv6->Send (p, route->GetSource (), dst, m_protocol, route);
+          if (m_src.IsAny ())
+            {
+              ipv6->Send (p, route->GetSource (), dst, m_protocol, route);
+            }
+          else
+            {
+              ipv6->Send (p, m_src, dst, m_protocol, route);
+            }
           // Return only payload size (as Linux does).
           return p->GetSize () - hdr.GetSerializedSize ();
         }
diff -Naur ns-3.17/src/internet/model/ipv6-route.h ns-3.18/src/internet/model/ipv6-route.h
--- ns-3.17/src/internet/model/ipv6-route.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/ipv6-route.h	2013-10-26 07:07:29.903364389 -0700
@@ -200,6 +200,7 @@
    * \brief Get output TTL for this route.
    * \param oif outgoing interface
    * \return TTL for this route
+   * \deprecated
    */
   uint32_t GetOutputTtl (uint32_t oif) NS_DEPRECATED;
 
diff -Naur ns-3.17/src/internet/model/ipv6-routing-protocol.h ns-3.18/src/internet/model/ipv6-routing-protocol.h
--- ns-3.17/src/internet/model/ipv6-routing-protocol.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/ipv6-routing-protocol.h	2013-10-26 07:07:29.903364389 -0700
@@ -56,8 +56,8 @@
 public:
   static TypeId GetTypeId (void);
 
-  typedef Callback<void, Ptr<Ipv6Route>, Ptr<const Packet>, const Ipv6Header &> UnicastForwardCallback;
-  typedef Callback<void, Ptr<Ipv6MulticastRoute>, Ptr<const Packet>, const Ipv6Header &> MulticastForwardCallback;
+  typedef Callback<void, Ptr<const NetDevice>, Ptr<Ipv6Route>, Ptr<const Packet>, const Ipv6Header &> UnicastForwardCallback;
+  typedef Callback<void, Ptr<const NetDevice>, Ptr<Ipv6MulticastRoute>, Ptr<const Packet>, const Ipv6Header &> MulticastForwardCallback;
   typedef Callback<void, Ptr<const Packet>, const Ipv6Header &, uint32_t > LocalDeliverCallback;
   typedef Callback<void, Ptr<const Packet>, const Ipv6Header &, Socket::SocketErrno > ErrorCallback;
 
diff -Naur ns-3.17/src/internet/model/ipv6-static-routing.cc ns-3.18/src/internet/model/ipv6-static-routing.cc
--- ns-3.17/src/internet/model/ipv6-static-routing.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/ipv6-static-routing.cc	2013-10-26 07:07:29.927364390 -0700
@@ -97,6 +97,11 @@
 void Ipv6StaticRouting::AddHostRouteTo (Ipv6Address dst, Ipv6Address nextHop, uint32_t interface, Ipv6Address prefixToUse, uint32_t metric)
 {
   NS_LOG_FUNCTION (this << dst << nextHop << interface << prefixToUse << metric);
+  if (nextHop.IsLinkLocal())
+    {
+      NS_LOG_WARN ("Ipv6StaticRouting::AddHostRouteTo - Next hop should be link-local");
+    }
+
   AddNetworkRouteTo (dst, Ipv6Prefix::GetOnes (), nextHop, interface, prefixToUse, metric);
 }
 
@@ -117,6 +122,11 @@
 void Ipv6StaticRouting::AddNetworkRouteTo (Ipv6Address network, Ipv6Prefix networkPrefix, Ipv6Address nextHop, uint32_t interface, Ipv6Address prefixToUse, uint32_t metric)
 {
   NS_LOG_FUNCTION (this << network << networkPrefix << nextHop << interface << prefixToUse << metric);
+  if (nextHop.IsLinkLocal())
+    {
+      NS_LOG_WARN ("Ipv6StaticRouting::AddNetworkRouteTo - Next hop should be link-local");
+    }
+
   Ipv6RoutingTableEntry* route = new Ipv6RoutingTableEntry ();
   *route = Ipv6RoutingTableEntry::CreateNetworkRouteTo (network, networkPrefix, nextHop, interface, prefixToUse);
   m_networkRoutes.push_back (std::make_pair (route, metric));
@@ -302,7 +312,7 @@
                 }
               else if (route->GetDest ().IsAny ()) /* default route */
                 {
-                  rtentry->SetSource (SourceAddressSelection (interfaceIdx, route->GetPrefixToUse ().IsAny () ? route->GetGateway () : route->GetPrefixToUse ()));
+                  rtentry->SetSource (SourceAddressSelection (interfaceIdx, route->GetPrefixToUse ().IsAny () ? dst : route->GetPrefixToUse ()));
                 }
               else
                 {
@@ -555,7 +565,7 @@
       if (mrtentry)
         {
           NS_LOG_LOGIC ("Multicast route found");
-          mcb (mrtentry, p, header); // multicast forwarding callback
+          mcb (idev, mrtentry, p, header); // multicast forwarding callback
           return true;
         }
       else
@@ -565,7 +575,7 @@
         }
     }
 
-  // TODO:  Configurable option to enable RFC 1222 Strong End System Model
+  /// \todo  Configurable option to enable \RFC{1222} Strong End System Model
   // Right now, we will be permissive and allow a source to send us
   // a packet to one of our other interface addresses; that is, the
   // destination unicast address does not match one of the iif addresses,
@@ -607,7 +617,7 @@
   if (rtentry != 0)
     {
       NS_LOG_LOGIC ("Found unicast destination- calling unicast callback");
-      ucb (rtentry, p, header);  // unicast forwarding callback
+      ucb (idev, rtentry, p, header);  // unicast forwarding callback
       return true;
     }
   else
@@ -728,7 +738,7 @@
   NS_LOG_FUNCTION (this << dst << mask << nextHop << interface);
   if (dst != Ipv6Address::GetZero ())
     {
-      for (NetworkRoutesI j = m_networkRoutes.begin (); j != m_networkRoutes.end (); j++)
+      for (NetworkRoutesI j = m_networkRoutes.begin (); j != m_networkRoutes.end ();)
         {
           Ipv6RoutingTableEntry* rtentry = j->first;
           Ipv6Prefix prefix = rtentry->GetDestNetworkPrefix ();
@@ -737,7 +747,11 @@
           if (dst == entry && prefix == mask && rtentry->GetInterface () == interface)
             {
               delete j->first;
-              m_networkRoutes.erase (j);
+              j = m_networkRoutes.erase (j);
+            }
+          else
+            {
+              ++j;
             }
         }
     }
@@ -761,13 +775,14 @@
       return ret;
     }
 
-  /* useally IPv6 interfaces have one link-local address and one global address */
+  /* usually IPv6 interfaces have one link-local address and one global address */
 
   for (uint32_t i = 1; i < m_ipv6->GetNAddresses (interface); i++)
     {
       Ipv6InterfaceAddress test = m_ipv6->GetAddress (interface, i);
+      Ipv6InterfaceAddress dst(dest);
 
-      if (test.GetAddress ().CombinePrefix (test.GetPrefix ()) == dest.CombinePrefix (test.GetPrefix ()))
+      if (test.GetScope() == dst.GetScope())
         {
           return test.GetAddress ();
         }
diff -Naur ns-3.17/src/internet/model/ipv6-static-routing.h ns-3.18/src/internet/model/ipv6-static-routing.h
--- ns-3.17/src/internet/model/ipv6-static-routing.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/ipv6-static-routing.h	2013-10-26 07:07:29.907364389 -0700
@@ -74,7 +74,7 @@
   /**
    * \brief Add route to host.
    * \param dest destination address
-   * \param nextHop next hop address to route the packet
+   * \param nextHop next hop address to route the packet.
    * \param interface interface index
    * \param prefixToUse prefix that should be used for source address for this destination
    * \param metric metric of route in case of multiple routes to same destination
@@ -103,7 +103,7 @@
    * \brief Add route to network.
    * \param network network address
    * \param networkPrefix network prefix*
-   * \param nextHop next hop address to route the packet
+   * \param nextHop next hop address to route the packet.
    * \param interface interface index
    * \param prefixToUse prefix that should be used for source address for this destination
    * \param metric metric of route in case of multiple routes to same destination
diff -Naur ns-3.17/src/internet/model/ndisc-cache.cc ns-3.18/src/internet/model/ndisc-cache.cc
--- ns-3.17/src/internet/model/ndisc-cache.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/ndisc-cache.cc	2013-10-26 07:07:29.907364389 -0700
@@ -182,7 +182,7 @@
   if (m_waiting.size () >= m_ndCache->GetUnresQlen ())
     {
       /* we store only m_unresQlen packet => first packet in first packet remove */
-      /* XXX report packet as 'dropped' */
+      /** \todo report packet as 'dropped' */
       m_waiting.remove (0);
     }
   m_waiting.push_back (p);
@@ -191,7 +191,7 @@
 void NdiscCache::Entry::ClearWaitingPacket ()
 {
   NS_LOG_FUNCTION_NOARGS ();
-  /* XXX report packets as 'dropped' */
+  /** \todo report packets as 'dropped' */
   m_waiting.clear ();
 }
 
diff -Naur ns-3.17/src/internet/model/nsc-tcp-l4-protocol.cc ns-3.18/src/internet/model/nsc-tcp-l4-protocol.cc
--- ns-3.17/src/internet/model/nsc-tcp-l4-protocol.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/nsc-tcp-l4-protocol.cc	2013-10-26 07:07:29.927364390 -0700
@@ -114,7 +114,7 @@
 
 int external_rand ()
 {
-  return 1;   // TODO
+  return 1;   /// \todo
 }
 
 NscTcpL4Protocol::NscTcpL4Protocol ()
@@ -384,7 +384,7 @@
 
 void NscTcpL4Protocol::wakeup ()
 {
-  // TODO
+  /// \todo
   // this should schedule a timer to read from all tcp sockets now... this is
   // an indication that data might be waiting on the socket
 
@@ -450,7 +450,7 @@
           // IP address of the subnet but this was found to fail for
           // some use cases in /30 subnets.
 
-          // XXX
+          /// \todo \bugid{1398} NSC's limitation to single-interface nodes
           m_nscStack->add_default_gateway (addrOss.str ().c_str ());
         }
     }
diff -Naur ns-3.17/src/internet/model/nsc-tcp-socket-impl.cc ns-3.18/src/internet/model/nsc-tcp-socket-impl.cc
--- ns-3.17/src/internet/model/nsc-tcp-socket-impl.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/nsc-tcp-socket-impl.cc	2013-10-26 07:07:29.907364389 -0700
@@ -843,7 +843,7 @@
     case NSC_EAGAIN: return ERROR_AGAIN;
     case NSC_EISCONN:   // fallthrough
     case NSC_EALREADY: return ERROR_ISCONN;
-    case NSC_ECONNREFUSED: return ERROR_NOROUTETOHOST;   // XXX, better mapping?
+    case NSC_ECONNREFUSED: return ERROR_NOROUTETOHOST;   /// \todo better mapping?
     case NSC_ECONNRESET:   // for no, all of these fall through
     case NSC_EHOSTDOWN:
     case NSC_ENETUNREACH:
@@ -851,7 +851,7 @@
     case NSC_EMSGSIZE: return ERROR_MSGSIZE;
     case NSC_ENOTCONN: return ERROR_NOTCONN;
     case NSC_ESHUTDOWN: return ERROR_SHUTDOWN;
-    case NSC_ETIMEDOUT: return ERROR_NOTCONN;   // XXX - this mapping isn't correct
+    case NSC_ETIMEDOUT: return ERROR_NOTCONN;   /// \todo this mapping isn't correct
     case NSC_ENOTDIR:   // used by eg. sysctl(2). Shouldn't happen normally,
     // but is triggered by e.g. show_config().
     case NSC_EUNKNOWN: return ERROR_INVAL;   // Catches stacks that 'return -1' without real mapping
diff -Naur ns-3.17/src/internet/model/nsc-tcp-socket-impl.h ns-3.18/src/internet/model/nsc-tcp-socket-impl.h
--- ns-3.17/src/internet/model/nsc-tcp-socket-impl.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/nsc-tcp-socket-impl.h	2013-10-26 07:07:29.915364390 -0700
@@ -102,7 +102,7 @@
   void ConnectionSucceeded ();
 
   // Manage data tx/rx
-  // XXX This should be virtual and overridden
+  /// \todo This should be virtual and overridden
   Ptr<NscTcpSocketImpl> Copy ();
 
   // attribute related
diff -Naur ns-3.17/src/internet/model/pending-data.cc ns-3.18/src/internet/model/pending-data.cc
--- ns-3.17/src/internet/model/pending-data.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/pending-data.cc	2013-10-26 07:07:29.931364390 -0700
@@ -103,14 +103,7 @@
 void PendingData::Add (uint32_t s, const uint8_t* d)
 {
   NS_LOG_FUNCTION (this << s);
-  if (d == 0)
-    {
-      data.push_back (Create<Packet> (d,s));
-    }
-  else
-    {
-      data.push_back (Create<Packet> (s));
-    }
+  data.push_back (Create<Packet> (d,s));
   size += s;
 }
 
@@ -131,7 +124,7 @@
 uint32_t PendingData::SizeFromOffset (uint32_t offset)
 { // Find out how much data is available from offset
   NS_LOG_FUNCTION (this << offset);
-  // XXX should this return zero, or error out?
+  /// \todo should this return zero, or error out?
   if (offset > size) return 0;     // No data at requested offset
   return size - offset;            // Available data after offset
 }
diff -Naur ns-3.17/src/internet/model/tcp-header.h ns-3.18/src/internet/model/tcp-header.h
--- ns-3.17/src/internet/model/tcp-header.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/tcp-header.h	2013-10-26 07:07:29.923364390 -0700
@@ -47,7 +47,9 @@
   virtual ~TcpHeader ();
 
   /**
-   * \brief Enable checksum calculation for TCP (XXX currently has no effect)
+   * \brief Enable checksum calculation for TCP
+   *
+   * \todo currently has no effect
    */
   void EnableChecksums (void);
 //Setters
diff -Naur ns-3.17/src/internet/model/tcp-l4-protocol.cc ns-3.18/src/internet/model/tcp-l4-protocol.cc
--- ns-3.17/src/internet/model/tcp-l4-protocol.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/tcp-l4-protocol.cc	2013-10-26 07:07:29.923364390 -0700
@@ -188,6 +188,7 @@
   socket->SetNode (m_node);
   socket->SetTcp (this);
   socket->SetRtt (rtt);
+  m_sockets.push_back (socket);
   return socket;
 }
 
@@ -611,7 +612,8 @@
 
   TcpHeader outgoingHeader = outgoing;
   outgoingHeader.SetLength (5); //header length in units of 32bit words
-  /* outgoingHeader.SetUrgentPointer (0); //XXX */
+  /** \todo UrgentPointer */
+  /* outgoingHeader.SetUrgentPointer (0); */
   if(Node::ChecksumEnabled ())
     {
       outgoingHeader.EnableChecksums ();
@@ -662,7 +664,8 @@
     }
   TcpHeader outgoingHeader = outgoing;
   outgoingHeader.SetLength (5); //header length in units of 32bit words
-  /* outgoingHeader.SetUrgentPointer (0); //XXX */
+  /** \todo UrgentPointer */
+  /* outgoingHeader.SetUrgentPointer (0); */
   if(Node::ChecksumEnabled ())
     {
       outgoingHeader.EnableChecksums ();
diff -Naur ns-3.17/src/internet/model/tcp-newreno.h ns-3.18/src/internet/model/tcp-newreno.h
--- ns-3.17/src/internet/model/tcp-newreno.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/tcp-newreno.h	2013-10-26 07:07:29.931364390 -0700
@@ -31,7 +31,7 @@
  *
  * \brief An implementation of a stream socket using TCP.
  *
- * This class contains the NewReno implementation of TCP, as of RFC2582.
+ * This class contains the NewReno implementation of TCP, as of \RFC{2582}.
  */
 class TcpNewReno : public TcpSocketBase
 {
diff -Naur ns-3.17/src/internet/model/tcp-reno.h ns-3.18/src/internet/model/tcp-reno.h
--- ns-3.17/src/internet/model/tcp-reno.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/tcp-reno.h	2013-10-26 07:07:29.923364390 -0700
@@ -31,7 +31,7 @@
  *
  * \brief An implementation of a stream socket using TCP.
  *
- * This class contains the Reno implementation of TCP, according to RFC2581,
+ * This class contains the Reno implementation of TCP, according to \RFC{2581},
  * except sec.4.1 "re-starting idle connections", which we do not detect for
  * idleness and thus no slow start upon resumption.
  */
diff -Naur ns-3.17/src/internet/model/tcp-rfc793.h ns-3.18/src/internet/model/tcp-rfc793.h
--- ns-3.17/src/internet/model/tcp-rfc793.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/tcp-rfc793.h	2013-10-26 07:07:29.915364390 -0700
@@ -31,7 +31,7 @@
  *
  * \brief An implementation of a stream socket using TCP.
  *
- * This class contains an RFC793 implementation of TCP, as well as a sockets
+ * This class contains an \RFC{793} implementation of TCP, as well as a sockets
  * interface for talking to TCP.  This serves as a base for other TCP functions
  * where the sliding window mechanism is handled here.  This class provides
  * connection orientation and sliding window flow control.
diff -Naur ns-3.17/src/internet/model/tcp-socket-base.cc ns-3.18/src/internet/model/tcp-socket-base.cc
--- ns-3.17/src/internet/model/tcp-socket-base.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/tcp-socket-base.cc	2013-10-26 07:07:29.919364390 -0700
@@ -446,8 +446,9 @@
 TcpSocketBase::Close (void)
 {
   NS_LOG_FUNCTION (this);
-  // First we check to see if there is any unread rx data
-  // Bug number 426 claims we should send reset in this case.
+  /// \internal
+  /// First we check to see if there is any unread rx data.
+  /// \bugid{426} claims we should send reset in this case.
   if (m_rxBuffer.Size () != 0)
     {
       NS_LOG_INFO ("Socket " << this << " << unread rx data during close.  Sending reset");
diff -Naur ns-3.17/src/internet/model/tcp-tahoe.h ns-3.18/src/internet/model/tcp-tahoe.h
--- ns-3.17/src/internet/model/tcp-tahoe.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/tcp-tahoe.h	2013-10-26 07:07:29.915364390 -0700
@@ -37,7 +37,7 @@
  * http://inst.eecs.berkeley.edu/~ee122/fa05/projects/Project2/proj2_spec_files/sacks.pdf
  * In summary, we have slow start, congestion avoidance, and fast retransmit.
  * The implementation of these algorithms are based on W. R. Stevens's book and
- * also RFC2001.
+ * also \RFC{2001}.
  */
 class TcpTahoe : public TcpSocketBase
 {
diff -Naur ns-3.17/src/internet/model/udp-socket-factory-impl.h ns-3.18/src/internet/model/udp-socket-factory-impl.h
--- ns-3.17/src/internet/model/udp-socket-factory-impl.h	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/udp-socket-factory-impl.h	2013-10-26 07:07:29.903364389 -0700
@@ -32,7 +32,7 @@
  * \defgroup udp Udp
  *
  * This  is  an  implementation of the User Datagram Protocol described in
- * RFC 768.  It implements a connectionless,  unreliable  datagram  packet
+ * \RFC{768}.  It implements a connectionless,  unreliable  datagram  packet
  * service.   Packets  may  be reordered or duplicated before they arrive.
  * UDP generates and checks checksums to catch transmission errors.
  *
diff -Naur ns-3.17/src/internet/model/udp-socket-impl.cc ns-3.18/src/internet/model/udp-socket-impl.cc
--- ns-3.17/src/internet/model/udp-socket-impl.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/model/udp-socket-impl.cc	2013-10-26 07:07:29.931364390 -0700
@@ -86,7 +86,7 @@
 {
   NS_LOG_FUNCTION_NOARGS ();
 
-  // XXX todo:  leave any multicast groups that have been joined
+  /// \todo  leave any multicast groups that have been joined
   m_node = 0;
   /**
    * Note: actually this function is called AFTER
@@ -734,8 +734,10 @@
   return 0;
 }
 
-// XXX maximum message size for UDP broadcast is limited by MTU
+
+//  maximum message size for UDP broadcast is limited by MTU
 // size of underlying link; we are not checking that now.
+/// \todo Check MTU size of underlying link
 uint32_t
 UdpSocketImpl::GetTxAvailable (void) const
 {
diff -Naur ns-3.17/src/internet/test/global-route-manager-impl-test-suite.cc ns-3.18/src/internet/test/global-route-manager-impl-test-suite.cc
--- ns-3.17/src/internet/test/global-route-manager-impl-test-suite.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/test/global-route-manager-impl-test-suite.cc	2013-10-26 07:07:29.959364391 -0700
@@ -200,7 +200,7 @@
 
   Simulator::Run ();
 
-// XXX here we should do some verification of the routes built
+/// \todo here we should do some verification of the routes built
 
   Simulator::Destroy ();
 
@@ -208,7 +208,7 @@
   // all of the LSAs, which each destroys the attached LinkRecords.
   delete srm;
 
-  // XXX
+  /// \todo Testing
   // No testing has actually been done other than making sure that this code
   // does not crash
 }
diff -Naur ns-3.17/src/internet/test/ipv4-address-generator-test-suite.cc ns-3.18/src/internet/test/ipv4-address-generator-test-suite.cc
--- ns-3.17/src/internet/test/ipv4-address-generator-test-suite.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/test/ipv4-address-generator-test-suite.cc	2013-10-26 07:07:29.959364391 -0700
@@ -46,30 +46,30 @@
   Ipv4AddressGenerator::Init (Ipv4Address ("1.0.0.0"), Ipv4Mask ("255.0.0.0"),
                               Ipv4Address ("0.0.0.0"));
   network = Ipv4AddressGenerator::GetNetwork (Ipv4Mask ("255.0.0.0"));
-  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("1.0.0.0"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("1.0.0.0"), "001");
   network = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.0.0.0"));
-  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("2.0.0.0"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("2.0.0.0"), "001");
 
   Ipv4AddressGenerator::Init (Ipv4Address ("0.1.0.0"),
                               Ipv4Mask ("255.255.0.0"), Ipv4Address ("0.0.0.0"));
   network = Ipv4AddressGenerator::GetNetwork (Ipv4Mask ("255.255.0.0"));
-  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.1.0.0"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.1.0.0"), "003");
   network = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.255.0.0"));
-  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.2.0.0"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.2.0.0"), "004");
 
   Ipv4AddressGenerator::Init (Ipv4Address ("0.0.1.0"),
                               Ipv4Mask ("255.255.255.0"), Ipv4Address ("0.0.0.0"));
   network = Ipv4AddressGenerator::GetNetwork (Ipv4Mask ("255.255.255.0"));
-  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.0.1.0"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.0.1.0"), "005");
   network = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.255.255.0"));
-  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.0.2.0"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.0.2.0"), "006");
 
   network = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.0.0.0"));
-  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("3.0.0.0"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("3.0.0.0"), "007");
   network = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.255.0.0"));
-  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.3.0.0"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.3.0.0"), "008");
   network = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.255.255.0"));
-  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.0.3.0"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.0.3.0"), "009");
 }
 
 class AddressAllocatorTestCase : public TestCase
@@ -94,23 +94,23 @@
   Ipv4AddressGenerator::Init (Ipv4Address ("1.0.0.0"), Ipv4Mask ("255.0.0.0"),
                               Ipv4Address ("0.0.0.3"));
   address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.0.0.0"));
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("1.0.0.3"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("1.0.0.3"), "100");
   address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.0.0.0"));
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("1.0.0.4"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("1.0.0.4"), "101");
 
   Ipv4AddressGenerator::Init (Ipv4Address ("0.1.0.0"),
                               Ipv4Mask ("255.255.0.0"), Ipv4Address ("0.0.0.3"));
   address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.0.0"));
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.1.0.3"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.1.0.3"), "102");
   address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.0.0"));
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.1.0.4"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.1.0.4"), "103");
 
   Ipv4AddressGenerator::Init (Ipv4Address ("0.0.1.0"),
                               Ipv4Mask ("255.255.255.0"), Ipv4Address ("0.0.0.3"));
   address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.255.0"));
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.1.3"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.1.3"), "104");
   address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.255.0"));
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.1.4"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.1.4"), "105");
 }
 
 void 
@@ -150,38 +150,38 @@
   Ipv4AddressGenerator::Init (Ipv4Address ("3.0.0.0"), Ipv4Mask ("255.0.0.0"),
                               Ipv4Address ("0.0.0.3"));
   address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.0.0.0"));
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("3.0.0.3"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("3.0.0.3"), "200");
   address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.0.0.0"));
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("3.0.0.4"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("3.0.0.4"), "201");
 
   network = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.0.0.0"));
-  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("4.0.0.0"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("4.0.0.0"), "202");
   address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.0.0.0"));
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("4.0.0.5"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("4.0.0.5"), "203");
 
   Ipv4AddressGenerator::Init (Ipv4Address ("0.3.0.0"), 
                               Ipv4Mask ("255.255.0.0"), Ipv4Address ("0.0.0.3"));
   address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.0.0"));
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.3.0.3"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.3.0.3"), "204");
   address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.0.0"));
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.3.0.4"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.3.0.4"), "205");
 
   network = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.255.0.0"));
-  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.4.0.0"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.4.0.0"), "206");
   address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.0.0"));
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.4.0.5"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.4.0.5"), "207");
 
   Ipv4AddressGenerator::Init (Ipv4Address ("0.0.3.0"),
                               Ipv4Mask ("255.255.255.0"), Ipv4Address ("0.0.0.3"));
   address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.255.0"));
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.3.3"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.3.3"), "208");
   address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.255.0"));
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.3.4"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.3.4"), "209");
 
   network = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.255.255.0"));
-  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.0.4.0"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.0.4.0"), "210");
   address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.255.0"));
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.4.5"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.4.5"), "211");
 }
 
 class ExampleAddressGeneratorTestCase : public TestCase
@@ -215,11 +215,11 @@
   Ipv4AddressGenerator::Init (Ipv4Address ("192.168.0.0"),
                               Ipv4Mask ("255.255.255.0"), Ipv4Address ("0.0.0.3"));
   address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.255.0"));
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("192.168.0.3"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("192.168.0.3"), "300");
   address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.255.0"));
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("192.168.0.4"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("192.168.0.4"), "301");
   address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.255.0"));
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("192.168.0.5"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("192.168.0.5"), "302");
   //
   // Allocate the next network out of our /24 network (this should be 
   // 192.168.1.0) and begin allocating with IP address 0.0.0.3 out of that
@@ -233,7 +233,7 @@
   // is 192.168.1.3, of course.
   //
   address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.255.0"));
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("192.168.1.3"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("192.168.1.3"), "304");
 }
 
 class AddressCollisionTestCase : public TestCase
@@ -286,19 +286,19 @@
 
   Ipv4AddressGenerator::TestMode ();
   bool added = Ipv4AddressGenerator::AddAllocated ("0.0.0.21");
-  NS_TEST_EXPECT_MSG_EQ (added, true, "XXX");
+  NS_TEST_EXPECT_MSG_EQ (added, true, "400");
 
   added = Ipv4AddressGenerator::AddAllocated ("0.0.0.4");
-  NS_TEST_EXPECT_MSG_EQ (added, false, "XXX");
+  NS_TEST_EXPECT_MSG_EQ (added, false, "401");
 
   added = Ipv4AddressGenerator::AddAllocated ("0.0.0.9");
-  NS_TEST_EXPECT_MSG_EQ (added, false, "XXX");
+  NS_TEST_EXPECT_MSG_EQ (added, false, "402");
 
   added = Ipv4AddressGenerator::AddAllocated ("0.0.0.16");
-  NS_TEST_EXPECT_MSG_EQ (added, false, "XXX");
+  NS_TEST_EXPECT_MSG_EQ (added, false, "403");
 
   added = Ipv4AddressGenerator::AddAllocated ("0.0.0.21");
-  NS_TEST_EXPECT_MSG_EQ (added, false, "XXX");
+  NS_TEST_EXPECT_MSG_EQ (added, false, "404");
 }
 
 
diff -Naur ns-3.17/src/internet/test/ipv4-address-helper-test-suite.cc ns-3.18/src/internet/test/ipv4-address-helper-test-suite.cc
--- ns-3.17/src/internet/test/ipv4-address-helper-test-suite.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/test/ipv4-address-helper-test-suite.cc	2013-10-26 07:07:29.959364391 -0700
@@ -52,21 +52,21 @@
 
   h.SetBase ("1.0.0.0", "255.0.0.0");
   network = h.NewNetwork ();
-  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("2.0.0.0"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("2.0.0.0"), "100");
   address = h.NewAddress ();
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("2.0.0.1"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("2.0.0.1"), "101");
 
   h.SetBase ("0.1.0.0", "255.255.0.0");
   network = h.NewNetwork ();
-  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.2.0.0"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.2.0.0"), "102");
   address = h.NewAddress ();
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.2.0.1"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.2.0.1"), "103");
 
   h.SetBase ("0.0.1.0", "255.255.255.0");
   network = h.NewNetwork ();
-  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.0.2.0"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.0.2.0"), "104");
   address = h.NewAddress ();
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.2.1"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.2.1"), "105");
 }
 
 class AddressAllocatorHelperTestCase : public TestCase
@@ -99,21 +99,21 @@
 
   h.SetBase ("1.0.0.0", "255.0.0.0", "0.0.0.3");
   address = h.NewAddress ();
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("1.0.0.3"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("1.0.0.3"), "200");
   address = h.NewAddress ();
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("1.0.0.4"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("1.0.0.4"), "201");
 
   h.SetBase ("0.1.0.0", "255.255.0.0", "0.0.0.3");
   address = h.NewAddress ();
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.1.0.3"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.1.0.3"), "202");
   address = h.NewAddress ();
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.1.0.4"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.1.0.4"), "203");
 
   h.SetBase ("0.0.1.0", "255.255.255.0", "0.0.0.3");
   address = h.NewAddress ();
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.1.3"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.1.3"), "204");
   address = h.NewAddress ();
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.1.4"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.1.4"), "205");
 }
 
 class ResetAllocatorHelperTestCase : public TestCase
@@ -143,33 +143,33 @@
 
   h.SetBase ("1.0.0.0", "255.0.0.0", "0.0.0.3");
   address = h.NewAddress ();
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("1.0.0.3"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("1.0.0.3"), "301");
   address = h.NewAddress ();
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("1.0.0.4"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("1.0.0.4"), "302");
   network = h.NewNetwork ();
-  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("2.0.0.0"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("2.0.0.0"), "303");
   address = h.NewAddress ();
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("2.0.0.3"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("2.0.0.3"), "304");
 
   h.SetBase ("0.1.0.0", "255.255.0.0", "0.0.0.3");
   address = h.NewAddress ();
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.1.0.3"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.1.0.3"), "305");
   address = h.NewAddress ();
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.1.0.4"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.1.0.4"), "306");
   network = h.NewNetwork ();
-  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.2.0.0"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.2.0.0"), "307");
   address = h.NewAddress ();
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.2.0.3"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.2.0.3"), "308");
 
   h.SetBase ("0.0.1.0", "255.255.255.0", "0.0.0.3");
   address = h.NewAddress ();
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.1.3"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.1.3"), "309");
   address = h.NewAddress ();
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.1.4"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.1.4"), "310");
   network = h.NewNetwork ();
-  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.0.2.0"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.0.2.0"), "311");
   address = h.NewAddress ();
-  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.2.3"), "XXX");
+  NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.2.3"), "312");
 }
 
 void
diff -Naur ns-3.17/src/internet/test/ipv4-forwarding-test.cc ns-3.18/src/internet/test/ipv4-forwarding-test.cc
--- ns-3.17/src/internet/test/ipv4-forwarding-test.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/internet/test/ipv4-forwarding-test.cc	2013-10-26 07:07:29.963364391 -0700
@@ -0,0 +1,221 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Universita' di Firenze
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Tommaso Pecorella <tommaso.pecorella@unifi.it>
+ */
+
+#include "ns3/test.h"
+#include "ns3/socket-factory.h"
+#include "ns3/udp-socket-factory.h"
+#include "ns3/simulator.h"
+#include "ns3/simple-channel.h"
+#include "ns3/simple-net-device.h"
+#include "ns3/drop-tail-queue.h"
+#include "ns3/socket.h"
+#include "ns3/boolean.h"
+
+#include "ns3/log.h"
+#include "ns3/node.h"
+#include "ns3/inet-socket-address.h"
+
+#include "ns3/arp-l3-protocol.h"
+#include "ns3/ipv4-l3-protocol.h"
+#include "ns3/icmpv4-l4-protocol.h"
+#include "ns3/udp-l4-protocol.h"
+#include "ns3/ipv4-static-routing.h"
+
+#include <string>
+#include <limits>
+
+using namespace ns3;
+
+static void
+AddInternetStack (Ptr<Node> node)
+{
+  //ARP
+  Ptr<ArpL3Protocol> arp = CreateObject<ArpL3Protocol> ();
+  node->AggregateObject (arp);
+  //IPV4
+  Ptr<Ipv4L3Protocol> ipv4 = CreateObject<Ipv4L3Protocol> ();
+  //Routing for Ipv4
+  Ptr<Ipv4StaticRouting> ipv4Routing = CreateObject<Ipv4StaticRouting> ();
+  ipv4->SetRoutingProtocol (ipv4Routing);
+  node->AggregateObject (ipv4);
+  node->AggregateObject (ipv4Routing);
+  //ICMP
+  Ptr<Icmpv4L4Protocol> icmp = CreateObject<Icmpv4L4Protocol> ();
+  node->AggregateObject (icmp);
+  //UDP
+  Ptr<UdpL4Protocol> udp = CreateObject<UdpL4Protocol> ();
+  node->AggregateObject (udp);
+}
+
+
+class Ipv4ForwardingTest : public TestCase
+{
+  Ptr<Packet> m_receivedPacket;
+  void DoSendData (Ptr<Socket> socket, std::string to);
+  void SendData (Ptr<Socket> socket, std::string to);
+
+public:
+  virtual void DoRun (void);
+  Ipv4ForwardingTest ();
+
+  void ReceivePkt (Ptr<Socket> socket);
+};
+
+Ipv4ForwardingTest::Ipv4ForwardingTest ()
+  : TestCase ("UDP socket implementation") 
+{
+}
+
+void Ipv4ForwardingTest::ReceivePkt (Ptr<Socket> socket)
+{
+  uint32_t availableData;
+  availableData = socket->GetRxAvailable ();
+  m_receivedPacket = socket->Recv (std::numeric_limits<uint32_t>::max (), 0);
+  NS_ASSERT (availableData == m_receivedPacket->GetSize ());
+}
+
+void
+Ipv4ForwardingTest::DoSendData (Ptr<Socket> socket, std::string to)
+{
+  Address realTo = InetSocketAddress (Ipv4Address (to.c_str ()), 1234);
+  NS_TEST_EXPECT_MSG_EQ (socket->SendTo (Create<Packet> (123), 0, realTo),
+                         123, "100");
+}
+
+void
+Ipv4ForwardingTest::SendData (Ptr<Socket> socket, std::string to)
+{
+  m_receivedPacket = Create<Packet> ();
+  Simulator::ScheduleWithContext (socket->GetNode ()->GetId (), Seconds (0),
+                                  &Ipv4ForwardingTest::DoSendData, this, socket, to);
+  Simulator::Run ();
+}
+
+void
+Ipv4ForwardingTest::DoRun (void)
+{
+  // Create topology
+
+  // Receiver Node
+  Ptr<Node> rxNode = CreateObject<Node> ();
+  AddInternetStack (rxNode);
+  Ptr<SimpleNetDevice> rxDev;
+  { // first interface
+    rxDev = CreateObject<SimpleNetDevice> ();
+    rxDev->SetAddress (Mac48Address::ConvertFrom (Mac48Address::Allocate ()));
+    rxNode->AddDevice (rxDev);
+    Ptr<Ipv4> ipv4 = rxNode->GetObject<Ipv4> ();
+    uint32_t netdev_idx = ipv4->AddInterface (rxDev);
+    Ipv4InterfaceAddress ipv4Addr = Ipv4InterfaceAddress (Ipv4Address ("10.0.0.2"), Ipv4Mask (0xffff0000U));
+    ipv4->AddAddress (netdev_idx, ipv4Addr);
+    ipv4->SetUp (netdev_idx);
+  }
+
+  // Forwarding Node
+  Ptr<Node> fwNode = CreateObject<Node> ();
+  AddInternetStack (fwNode);
+  Ptr<SimpleNetDevice> fwDev1, fwDev2;
+  { // first interface
+    fwDev1 = CreateObject<SimpleNetDevice> ();
+    fwDev1->SetAddress (Mac48Address::ConvertFrom (Mac48Address::Allocate ()));
+    fwNode->AddDevice (fwDev1);
+    Ptr<Ipv4> ipv4 = fwNode->GetObject<Ipv4> ();
+    uint32_t netdev_idx = ipv4->AddInterface (fwDev1);
+    Ipv4InterfaceAddress ipv4Addr = Ipv4InterfaceAddress (Ipv4Address ("10.0.0.1"), Ipv4Mask (0xffff0000U));
+    ipv4->AddAddress (netdev_idx, ipv4Addr);
+    ipv4->SetUp (netdev_idx);
+  }
+
+  { // second interface
+    fwDev2 = CreateObject<SimpleNetDevice> ();
+    fwDev2->SetAddress (Mac48Address::ConvertFrom (Mac48Address::Allocate ()));
+    fwNode->AddDevice (fwDev2);
+    Ptr<Ipv4> ipv4 = fwNode->GetObject<Ipv4> ();
+    uint32_t netdev_idx = ipv4->AddInterface (fwDev2);
+    Ipv4InterfaceAddress ipv4Addr = Ipv4InterfaceAddress (Ipv4Address ("10.1.0.1"), Ipv4Mask (0xffff0000U));
+    ipv4->AddAddress (netdev_idx, ipv4Addr);
+    ipv4->SetUp (netdev_idx);
+  }
+
+  // Sender Node
+  Ptr<Node> txNode = CreateObject<Node> ();
+  AddInternetStack (txNode);
+  Ptr<SimpleNetDevice> txDev;
+  {
+    txDev = CreateObject<SimpleNetDevice> ();
+    txDev->SetAddress (Mac48Address::ConvertFrom (Mac48Address::Allocate ()));
+    txNode->AddDevice (txDev);
+    Ptr<Ipv4> ipv4 = txNode->GetObject<Ipv4> ();
+    uint32_t netdev_idx = ipv4->AddInterface (txDev);
+    Ipv4InterfaceAddress ipv4Addr = Ipv4InterfaceAddress (Ipv4Address ("10.1.0.2"), Ipv4Mask (0xffff0000U));
+    ipv4->AddAddress (netdev_idx, ipv4Addr);
+    ipv4->SetUp (netdev_idx);
+    Ptr<Ipv4StaticRouting> ipv4StaticRouting = txNode->GetObject<Ipv4StaticRouting> ();
+    ipv4StaticRouting->SetDefaultRoute(Ipv4Address("10.1.0.1"), netdev_idx);
+  }
+
+  // link the two nodes
+  Ptr<SimpleChannel> channel1 = CreateObject<SimpleChannel> ();
+  rxDev->SetChannel (channel1);
+  fwDev1->SetChannel (channel1);
+
+  Ptr<SimpleChannel> channel2 = CreateObject<SimpleChannel> ();
+  fwDev2->SetChannel (channel2);
+  txDev->SetChannel (channel2);
+
+  // Create the UDP sockets
+  Ptr<SocketFactory> rxSocketFactory = rxNode->GetObject<UdpSocketFactory> ();
+  Ptr<Socket> rxSocket = rxSocketFactory->CreateSocket ();
+  NS_TEST_EXPECT_MSG_EQ (rxSocket->Bind (InetSocketAddress (Ipv4Address ("10.0.0.2"), 1234)), 0, "trivial");
+  rxSocket->SetRecvCallback (MakeCallback (&Ipv4ForwardingTest::ReceivePkt, this));
+
+  Ptr<SocketFactory> txSocketFactory = txNode->GetObject<UdpSocketFactory> ();
+  Ptr<Socket> txSocket = txSocketFactory->CreateSocket ();
+  txSocket->SetAllowBroadcast (true);
+
+  // ------ Now the tests ------------
+
+  // Unicast test
+  SendData (txSocket, "10.0.0.2");
+  NS_TEST_EXPECT_MSG_EQ (m_receivedPacket->GetSize (), 123, "IPv4 Forwarding on");
+
+  m_receivedPacket->RemoveAllByteTags ();
+  m_receivedPacket = 0;
+
+  Ptr<Ipv4> ipv4 = fwNode->GetObject<Ipv4> ();
+  ipv4->SetAttribute("IpForward", BooleanValue (false));
+  SendData (txSocket, "10.0.0.2");
+  NS_TEST_EXPECT_MSG_EQ (m_receivedPacket->GetSize (), 0, "IPv4 Forwarding off");
+
+  Simulator::Destroy ();
+
+}
+
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+class Ipv4ForwardingTestSuite : public TestSuite
+{
+public:
+  Ipv4ForwardingTestSuite () : TestSuite ("ipv4-forwarding", UNIT)
+  {
+    AddTestCase (new Ipv4ForwardingTest, TestCase::QUICK);
+  }
+} g_ipv4forwardingTestSuite;
diff -Naur ns-3.17/src/internet/test/ipv4-header-test.cc ns-3.18/src/internet/test/ipv4-header-test.cc
--- ns-3.17/src/internet/test/ipv4-header-test.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/test/ipv4-header-test.cc	2013-10-26 07:07:29.959364391 -0700
@@ -200,30 +200,30 @@
 
   std::vector <Ipv4Header::DscpType> vDscpTypes;
   vDscpTypes.push_back (Ipv4Header::DscpDefault);
-  vDscpTypes.push_back (Ipv4Header::CS1);
-  vDscpTypes.push_back (Ipv4Header::AF11);
-  vDscpTypes.push_back (Ipv4Header::AF12);
-  vDscpTypes.push_back (Ipv4Header::AF13);
-  vDscpTypes.push_back (Ipv4Header::CS2);
-  vDscpTypes.push_back (Ipv4Header::AF21);
-  vDscpTypes.push_back (Ipv4Header::AF22);
-  vDscpTypes.push_back (Ipv4Header::AF23);
-  vDscpTypes.push_back (Ipv4Header::CS3);
-  vDscpTypes.push_back (Ipv4Header::AF31);
-  vDscpTypes.push_back (Ipv4Header::AF32);
-  vDscpTypes.push_back (Ipv4Header::AF33);
-  vDscpTypes.push_back (Ipv4Header::CS4);
-  vDscpTypes.push_back (Ipv4Header::AF41);
-  vDscpTypes.push_back (Ipv4Header::AF42);
-  vDscpTypes.push_back (Ipv4Header::AF43);
-  vDscpTypes.push_back (Ipv4Header::CS5);
-  vDscpTypes.push_back (Ipv4Header::EF);
-  vDscpTypes.push_back (Ipv4Header::CS6);
-  vDscpTypes.push_back (Ipv4Header::CS7);
+  vDscpTypes.push_back (Ipv4Header::DSCP_CS1);
+  vDscpTypes.push_back (Ipv4Header::DSCP_AF11);
+  vDscpTypes.push_back (Ipv4Header::DSCP_AF12);
+  vDscpTypes.push_back (Ipv4Header::DSCP_AF13);
+  vDscpTypes.push_back (Ipv4Header::DSCP_CS2);
+  vDscpTypes.push_back (Ipv4Header::DSCP_AF21);
+  vDscpTypes.push_back (Ipv4Header::DSCP_AF22);
+  vDscpTypes.push_back (Ipv4Header::DSCP_AF23);
+  vDscpTypes.push_back (Ipv4Header::DSCP_CS3);
+  vDscpTypes.push_back (Ipv4Header::DSCP_AF31);
+  vDscpTypes.push_back (Ipv4Header::DSCP_AF32);
+  vDscpTypes.push_back (Ipv4Header::DSCP_AF33);
+  vDscpTypes.push_back (Ipv4Header::DSCP_CS4);
+  vDscpTypes.push_back (Ipv4Header::DSCP_AF41);
+  vDscpTypes.push_back (Ipv4Header::DSCP_AF42);
+  vDscpTypes.push_back (Ipv4Header::DSCP_AF43);
+  vDscpTypes.push_back (Ipv4Header::DSCP_CS5);
+  vDscpTypes.push_back (Ipv4Header::DSCP_EF);
+  vDscpTypes.push_back (Ipv4Header::DSCP_CS6);
+  vDscpTypes.push_back (Ipv4Header::DSCP_CS7);
 
   for (uint32_t i = 0; i < vDscpTypes.size (); i++)
     {
-      SendData_IpHdr_Dscp (txSocket, "10.0.0.1", vDscpTypes [i], Ipv4Header::ECT1);
+      SendData_IpHdr_Dscp (txSocket, "10.0.0.1", vDscpTypes [i], Ipv4Header::ECN_ECT1);
       NS_TEST_EXPECT_MSG_EQ (m_receivedPacket->GetSize (), 143, "recv(hdrincl): 10.0.0.1");
       NS_TEST_EXPECT_MSG_EQ (m_receivedHeader.GetDscp (), vDscpTypes [i], "recv(hdrincl): 10.0.0.1");
       m_receivedHeader.Print (std::cout);
@@ -235,10 +235,10 @@
   // Ecn tests
   std::cout << "Ecn Test\n";
   std::vector <Ipv4Header::EcnType> vEcnTypes;
-  vEcnTypes.push_back (Ipv4Header::NotECT);
-  vEcnTypes.push_back (Ipv4Header::ECT1);
-  vEcnTypes.push_back (Ipv4Header::ECT0);
-  vEcnTypes.push_back (Ipv4Header::CE);
+  vEcnTypes.push_back (Ipv4Header::ECN_NotECT);
+  vEcnTypes.push_back (Ipv4Header::ECN_ECT1);
+  vEcnTypes.push_back (Ipv4Header::ECN_ECT0);
+  vEcnTypes.push_back (Ipv4Header::ECN_CE);
   
   for (uint32_t i = 0; i < vEcnTypes.size (); i++)
     {
diff -Naur ns-3.17/src/internet/test/ipv4-list-routing-test-suite.cc ns-3.18/src/internet/test/ipv4-list-routing-test-suite.cc
--- ns-3.17/src/internet/test/ipv4-list-routing-test-suite.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/test/ipv4-list-routing-test-suite.cc	2013-10-26 07:07:29.963364391 -0700
@@ -73,10 +73,10 @@
   lr->AddRoutingProtocol (bRouting, -5);
   int16_t first = 3;
   uint32_t num = lr->GetNRoutingProtocols ();
-  NS_TEST_ASSERT_MSG_EQ (num, 2, "XXX");
+  NS_TEST_ASSERT_MSG_EQ (num, 2, "100");
   Ptr<Ipv4RoutingProtocol> firstRp = lr->GetRoutingProtocol (0, first);
-  NS_TEST_ASSERT_MSG_EQ (-5, first, "XXX");
-  NS_TEST_ASSERT_MSG_EQ (firstRp, bRouting, "XXX");
+  NS_TEST_ASSERT_MSG_EQ (-5, first, "101");
+  NS_TEST_ASSERT_MSG_EQ (firstRp, bRouting, "102");
 }
 
 class Ipv4ListRoutingPositiveTestCase : public TestCase
@@ -103,13 +103,13 @@
   int16_t first = 3;
   int16_t second = 3;
   uint32_t num = lr->GetNRoutingProtocols ();
-  NS_TEST_ASSERT_MSG_EQ (num, 2, "XXX");
+  NS_TEST_ASSERT_MSG_EQ (num, 2, "200");
   Ptr<Ipv4RoutingProtocol> firstRp = lr->GetRoutingProtocol (0, first);
-  NS_TEST_ASSERT_MSG_EQ (10, first, "XXX");
-  NS_TEST_ASSERT_MSG_EQ (firstRp, aRouting, "XXX");
+  NS_TEST_ASSERT_MSG_EQ (10, first, "201");
+  NS_TEST_ASSERT_MSG_EQ (firstRp, aRouting, "202");
   Ptr<Ipv4RoutingProtocol> secondRp = lr->GetRoutingProtocol (1, second);
-  NS_TEST_ASSERT_MSG_EQ (5, second, "XXX");
-  NS_TEST_ASSERT_MSG_EQ (secondRp, bRouting, "XXX");
+  NS_TEST_ASSERT_MSG_EQ (5, second, "203");
+  NS_TEST_ASSERT_MSG_EQ (secondRp, bRouting, "204");
 }
 
 static class Ipv4ListRoutingTestSuite : public TestSuite
diff -Naur ns-3.17/src/internet/test/ipv4-packet-info-tag-test-suite.cc ns-3.18/src/internet/test/ipv4-packet-info-tag-test-suite.cc
--- ns-3.17/src/internet/test/ipv4-packet-info-tag-test-suite.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/test/ipv4-packet-info-tag-test-suite.cc	2013-10-26 07:07:29.959364391 -0700
@@ -114,7 +114,7 @@
   if (DynamicCast<UdpSocket> (socket) != 0)
     {
       NS_TEST_EXPECT_MSG_EQ (socket->SendTo (Create<Packet> (123), 0, realTo),
-                             123, "XXX");
+                             123, "100");
     }
   // Should only Ipv4RawSock
   else
diff -Naur ns-3.17/src/internet/test/ipv4-test.cc ns-3.18/src/internet/test/ipv4-test.cc
--- ns-3.17/src/internet/test/ipv4-test.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/test/ipv4-test.cc	2013-10-26 07:07:29.963364391 -0700
@@ -94,9 +94,53 @@
   Ipv4InterfaceAddress output = interface->GetAddress (2);
   NS_TEST_ASSERT_MSG_EQ (ifaceAddr4, output,
                          "The addresses should be identical");
+
+  /* Test Ipv4Interface()::RemoveAddress(address) */
+  output = interface->RemoveAddress (Ipv4Address ("250.0.0.1"));
+  NS_TEST_ASSERT_MSG_EQ (ifaceAddr4, output,
+                         "Wrong Interface Address Removed??");
+  num = interface->GetNAddresses ();
+  NS_TEST_ASSERT_MSG_EQ (num, 2, "Should find 2 addresses??");
+  
+  /* Remove a non-existent Address */
+  output = interface->RemoveAddress (Ipv4Address ("253.123.9.81"));
+  NS_TEST_ASSERT_MSG_EQ (Ipv4InterfaceAddress (), output,
+                         "Removed non-existent address??");
+  num = interface->GetNAddresses ();
+  NS_TEST_ASSERT_MSG_EQ (num, 2, "Should find 2 addresses??");
+  
+  /* Remove a Loopback Address */
+  output = interface->RemoveAddress (Ipv4Address::GetLoopback ());
+  NS_TEST_ASSERT_MSG_EQ (Ipv4InterfaceAddress (), output,
+                         "Able to remove loopback address??");
+  num = interface->GetNAddresses ();
+  NS_TEST_ASSERT_MSG_EQ (num, 2, "Should find 2 addresses??");
+
+  /* Test Ipv4Address::RemoveAddress(i, addresss) */
+  bool result = ipv4->RemoveAddress (index, Ipv4Address
+("192.168.0.2"));
+  NS_TEST_ASSERT_MSG_EQ (true, result, "Unable to remove Address??");
+  num = interface->GetNAddresses ();
+  NS_TEST_ASSERT_MSG_EQ (num, 1, "Should find 1 addresses??");
+
+  /* Remove a non-existent Address */
+  result = ipv4->RemoveAddress (index, Ipv4Address ("189.0.0.1"));
+  NS_TEST_ASSERT_MSG_EQ (false, result,
+                         "Removed non-existent address??");
+  num = interface->GetNAddresses ();
+  NS_TEST_ASSERT_MSG_EQ (num, 1, "Should find 1 addresses??");
+
+  /* Remove a loopback Address */
+  result = ipv4->RemoveAddress (index, Ipv4Address::GetLoopback ());
+  NS_TEST_ASSERT_MSG_EQ (false, result,
+                         "Able to remove loopback address??");
+  num = interface->GetNAddresses ();
+  NS_TEST_ASSERT_MSG_EQ (num, 1, "Should find 1 addresses??");
+
   Simulator::Destroy ();
 }
 
+  
 static class IPv4L3ProtocolTestSuite : public TestSuite
 {
 public:
diff -Naur ns-3.17/src/internet/test/ipv6-forwarding-test.cc ns-3.18/src/internet/test/ipv6-forwarding-test.cc
--- ns-3.17/src/internet/test/ipv6-forwarding-test.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/internet/test/ipv6-forwarding-test.cc	2013-10-26 07:07:29.959364391 -0700
@@ -0,0 +1,228 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013 Universita' di Firenze
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Tommaso Pecorella <tommaso.pecorella@unifi.it>
+ */
+
+#include "ns3/test.h"
+#include "ns3/socket-factory.h"
+#include "ns3/udp-socket-factory.h"
+#include "ns3/simulator.h"
+#include "ns3/simple-channel.h"
+#include "ns3/simple-net-device.h"
+#include "ns3/drop-tail-queue.h"
+#include "ns3/socket.h"
+#include "ns3/boolean.h"
+
+#include "ns3/log.h"
+#include "ns3/node.h"
+#include "ns3/inet6-socket-address.h"
+
+#include "ns3/ipv6-l3-protocol.h"
+#include "ns3/icmpv6-l4-protocol.h"
+#include "ns3/udp-l4-protocol.h"
+#include "ns3/ipv6-static-routing.h"
+
+#include <string>
+#include <limits>
+
+using namespace ns3;
+
+static void
+AddInternetStack6 (Ptr<Node> node)
+{
+  //IPV6
+  Ptr<Ipv6L3Protocol> ipv6 = CreateObject<Ipv6L3Protocol> ();
+  //Routing for Ipv6
+  Ptr<Ipv6StaticRouting> ipv6Routing = CreateObject<Ipv6StaticRouting> ();
+  ipv6->SetRoutingProtocol (ipv6Routing);
+  node->AggregateObject (ipv6);
+  node->AggregateObject (ipv6Routing);
+  //ICMP
+  Ptr<Icmpv6L4Protocol> icmp = CreateObject<Icmpv6L4Protocol> ();
+  node->AggregateObject (icmp);
+  //Ipv6 Extensions
+  ipv6->RegisterExtensions ();
+  ipv6->RegisterOptions ();
+  //UDP
+  Ptr<UdpL4Protocol> udp = CreateObject<UdpL4Protocol> ();
+  node->AggregateObject (udp);
+}
+
+
+
+class Ipv6ForwardingTest : public TestCase
+{
+  Ptr<Packet> m_receivedPacket;
+  void DoSendData (Ptr<Socket> socket, std::string to);
+  void SendData (Ptr<Socket> socket, std::string to);
+
+public:
+  virtual void DoRun (void);
+  Ipv6ForwardingTest ();
+
+  void ReceivePkt (Ptr<Socket> socket);
+};
+
+Ipv6ForwardingTest::Ipv6ForwardingTest ()
+  : TestCase ("UDP6 socket implementation")
+{
+}
+
+void Ipv6ForwardingTest::ReceivePkt (Ptr<Socket> socket)
+{
+  uint32_t availableData;
+  availableData = socket->GetRxAvailable ();
+  m_receivedPacket = socket->Recv (std::numeric_limits<uint32_t>::max (), 0);
+  NS_ASSERT (availableData == m_receivedPacket->GetSize ());
+  //cast availableData to void, to suppress 'availableData' set but not used
+  //compiler warning
+  (void) availableData;
+}
+
+void
+Ipv6ForwardingTest::DoSendData (Ptr<Socket> socket, std::string to)
+{
+  Address realTo = Inet6SocketAddress (Ipv6Address (to.c_str ()), 1234);
+  NS_TEST_EXPECT_MSG_EQ (socket->SendTo (Create<Packet> (123), 0, realTo),
+                         123, "100");
+}
+
+void
+Ipv6ForwardingTest::SendData (Ptr<Socket> socket, std::string to)
+{
+  m_receivedPacket = Create<Packet> ();
+  Simulator::ScheduleWithContext (socket->GetNode ()->GetId (), Seconds (0),
+                                  &Ipv6ForwardingTest::DoSendData, this, socket, to);
+  Simulator::Run ();
+}
+
+void
+Ipv6ForwardingTest::DoRun (void)
+{
+  // Create topology
+
+  // Receiver Node
+  Ptr<Node> rxNode = CreateObject<Node> ();
+  AddInternetStack6 (rxNode);
+  Ptr<SimpleNetDevice> rxDev;
+  { // first interface
+    rxDev = CreateObject<SimpleNetDevice> ();
+    rxDev->SetAddress (Mac48Address::ConvertFrom (Mac48Address::Allocate ()));
+    rxNode->AddDevice (rxDev);
+    Ptr<Ipv6> ipv6 = rxNode->GetObject<Ipv6> ();
+    uint32_t netdev_idx = ipv6->AddInterface (rxDev);
+    Ipv6InterfaceAddress ipv6Addr = Ipv6InterfaceAddress (Ipv6Address ("2001:1::2"), Ipv6Prefix (64));
+    ipv6->AddAddress (netdev_idx, ipv6Addr);
+    ipv6->SetUp (netdev_idx);
+  }
+
+  // Forwarding Node
+  Ptr<Node> fwNode = CreateObject<Node> ();
+  AddInternetStack6 (fwNode);
+  Ptr<SimpleNetDevice> fwDev1, fwDev2;
+  { // first interface
+    fwDev1 = CreateObject<SimpleNetDevice> ();
+    fwDev1->SetAddress (Mac48Address::ConvertFrom (Mac48Address::Allocate ()));
+    fwNode->AddDevice (fwDev1);
+    Ptr<Ipv6> ipv6 = fwNode->GetObject<Ipv6> ();
+    uint32_t netdev_idx = ipv6->AddInterface (fwDev1);
+    Ipv6InterfaceAddress ipv6Addr = Ipv6InterfaceAddress (Ipv6Address ("2001:1::1"), Ipv6Prefix (64));
+    ipv6->AddAddress (netdev_idx, ipv6Addr);
+    ipv6->SetUp (netdev_idx);
+  }
+
+  Ipv6Address nextHop;
+  { // second interface
+    fwDev2 = CreateObject<SimpleNetDevice> ();
+    fwDev2->SetAddress (Mac48Address::ConvertFrom (Mac48Address::Allocate ()));
+    fwNode->AddDevice (fwDev2);
+    Ptr<Ipv6> ipv6 = fwNode->GetObject<Ipv6> ();
+    uint32_t netdev_idx = ipv6->AddInterface (fwDev2);
+    Ipv6InterfaceAddress ipv6Addr = Ipv6InterfaceAddress (Ipv6Address ("2001:2::1"), Ipv6Prefix (64));
+    nextHop = ipv6->GetAddress(netdev_idx, 0).GetAddress();
+    ipv6->AddAddress (netdev_idx, ipv6Addr);
+    ipv6->SetUp (netdev_idx);
+  }
+
+  // Sender Node
+  Ptr<Node> txNode = CreateObject<Node> ();
+  AddInternetStack6 (txNode);
+  Ptr<SimpleNetDevice> txDev;
+  {
+    txDev = CreateObject<SimpleNetDevice> ();
+    txDev->SetAddress (Mac48Address::ConvertFrom (Mac48Address::Allocate ()));
+    txNode->AddDevice (txDev);
+    Ptr<Ipv6> ipv6 = txNode->GetObject<Ipv6> ();
+    uint32_t netdev_idx = ipv6->AddInterface (txDev);
+    Ipv6InterfaceAddress ipv6Addr = Ipv6InterfaceAddress (Ipv6Address ("2001:2::2"), Ipv6Prefix (64));
+    ipv6->AddAddress (netdev_idx, ipv6Addr);
+    ipv6->SetUp (netdev_idx);
+    Ptr<Ipv6StaticRouting> ipv6StaticRouting = txNode->GetObject<Ipv6StaticRouting> ();
+    ipv6StaticRouting->SetDefaultRoute(nextHop, netdev_idx);
+  }
+
+  // link the two nodes
+  Ptr<SimpleChannel> channel1 = CreateObject<SimpleChannel> ();
+  rxDev->SetChannel (channel1);
+  fwDev1->SetChannel (channel1);
+
+  Ptr<SimpleChannel> channel2 = CreateObject<SimpleChannel> ();
+  fwDev2->SetChannel (channel2);
+  txDev->SetChannel (channel2);
+
+  // Create the UDP sockets
+  Ptr<SocketFactory> rxSocketFactory = rxNode->GetObject<UdpSocketFactory> ();
+  Ptr<Socket> rxSocket = rxSocketFactory->CreateSocket ();
+  NS_TEST_EXPECT_MSG_EQ (rxSocket->Bind (Inet6SocketAddress (Ipv6Address ("2001:1::2"), 1234)), 0, "trivial");
+  rxSocket->SetRecvCallback (MakeCallback (&Ipv6ForwardingTest::ReceivePkt, this));
+
+  Ptr<SocketFactory> txSocketFactory = txNode->GetObject<UdpSocketFactory> ();
+  Ptr<Socket> txSocket = txSocketFactory->CreateSocket ();
+  txSocket->SetAllowBroadcast (true);
+
+  // ------ Now the tests ------------
+
+  // Unicast test
+  SendData (txSocket, "2001:1::2");
+  NS_TEST_EXPECT_MSG_EQ (m_receivedPacket->GetSize (), 0, "IPv6 Forwarding off");
+
+  m_receivedPacket->RemoveAllByteTags ();
+  m_receivedPacket = 0;
+
+  Ptr<Ipv6> ipv6 = fwNode->GetObject<Ipv6> ();
+  ipv6->SetAttribute("IpForward", BooleanValue (true));
+  SendData (txSocket, "2001:1::2");
+  NS_TEST_EXPECT_MSG_EQ (m_receivedPacket->GetSize (), 123, "IPv6 Forwarding on");
+
+  m_receivedPacket->RemoveAllByteTags ();
+
+  Simulator::Destroy ();
+
+}
+
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+class Ipv6ForwardingTestSuite : public TestSuite
+{
+public:
+  Ipv6ForwardingTestSuite () : TestSuite ("ipv6-forwarding", UNIT)
+  {
+    AddTestCase (new Ipv6ForwardingTest, TestCase::QUICK);
+  }
+} g_ipv6forwardingTestSuite;
diff -Naur ns-3.17/src/internet/test/ipv6-fragmentation-test.cc ns-3.18/src/internet/test/ipv6-fragmentation-test.cc
--- ns-3.17/src/internet/test/ipv6-fragmentation-test.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/test/ipv6-fragmentation-test.cc	2013-10-26 07:07:29.959364391 -0700
@@ -265,12 +265,7 @@
 void
 Ipv6FragmentationTest::DoRun (void)
 {
-  // set the arp cache to something quite high
-  // we shouldn't need because the NetDevice used doesn't need arp, but still
-  // Config::SetDefault ("ns3::ArpCache::PendingQueueSize", UintegerValue (100));
-//  LogComponentEnable ("ErrorNetDevice", LOG_LEVEL_ALL);
-// LogComponentEnableAll(LOG_LEVEL_ALL);
-// Create topology
+  // Create topology
 
   // Receiver Node
   Ptr<Node> serverNode = CreateObject<Node> ();
diff -Naur ns-3.17/src/internet/test/ipv6-list-routing-test-suite.cc ns-3.18/src/internet/test/ipv6-list-routing-test-suite.cc
--- ns-3.17/src/internet/test/ipv6-list-routing-test-suite.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/test/ipv6-list-routing-test-suite.cc	2013-10-26 07:07:29.959364391 -0700
@@ -80,10 +80,10 @@
   lr->AddRoutingProtocol (bRouting, -5);
   int16_t first = 3;
   uint32_t num = lr->GetNRoutingProtocols ();
-  NS_TEST_ASSERT_MSG_EQ (num, 2, "XXX");
+  NS_TEST_ASSERT_MSG_EQ (num, 2, "100");
   Ptr<Ipv6RoutingProtocol> firstRp = lr->GetRoutingProtocol (0, first);
-  NS_TEST_ASSERT_MSG_EQ (-5, first, "XXX");
-  NS_TEST_ASSERT_MSG_EQ (firstRp, bRouting, "XXX");
+  NS_TEST_ASSERT_MSG_EQ (-5, first, "101");
+  NS_TEST_ASSERT_MSG_EQ (firstRp, bRouting, "102");
 }
 
 class Ipv6ListRoutingPositiveTestCase : public TestCase
@@ -110,13 +110,13 @@
   int16_t first = 3;
   int16_t second = 3;
   uint32_t num = lr->GetNRoutingProtocols ();
-  NS_TEST_ASSERT_MSG_EQ (num, 2, "XXX");
+  NS_TEST_ASSERT_MSG_EQ (num, 2, "200");
   Ptr<Ipv6RoutingProtocol> firstRp = lr->GetRoutingProtocol (0, first);
-  NS_TEST_ASSERT_MSG_EQ (10, first, "XXX");
-  NS_TEST_ASSERT_MSG_EQ (firstRp, aRouting, "XXX");
+  NS_TEST_ASSERT_MSG_EQ (10, first, "201");
+  NS_TEST_ASSERT_MSG_EQ (firstRp, aRouting, "202");
   Ptr<Ipv6RoutingProtocol> secondRp = lr->GetRoutingProtocol (1, second);
-  NS_TEST_ASSERT_MSG_EQ (5, second, "XXX");
-  NS_TEST_ASSERT_MSG_EQ (secondRp, bRouting, "XXX");
+  NS_TEST_ASSERT_MSG_EQ (5, second, "203");
+  NS_TEST_ASSERT_MSG_EQ (secondRp, bRouting, "204");
 }
 
 static class Ipv6ListRoutingTestSuite : public TestSuite
diff -Naur ns-3.17/src/internet/test/ipv6-packet-info-tag-test-suite.cc ns-3.18/src/internet/test/ipv6-packet-info-tag-test-suite.cc
--- ns-3.17/src/internet/test/ipv6-packet-info-tag-test-suite.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/test/ipv6-packet-info-tag-test-suite.cc	2013-10-26 07:07:29.959364391 -0700
@@ -106,7 +106,7 @@
   if (DynamicCast<UdpSocket> (socket) != 0)
     {
       NS_TEST_EXPECT_MSG_EQ (socket->SendTo (Create<Packet> (123), 0, realTo),
-                             123, "XXX");
+                             123, "100");
     }
   // Should only Ipv6RawSock
   else
diff -Naur ns-3.17/src/internet/test/ipv6-raw-test.cc ns-3.18/src/internet/test/ipv6-raw-test.cc
--- ns-3.17/src/internet/test/ipv6-raw-test.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/test/ipv6-raw-test.cc	2013-10-26 07:07:29.963364391 -0700
@@ -121,7 +121,7 @@
   m_receivedPacket2 = socket->RecvFrom (std::numeric_limits<uint32_t>::max (), 0, addr);
   NS_ASSERT (availableData == m_receivedPacket2->GetSize ());
   Inet6SocketAddress v6addr = Inet6SocketAddress::ConvertFrom (addr);
-  NS_TEST_EXPECT_MSG_EQ (v6addr.GetIpv6 (),Ipv6Address ("fe80:0000:0000:0000:0200:00ff:fe00:0003"), "recvfrom");
+  NS_TEST_EXPECT_MSG_EQ (v6addr.GetIpv6 (),Ipv6Address ("2001:0db8:0000:0000:0000:0000:0000:0002"), "recvfrom");
 }
 
 void
diff -Naur ns-3.17/src/internet/test/ipv6-test.cc ns-3.18/src/internet/test/ipv6-test.cc
--- ns-3.17/src/internet/test/ipv6-test.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/test/ipv6-test.cc	2013-10-26 07:07:29.963364391 -0700
@@ -136,6 +136,48 @@
 
   index = ipv6->GetInterfaceForAddress ("2001:ffff:5678:9000::1"); /* address we just remove */
   NS_TEST_ASSERT_MSG_EQ (index, (uint32_t) -1, "Address should not be found??");
+
+  /* Test Ipv6Interface()::RemoveAddress(address) */
+  output = interface->RemoveAddress (Ipv6Address ("2001:1234:5678:9000::1"));
+  NS_TEST_ASSERT_MSG_EQ (ifaceAddr1, output, "Wrong Interface Address Removed??");
+  num = interface->GetNAddresses ();
+  NS_TEST_ASSERT_MSG_EQ (num, 1, "Number of addresses should be 1??");
+  
+  /* Remove a non-existent Address */
+  output = interface->RemoveAddress (Ipv6Address ("2001:1234:5678:9000::1"));
+  NS_TEST_ASSERT_MSG_EQ (Ipv6InterfaceAddress (), output, 
+                         "Removed non-existent address??");
+  num = interface->GetNAddresses ();
+  NS_TEST_ASSERT_MSG_EQ (num, 1, "Number of addresses should be 1??");
+
+  /* Remove a loopback Address */
+  output = interface->RemoveAddress (Ipv6Address::GetLoopback ());
+  NS_TEST_ASSERT_MSG_EQ (Ipv6InterfaceAddress (), output, 
+                         "Able to remove loopback address??");
+  num = interface->GetNAddresses ();
+  NS_TEST_ASSERT_MSG_EQ (num, 1, "Number of addresses should be 1??");
+
+  /* Test Ipv6Address::RemoveAddress(index, addresss) */
+  index = ipv6->GetInterfaceForAddress ("2001:ffff:5678:9001::2");
+  bool result = ipv6->RemoveAddress (index, Ipv6Address 
+                                     ("2001:ffff:5678:9001::2"));
+  NS_TEST_ASSERT_MSG_EQ (result, true, "Unable to remove Address??");
+  num = interface2->GetNAddresses ();
+  NS_TEST_ASSERT_MSG_EQ (num, 1, "Number of addresses should be 1??");
+
+  /* Remove a non-existent Address */
+  result = ipv6->RemoveAddress (index, Ipv6Address  
+                                ("2001:ffff:5678:9001::2"));
+  NS_TEST_ASSERT_MSG_EQ (result, false, "Removed Non-existent address??");
+  num = interface2->GetNAddresses ();
+  NS_TEST_ASSERT_MSG_EQ (num, 1, "Number of addresses should be 1??");
+ 
+  /* Remove a loopback Address */
+  result = ipv6->RemoveAddress (index, Ipv6Address::GetLoopback ());
+  NS_TEST_ASSERT_MSG_EQ (result, false, "Able to remove loopback address??");
+  num = interface2->GetNAddresses ();
+  NS_TEST_ASSERT_MSG_EQ (num, 1, "Number of addresses should be 1??");
+
   Simulator::Destroy ();
 } //end DoRun
 static class IPv6L3ProtocolTestSuite : public TestSuite
diff -Naur ns-3.17/src/internet/test/udp-test.cc ns-3.18/src/internet/test/udp-test.cc
--- ns-3.17/src/internet/test/udp-test.cc	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/test/udp-test.cc	2013-10-26 07:07:29.963364391 -0700
@@ -242,7 +242,7 @@
 {
   Address realTo = InetSocketAddress (Ipv4Address (to.c_str ()), 1234);
   NS_TEST_EXPECT_MSG_EQ (socket->SendTo (Create<Packet> (123), 0, realTo),
-                         123, "XXX");
+                         123, "100");
 }
 
 void
@@ -445,7 +445,7 @@
 {
   Address realTo = Inet6SocketAddress (Ipv6Address (to.c_str ()), 1234);
   NS_TEST_EXPECT_MSG_EQ (socket->SendTo (Create<Packet> (123), 0, realTo),
-                         123, "XXX");
+                         123, "200");
 }
 
 void
diff -Naur ns-3.17/src/internet/wscript ns-3.18/src/internet/wscript
--- ns-3.17/src/internet/wscript	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/internet/wscript	2013-10-26 07:07:29.899364390 -0700
@@ -189,6 +189,9 @@
         'helper/ipv6-interface-container.cc',
         'helper/ipv6-routing-helper.cc',
         'model/ipv6-address-generator.cc',
+        'model/ipv4-packet-probe.cc',
+        'model/ipv6-packet-probe.cc',
+        'model/ipv6-pmtu-cache.cc',
         ]
 
     internet_test = bld.create_ns3_module_test_library('internet')
@@ -201,6 +204,7 @@
         'test/ipv4-raw-test.cc',
         'test/ipv4-header-test.cc',
         'test/ipv4-fragmentation-test.cc',
+        'test/ipv4-forwarding-test.cc',
         'test/error-channel.cc',
         'test/error-net-device.cc',
         'test/ipv4-test.cc',
@@ -214,6 +218,7 @@
         'test/ipv6-address-generator-test-suite.cc',
         'test/ipv6-dual-stack-test-suite.cc',
         'test/ipv6-fragmentation-test.cc',
+        'test/ipv6-forwarding-test.cc',
         'test/ipv6-address-helper-test-suite.cc',
         'test/rtt-test.cc',
         ]
@@ -298,6 +303,9 @@
         'model/tcp-tx-buffer.h',
         'model/tcp-rx-buffer.h',
         'model/rtt-estimator.h',
+        'model/ipv4-packet-probe.h',
+        'model/ipv6-packet-probe.h',
+        'model/ipv6-pmtu-cache.h',
        ]
 
     if bld.env['NSC_ENABLED']:
diff -Naur ns-3.17/src/lte/AUTHORS ns-3.18/src/lte/AUTHORS
--- ns-3.17/src/lte/AUTHORS	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/lte/AUTHORS	2013-10-26 07:07:30.487364405 -0700
@@ -3,6 +3,17 @@
 
 
 ====================================================
+  LTE-EPC Network simulAtor (LENA) Project (2011-13)
+====================================================
+
+Nicola Baldo, CTTC <nbaldo@cttc.es>
+Marco Miozzo, CTTC <mmiozzo@cttc.es>
+Manuel Requena, CTTC <mrequena@cttc.es>
+Jaume Nin, CTTC <jnin@cttc.es>
+Lluis Parcerisa, CTTC <lparcerisa@cttc.es>
+
+
+====================================================
         Google Summer of Code (GSoC) (2012)
 ====================================================
  
@@ -25,14 +36,3 @@
 Marco Miozzo, CTTC <mmiozzo@cttc.es>
 supervision and GSoC project mentorship
 
-
-====================================================
-  LTE-EPC Network simulAtor (LENA) Project (2011-12)
-====================================================
-
-Nicola Baldo, CTTC <nbaldo@cttc.es>
-Marco Miozzo, CTTC <mmiozzo@cttc.es>
-Manuel Requena, CTTC <mrequena@cttc.es>
-Jaume Nin, CTTC <jnin@cttc.es>
-
-
diff -Naur ns-3.17/src/lte/bindings/callbacks_list.py ns-3.18/src/lte/bindings/callbacks_list.py
--- ns-3.17/src/lte/bindings/callbacks_list.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/lte/bindings/callbacks_list.py	2013-10-26 07:07:30.519364405 -0700
@@ -1,5 +1,6 @@
 callback_classes = [
     ['void', 'ns3::Ptr<ns3::Packet const>', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
+    ['void', 'unsigned short', 'ns3::Ptr<ns3::SpectrumValue>', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'ns3::Ptr<ns3::Packet>', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'ns3::DlInfoListElement_s', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
diff -Naur ns-3.17/src/lte/bindings/modulegen__gcc_ILP32.py ns-3.18/src/lte/bindings/modulegen__gcc_ILP32.py
--- ns-3.17/src/lte/bindings/modulegen__gcc_ILP32.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/lte/bindings/modulegen__gcc_ILP32.py	2013-10-26 07:07:30.519364405 -0700
@@ -196,6 +196,8 @@
     module.add_class('EpsBearer')
     ## eps-bearer.h (module 'lte'): ns3::EpsBearer::Qci [enumeration]
     module.add_enum('Qci', ['GBR_CONV_VOICE', 'GBR_CONV_VIDEO', 'GBR_GAMING', 'GBR_NON_CONV_VIDEO', 'NGBR_IMS', 'NGBR_VIDEO_TCP_OPERATOR', 'NGBR_VOICE_VIDEO_GAMING', 'NGBR_VIDEO_TCP_PREMIUM', 'NGBR_VIDEO_TCP_DEFAULT'], outer_class=root_module['ns3::EpsBearer'])
+    ## lte-common.h (module 'lte'): ns3::EutranMeasurementMapping [class]
+    module.add_class('EutranMeasurementMapping')
     ## event-id.h (module 'core'): ns3::EventId [class]
     module.add_class('EventId', import_from_module='ns.core')
     ## ff-mac-csched-sap.h (module 'lte'): ns3::FfMacCschedSapProvider [class]
@@ -276,6 +278,8 @@
     module.add_class('GbrQosInformation')
     ## lte-harq-phy.h (module 'lte'): ns3::HarqProcessInfoElement_t [struct]
     module.add_class('HarqProcessInfoElement_t')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
     ## ff-mac-common.h (module 'lte'): ns3::HigherLayerSelected_s [struct]
     module.add_class('HigherLayerSelected_s')
     ## lte-common.h (module 'lte'): ns3::ImsiLcidPair_t [struct]
@@ -443,7 +447,7 @@
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::MeasGapConfig [enumeration]
     module.add_enum('', ['SETUP', 'RESET'], outer_class=root_module['ns3::LteRrcSap::MeasGapConfig'])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::MeasGapConfig [enumeration]
-    module.add_enum('', ['gp0', 'gp1'], outer_class=root_module['ns3::LteRrcSap::MeasGapConfig'])
+    module.add_enum('', ['GP0', 'GP1'], outer_class=root_module['ns3::LteRrcSap::MeasGapConfig'])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::MeasIdToAddMod [struct]
     module.add_class('MeasIdToAddMod', outer_class=root_module['ns3::LteRrcSap'])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::MeasObjectEutra [struct]
@@ -487,17 +491,17 @@
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::ReportConfigEutra [struct]
     module.add_class('ReportConfigEutra', outer_class=root_module['ns3::LteRrcSap'])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::ReportConfigEutra [enumeration]
-    module.add_enum('', ['event', 'periodical'], outer_class=root_module['ns3::LteRrcSap::ReportConfigEutra'])
+    module.add_enum('', ['EVENT', 'PERIODICAL'], outer_class=root_module['ns3::LteRrcSap::ReportConfigEutra'])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::ReportConfigEutra [enumeration]
-    module.add_enum('', ['eventA1', 'eventA2', 'eventA3', 'eventA4', 'eventA5'], outer_class=root_module['ns3::LteRrcSap::ReportConfigEutra'])
+    module.add_enum('', ['EVENT_A1', 'EVENT_A2', 'EVENT_A3', 'EVENT_A4', 'EVENT_A5'], outer_class=root_module['ns3::LteRrcSap::ReportConfigEutra'])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::ReportConfigEutra [enumeration]
-    module.add_enum('', ['reportStrongestCells', 'reportCgi'], outer_class=root_module['ns3::LteRrcSap::ReportConfigEutra'])
+    module.add_enum('', ['REPORT_STRONGEST_CELLS', 'REPORT_CGI'], outer_class=root_module['ns3::LteRrcSap::ReportConfigEutra'])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::ReportConfigEutra [enumeration]
-    module.add_enum('', ['rsrp', 'rsrq'], outer_class=root_module['ns3::LteRrcSap::ReportConfigEutra'])
+    module.add_enum('', ['RSRP', 'RSRQ'], outer_class=root_module['ns3::LteRrcSap::ReportConfigEutra'])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::ReportConfigEutra [enumeration]
-    module.add_enum('', ['sameAsTriggerQuantity', 'both'], outer_class=root_module['ns3::LteRrcSap::ReportConfigEutra'])
+    module.add_enum('', ['SAME_AS_TRIGGER_QUANTITY', 'BOTH'], outer_class=root_module['ns3::LteRrcSap::ReportConfigEutra'])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::ReportConfigEutra [enumeration]
-    module.add_enum('', ['ms120', 'ms240', 'ms480', 'ms640', 'ms1024', 'ms2048', 'ms5120', 'ms10240', 'min1', 'min6', 'min12', 'min30', 'min60', 'spare3', 'spare2', 'spare1'], outer_class=root_module['ns3::LteRrcSap::ReportConfigEutra'])
+    module.add_enum('', ['MS120', 'MS240', 'MS480', 'MS640', 'MS1024', 'MS2048', 'MS5120', 'MS10240', 'MIN1', 'MIN6', 'MIN12', 'MIN30', 'MIN60', 'SPARE3', 'SPARE2', 'SPARE1'], outer_class=root_module['ns3::LteRrcSap::ReportConfigEutra'])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::ReportConfigToAddMod [struct]
     module.add_class('ReportConfigToAddMod', outer_class=root_module['ns3::LteRrcSap'])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::RlcConfig [struct]
@@ -551,7 +555,7 @@
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::ThresholdEutra [struct]
     module.add_class('ThresholdEutra', outer_class=root_module['ns3::LteRrcSap'])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::ThresholdEutra [enumeration]
-    module.add_enum('', ['thresholdRsrp', 'thresholdRsrq'], outer_class=root_module['ns3::LteRrcSap::ThresholdEutra'])
+    module.add_enum('', ['THRESHOLD_RSRP', 'THRESHOLD_RSRQ'], outer_class=root_module['ns3::LteRrcSap::ThresholdEutra'])
     ## lte-spectrum-value-helper.h (module 'lte'): ns3::LteSpectrumValueHelper [class]
     module.add_class('LteSpectrumValueHelper')
     ## lte-ue-cmac-sap.h (module 'lte'): ns3::LteUeCmacSapProvider [class]
@@ -568,6 +572,10 @@
     module.add_class('LteUeCphySapProvider', allow_subclassing=True)
     ## lte-ue-cphy-sap.h (module 'lte'): ns3::LteUeCphySapUser [class]
     module.add_class('LteUeCphySapUser', allow_subclassing=True)
+    ## lte-ue-cphy-sap.h (module 'lte'): ns3::LteUeCphySapUser::UeMeasurementsElement [struct]
+    module.add_class('UeMeasurementsElement', outer_class=root_module['ns3::LteUeCphySapUser'])
+    ## lte-ue-cphy-sap.h (module 'lte'): ns3::LteUeCphySapUser::UeMeasurementsParameters [struct]
+    module.add_class('UeMeasurementsParameters', outer_class=root_module['ns3::LteUeCphySapUser'])
     ## lte-ue-phy-sap.h (module 'lte'): ns3::LteUePhySapProvider [class]
     module.add_class('LteUePhySapProvider', allow_subclassing=True)
     ## lte-ue-phy-sap.h (module 'lte'): ns3::LteUePhySapUser [class]
@@ -618,6 +626,8 @@
     module.add_class('PacketTagList', import_from_module='ns.network')
     ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct]
     module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration]
+    module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network')
     ## ff-mac-common.h (module 'lte'): ns3::PagingInfoListElement_s [struct]
     module.add_class('PagingInfoListElement_s')
     ## ff-mac-common.h (module 'lte'): ns3::PhichListElement_s [struct]
@@ -735,9 +745,9 @@
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header [class]
     module.add_class('Ipv4Header', import_from_module='ns.internet', parent=root_module['ns3::Header'])
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType [enumeration]
-    module.add_enum('DscpType', ['DscpDefault', 'CS1', 'AF11', 'AF12', 'AF13', 'CS2', 'AF21', 'AF22', 'AF23', 'CS3', 'AF31', 'AF32', 'AF33', 'CS4', 'AF41', 'AF42', 'AF43', 'CS5', 'EF', 'CS6', 'CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
+    module.add_enum('DscpType', ['DscpDefault', 'DSCP_CS1', 'DSCP_AF11', 'DSCP_AF12', 'DSCP_AF13', 'DSCP_CS2', 'DSCP_AF21', 'DSCP_AF22', 'DSCP_AF23', 'DSCP_CS3', 'DSCP_AF31', 'DSCP_AF32', 'DSCP_AF33', 'DSCP_CS4', 'DSCP_AF41', 'DSCP_AF42', 'DSCP_AF43', 'DSCP_CS5', 'DSCP_EF', 'DSCP_CS6', 'DSCP_CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType [enumeration]
-    module.add_enum('EcnType', ['NotECT', 'ECT1', 'ECT0', 'CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
+    module.add_enum('EcnType', ['ECN_NotECT', 'ECN_ECT1', 'ECN_ECT0', 'ECN_CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
     ## ipv6-header.h (module 'internet'): ns3::Ipv6Header [class]
     module.add_class('Ipv6Header', import_from_module='ns.internet', parent=root_module['ns3::Header'])
     ## ipv6-header.h (module 'internet'): ns3::Ipv6Header::NextHeader_e [enumeration]
@@ -818,6 +828,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, template_parameters=['ns3::EpcTftClassifier', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EpcTftClassifier>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Ipv4MulticastRoute', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Ipv4MulticastRoute>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> > [class]
@@ -894,6 +906,8 @@
     module.add_class('UeManager', parent=root_module['ns3::Object'])
     ## lte-enb-rrc.h (module 'lte'): ns3::UeManager::State [enumeration]
     module.add_enum('State', ['INITIAL_RANDOM_ACCESS', 'CONNECTION_SETUP', 'CONNECTION_REJECTED', 'CONNECTED_NORMALLY', 'CONNECTION_RECONFIGURATION', 'CONNECTION_REESTABLISHMENT', 'HANDOVER_PREPARATION', 'HANDOVER_JOINING', 'HANDOVER_PATH_SWITCH', 'HANDOVER_LEAVING', 'NUM_STATES'], outer_class=root_module['ns3::UeManager'])
+    ## lte-enb-rrc.h (module 'lte'): ns3::UeMeasure [class]
+    module.add_class('UeMeasure', parent=root_module['ns3::Object'])
     ## random-variable-stream.h (module 'core'): ns3::UniformRandomVariable [class]
     module.add_class('UniformRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
     ## ff-mac-common.h (module 'lte'): ns3::VendorSpecificValue [struct]
@@ -1128,6 +1142,8 @@
     module.add_class('MibLteControlMessage', parent=root_module['ns3::LteControlMessage'])
     ## mobility-model.h (module 'mobility'): ns3::MobilityModel [class]
     module.add_class('MobilityModel', import_from_module='ns.mobility', parent=root_module['ns3::Object'])
+    ## lte-enb-rrc.h (module 'lte'): ns3::NeighbourRelation [class]
+    module.add_class('NeighbourRelation', parent=root_module['ns3::Object'])
     ## net-device.h (module 'network'): ns3::NetDevice [class]
     module.add_class('NetDevice', import_from_module='ns.network', parent=root_module['ns3::Object'])
     ## net-device.h (module 'network'): ns3::NetDevice::PacketType [enumeration]
@@ -1196,8 +1212,6 @@
     module.add_class('TdMtFfMacScheduler', parent=root_module['ns3::FfMacScheduler'])
     ## tdtbfq-ff-mac-scheduler.h (module 'lte'): ns3::TdTbfqFfMacScheduler [class]
     module.add_class('TdTbfqFfMacScheduler', parent=root_module['ns3::FfMacScheduler'])
-    ## nstime.h (module 'core'): ns3::TimeChecker [class]
-    module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
     module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## tta-ff-mac-scheduler.h (module 'lte'): ns3::TtaFfMacScheduler [class]
@@ -1329,6 +1343,7 @@
     module.add_container('std::list< ns3::LteRrcSap::MeasIdToAddMod >', 'ns3::LteRrcSap::MeasIdToAddMod', container_type='list')
     module.add_container('std::list< unsigned int >', 'unsigned int', container_type='list')
     module.add_container('std::list< ns3::LteRrcSap::MeasResultEutra >', 'ns3::LteRrcSap::MeasResultEutra', container_type='list')
+    module.add_container('std::vector< ns3::LteUeCphySapUser::UeMeasurementsElement >', 'ns3::LteUeCphySapUser::UeMeasurementsElement', container_type='vector')
     module.add_container('std::vector< ns3::HigherLayerSelected_s >', 'ns3::HigherLayerSelected_s', container_type='vector')
     module.add_container('std::vector< ns3::SiMessageListElement_s >', 'ns3::SiMessageListElement_s', container_type='vector')
     module.add_container('std::list< ns3::Ptr< ns3::Packet > >', 'ns3::Ptr< ns3::Packet >', container_type='list')
@@ -1346,6 +1361,9 @@
     typehandlers.add_type_alias('std::vector< std::vector< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > >, std::allocator< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > > > >, std::allocator< std::vector< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > >, std::allocator< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > > > > > >', 'ns3::DlHarqRlcPduListBuffer_t')
     typehandlers.add_type_alias('std::vector< std::vector< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > >, std::allocator< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > > > >, std::allocator< std::vector< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > >, std::allocator< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > > > > > >*', 'ns3::DlHarqRlcPduListBuffer_t*')
     typehandlers.add_type_alias('std::vector< std::vector< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > >, std::allocator< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > > > >, std::allocator< std::vector< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > >, std::allocator< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > > > > > >&', 'ns3::DlHarqRlcPduListBuffer_t&')
+    typehandlers.add_type_alias('ns3::Callback< void, unsigned short, ns3::Ptr< ns3::SpectrumValue >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::LtePhyRxPssCallback')
+    typehandlers.add_type_alias('ns3::Callback< void, unsigned short, ns3::Ptr< ns3::SpectrumValue >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::LtePhyRxPssCallback*')
+    typehandlers.add_type_alias('ns3::Callback< void, unsigned short, ns3::Ptr< ns3::SpectrumValue >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::LtePhyRxPssCallback&')
     typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::LtePhyTxEndCallback')
     typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::LtePhyTxEndCallback*')
     typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::LtePhyTxEndCallback&')
@@ -1461,6 +1479,12 @@
     register_types_ns3_FatalImpl(nested_module)
     
     
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
+    
     ## Register a nested module for the namespace internal
     
     nested_module = module.add_cpp_namespace('internal')
@@ -1479,6 +1503,36 @@
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_types_ns3_internal(module):
     root_module = module.get_root()
     
@@ -1555,6 +1609,7 @@
     register_Ns3EpcX2SapProvider_methods(root_module, root_module['ns3::EpcX2SapProvider'])
     register_Ns3EpcX2SapUser_methods(root_module, root_module['ns3::EpcX2SapUser'])
     register_Ns3EpsBearer_methods(root_module, root_module['ns3::EpsBearer'])
+    register_Ns3EutranMeasurementMapping_methods(root_module, root_module['ns3::EutranMeasurementMapping'])
     register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
     register_Ns3FfMacCschedSapProvider_methods(root_module, root_module['ns3::FfMacCschedSapProvider'])
     register_Ns3FfMacCschedSapProviderCschedCellConfigReqParameters_methods(root_module, root_module['ns3::FfMacCschedSapProvider::CschedCellConfigReqParameters'])
@@ -1587,6 +1642,7 @@
     register_Ns3FfMacSchedSapUserSchedUlConfigIndParameters_methods(root_module, root_module['ns3::FfMacSchedSapUser::SchedUlConfigIndParameters'])
     register_Ns3GbrQosInformation_methods(root_module, root_module['ns3::GbrQosInformation'])
     register_Ns3HarqProcessInfoElement_t_methods(root_module, root_module['ns3::HarqProcessInfoElement_t'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3HigherLayerSelected_s_methods(root_module, root_module['ns3::HigherLayerSelected_s'])
     register_Ns3ImsiLcidPair_t_methods(root_module, root_module['ns3::ImsiLcidPair_t'])
     register_Ns3Inet6SocketAddress_methods(root_module, root_module['ns3::Inet6SocketAddress'])
@@ -1703,6 +1759,8 @@
     register_Ns3LteUeConfig_t_methods(root_module, root_module['ns3::LteUeConfig_t'])
     register_Ns3LteUeCphySapProvider_methods(root_module, root_module['ns3::LteUeCphySapProvider'])
     register_Ns3LteUeCphySapUser_methods(root_module, root_module['ns3::LteUeCphySapUser'])
+    register_Ns3LteUeCphySapUserUeMeasurementsElement_methods(root_module, root_module['ns3::LteUeCphySapUser::UeMeasurementsElement'])
+    register_Ns3LteUeCphySapUserUeMeasurementsParameters_methods(root_module, root_module['ns3::LteUeCphySapUser::UeMeasurementsParameters'])
     register_Ns3LteUePhySapProvider_methods(root_module, root_module['ns3::LteUePhySapProvider'])
     register_Ns3LteUePhySapUser_methods(root_module, root_module['ns3::LteUePhySapUser'])
     register_Ns3LteUeRrcSapProvider_methods(root_module, root_module['ns3::LteUeRrcSapProvider'])
@@ -1803,6 +1861,7 @@
     register_Ns3SimpleRefCount__Ns3EpcTft_Ns3Empty_Ns3DefaultDeleter__lt__ns3EpcTft__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EpcTft, ns3::empty, ns3::DefaultDeleter<ns3::EpcTft> >'])
     register_Ns3SimpleRefCount__Ns3EpcTftClassifier_Ns3Empty_Ns3DefaultDeleter__lt__ns3EpcTftClassifier__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EpcTftClassifier, ns3::empty, ns3::DefaultDeleter<ns3::EpcTftClassifier> >'])
     register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3Ipv4MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4MulticastRoute__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> >'])
     register_Ns3SimpleRefCount__Ns3Ipv4Route_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4Route__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> >'])
     register_Ns3SimpleRefCount__Ns3LteControlMessage_Ns3Empty_Ns3DefaultDeleter__lt__ns3LteControlMessage__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::LteControlMessage, ns3::empty, ns3::DefaultDeleter<ns3::LteControlMessage> >'])
@@ -1836,6 +1895,7 @@
     register_Ns3Trailer_methods(root_module, root_module['ns3::Trailer'])
     register_Ns3TriangularRandomVariable_methods(root_module, root_module['ns3::TriangularRandomVariable'])
     register_Ns3UeManager_methods(root_module, root_module['ns3::UeManager'])
+    register_Ns3UeMeasure_methods(root_module, root_module['ns3::UeMeasure'])
     register_Ns3UniformRandomVariable_methods(root_module, root_module['ns3::UniformRandomVariable'])
     register_Ns3VendorSpecificValue_methods(root_module, root_module['ns3::VendorSpecificValue'])
     register_Ns3WeibullRandomVariable_methods(root_module, root_module['ns3::WeibullRandomVariable'])
@@ -1941,6 +2001,7 @@
     register_Ns3MacStatsCalculator_methods(root_module, root_module['ns3::MacStatsCalculator'])
     register_Ns3MibLteControlMessage_methods(root_module, root_module['ns3::MibLteControlMessage'])
     register_Ns3MobilityModel_methods(root_module, root_module['ns3::MobilityModel'])
+    register_Ns3NeighbourRelation_methods(root_module, root_module['ns3::NeighbourRelation'])
     register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice'])
     register_Ns3NixVector_methods(root_module, root_module['ns3::NixVector'])
     register_Ns3Node_methods(root_module, root_module['ns3::Node'])
@@ -1974,7 +2035,6 @@
     register_Ns3TdBetFfMacScheduler_methods(root_module, root_module['ns3::TdBetFfMacScheduler'])
     register_Ns3TdMtFfMacScheduler_methods(root_module, root_module['ns3::TdMtFfMacScheduler'])
     register_Ns3TdTbfqFfMacScheduler_methods(root_module, root_module['ns3::TdTbfqFfMacScheduler'])
-    register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TtaFfMacScheduler_methods(root_module, root_module['ns3::TtaFfMacScheduler'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
@@ -2018,6 +2078,11 @@
     register_Ns3RrcConnectionSetupHeader_methods(root_module, root_module['ns3::RrcConnectionSetupHeader'])
     register_Ns3LteEnbNetDevice_methods(root_module, root_module['ns3::LteEnbNetDevice'])
     register_Ns3ConfigMatchContainer_methods(root_module, root_module['ns3::Config::MatchContainer'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     return
 
 def register_Ns3Address_methods(root_module, cls):
@@ -3539,6 +3604,43 @@
     cls.add_instance_attribute('qci', 'ns3::EpsBearer::Qci', is_const=False)
     return
 
+def register_Ns3EutranMeasurementMapping_methods(root_module, cls):
+    ## lte-common.h (module 'lte'): ns3::EutranMeasurementMapping::EutranMeasurementMapping() [constructor]
+    cls.add_constructor([])
+    ## lte-common.h (module 'lte'): ns3::EutranMeasurementMapping::EutranMeasurementMapping(ns3::EutranMeasurementMapping const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::EutranMeasurementMapping const &', 'arg0')])
+    ## lte-common.h (module 'lte'): static uint8_t ns3::EutranMeasurementMapping::Db2RsrqRange(double db) [member function]
+    cls.add_method('Db2RsrqRange', 
+                   'uint8_t', 
+                   [param('double', 'db')], 
+                   is_static=True)
+    ## lte-common.h (module 'lte'): static uint8_t ns3::EutranMeasurementMapping::Dbm2RsrpRange(double dbm) [member function]
+    cls.add_method('Dbm2RsrpRange', 
+                   'uint8_t', 
+                   [param('double', 'dbm')], 
+                   is_static=True)
+    ## lte-common.h (module 'lte'): static double ns3::EutranMeasurementMapping::QuantizeRsrp(double v) [member function]
+    cls.add_method('QuantizeRsrp', 
+                   'double', 
+                   [param('double', 'v')], 
+                   is_static=True)
+    ## lte-common.h (module 'lte'): static double ns3::EutranMeasurementMapping::QuantizeRsrq(double v) [member function]
+    cls.add_method('QuantizeRsrq', 
+                   'double', 
+                   [param('double', 'v')], 
+                   is_static=True)
+    ## lte-common.h (module 'lte'): static double ns3::EutranMeasurementMapping::RsrpRange2Dbm(uint8_t range) [member function]
+    cls.add_method('RsrpRange2Dbm', 
+                   'double', 
+                   [param('uint8_t', 'range')], 
+                   is_static=True)
+    ## lte-common.h (module 'lte'): static double ns3::EutranMeasurementMapping::RsrqRange2Db(uint8_t range) [member function]
+    cls.add_method('RsrqRange2Db', 
+                   'double', 
+                   [param('uint8_t', 'range')], 
+                   is_static=True)
+    return
+
 def register_Ns3EventId_methods(root_module, cls):
     cls.add_binary_comparison_operator('!=')
     cls.add_binary_comparison_operator('==')
@@ -4234,6 +4336,35 @@
     cls.add_instance_attribute('m_rv', 'uint8_t', is_const=False)
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3HigherLayerSelected_s_methods(root_module, cls):
     ## ff-mac-common.h (module 'lte'): ns3::HigherLayerSelected_s::HigherLayerSelected_s() [constructor]
     cls.add_constructor([])
@@ -4798,6 +4929,11 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
     cls.add_method('IsEqual', 
                    'bool', 
@@ -4837,16 +4973,36 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
     cls.add_method('MakeAutoconfiguredAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
     cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'mac')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
     cls.add_method('MakeIpv4MappedAddress', 
                    'ns3::Ipv6Address', 
@@ -5626,6 +5782,8 @@
     cls.add_constructor([])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::LteRrcSap(ns3::LteRrcSap const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::LteRrcSap const &', 'arg0')])
+    ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::MaxReportCells [variable]
+    cls.add_static_attribute('MaxReportCells', 'uint8_t const', is_const=True)
     return
 
 def register_Ns3LteRrcSapAntennaInfoDedicated_methods(root_module, cls):
@@ -6571,6 +6729,33 @@
                    'void', 
                    [param('ns3::LteRrcSap::MasterInformationBlock', 'mib')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## lte-ue-cphy-sap.h (module 'lte'): void ns3::LteUeCphySapUser::ReportUeMeasurements(ns3::LteUeCphySapUser::UeMeasurementsParameters params) [member function]
+    cls.add_method('ReportUeMeasurements', 
+                   'void', 
+                   [param('ns3::LteUeCphySapUser::UeMeasurementsParameters', 'params')], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3LteUeCphySapUserUeMeasurementsElement_methods(root_module, cls):
+    ## lte-ue-cphy-sap.h (module 'lte'): ns3::LteUeCphySapUser::UeMeasurementsElement::UeMeasurementsElement() [constructor]
+    cls.add_constructor([])
+    ## lte-ue-cphy-sap.h (module 'lte'): ns3::LteUeCphySapUser::UeMeasurementsElement::UeMeasurementsElement(ns3::LteUeCphySapUser::UeMeasurementsElement const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::LteUeCphySapUser::UeMeasurementsElement const &', 'arg0')])
+    ## lte-ue-cphy-sap.h (module 'lte'): ns3::LteUeCphySapUser::UeMeasurementsElement::m_cellId [variable]
+    cls.add_instance_attribute('m_cellId', 'uint16_t', is_const=False)
+    ## lte-ue-cphy-sap.h (module 'lte'): ns3::LteUeCphySapUser::UeMeasurementsElement::m_rsrp [variable]
+    cls.add_instance_attribute('m_rsrp', 'double', is_const=False)
+    ## lte-ue-cphy-sap.h (module 'lte'): ns3::LteUeCphySapUser::UeMeasurementsElement::m_rsrq [variable]
+    cls.add_instance_attribute('m_rsrq', 'double', is_const=False)
+    return
+
+def register_Ns3LteUeCphySapUserUeMeasurementsParameters_methods(root_module, cls):
+    ## lte-ue-cphy-sap.h (module 'lte'): ns3::LteUeCphySapUser::UeMeasurementsParameters::UeMeasurementsParameters() [constructor]
+    cls.add_constructor([])
+    ## lte-ue-cphy-sap.h (module 'lte'): ns3::LteUeCphySapUser::UeMeasurementsParameters::UeMeasurementsParameters(ns3::LteUeCphySapUser::UeMeasurementsParameters const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::LteUeCphySapUser::UeMeasurementsParameters const &', 'arg0')])
+    ## lte-ue-cphy-sap.h (module 'lte'): ns3::LteUeCphySapUser::UeMeasurementsParameters::m_ueMeasurementsList [variable]
+    cls.add_instance_attribute('m_ueMeasurementsList', 'std::vector< ns3::LteUeCphySapUser::UeMeasurementsElement >', is_const=False)
     return
 
 def register_Ns3LteUePhySapProvider_methods(root_module, cls):
@@ -6690,6 +6875,11 @@
     cls.add_constructor([])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteUeRrcSapUser::LteUeRrcSapUser(ns3::LteUeRrcSapUser const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::LteUeRrcSapUser const &', 'arg0')])
+    ## lte-rrc-sap.h (module 'lte'): void ns3::LteUeRrcSapUser::SendMeasurementReport(ns3::LteRrcSap::MeasurementReport msg) [member function]
+    cls.add_method('SendMeasurementReport', 
+                   'void', 
+                   [param('ns3::LteRrcSap::MeasurementReport', 'msg')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## lte-rrc-sap.h (module 'lte'): void ns3::LteUeRrcSapUser::SendRrcConnectionReconfigurationCompleted(ns3::LteRrcSap::RrcConnectionReconfigurationCompleted msg) [member function]
     cls.add_method('SendRrcConnectionReconfigurationCompleted', 
                    'void', 
@@ -7271,6 +7461,10 @@
     cls.add_method('RemoveAll', 
                    'void', 
                    [])
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function]
+    cls.add_method('Replace', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     return
 
 def register_Ns3PacketTagListTagData_methods(root_module, cls):
@@ -7981,6 +8175,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -8040,6 +8239,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -8334,19 +8543,6 @@
 def register_Ns3Int64x64_t_methods(root_module, cls):
     cls.add_binary_comparison_operator('!=')
     cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', 'right'))
-    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right'))
-    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long unsigned int const', 'right'))
-    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned int const', 'right'))
-    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short unsigned int const', 'right'))
-    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned char const', 'right'))
-    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long int const', 'right'))
-    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long int const', 'right'))
-    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('int const', 'right'))
-    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short int const', 'right'))
-    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('signed char const', 'right'))
-    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('double const', 'right'))
-    cls.add_unary_numeric_operator('-')
-    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', 'right'))
     cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right'))
     cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long unsigned int const', 'right'))
     cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned int const', 'right'))
@@ -8371,6 +8567,19 @@
     cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('signed char const', 'right'))
     cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('double const', 'right'))
     cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned char const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('signed char const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('double const', 'right'))
+    cls.add_unary_numeric_operator('-')
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', 'right'))
     cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right'))
     cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long unsigned int const', 'right'))
     cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned int const', 'right'))
@@ -9907,6 +10116,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3Ipv4MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4MulticastRoute__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -10854,13 +11075,13 @@
     return
 
 def register_Ns3SpectrumValue_methods(root_module, cls):
-    cls.add_unary_numeric_operator('-')
-    cls.add_binary_numeric_operator('-', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('double', 'right'))
-    cls.add_binary_numeric_operator('-', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('ns3::SpectrumValue const &', 'right'))
     cls.add_binary_numeric_operator('*', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('double', 'right'))
     cls.add_binary_numeric_operator('*', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('ns3::SpectrumValue const &', 'right'))
     cls.add_binary_numeric_operator('+', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('double', 'right'))
     cls.add_binary_numeric_operator('+', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('ns3::SpectrumValue const &', 'right'))
+    cls.add_unary_numeric_operator('-')
+    cls.add_binary_numeric_operator('-', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('double', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('ns3::SpectrumValue const &', 'right'))
     cls.add_binary_numeric_operator('/', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('double', 'right'))
     cls.add_binary_numeric_operator('/', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('ns3::SpectrumValue const &', 'right'))
     cls.add_output_stream_operator()
@@ -10926,8 +11147,8 @@
 def register_Ns3Time_methods(root_module, cls):
     cls.add_binary_comparison_operator('!=')
     cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', 'right'))
-    cls.add_binary_numeric_operator('-', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))
     cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))
     cls.add_binary_comparison_operator('<')
     cls.add_binary_comparison_operator('>')
     cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', 'right'))
@@ -11057,11 +11278,26 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
     cls.add_method('SetResolution', 
                    'void', 
                    [param('ns3::Time::Unit', 'resolution')], 
                    is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
     cls.add_method('To', 
                    'ns3::int64x64_t', 
@@ -11304,6 +11540,10 @@
     cls.add_method('RecvSnStatusTransfer', 
                    'void', 
                    [param('ns3::EpcX2Sap::SnStatusTransferParams', 'params')])
+    ## lte-enb-rrc.h (module 'lte'): void ns3::UeManager::RecvUeContextRelease(ns3::EpcX2Sap::UeContextReleaseParams params) [member function]
+    cls.add_method('RecvUeContextRelease', 
+                   'void', 
+                   [param('ns3::EpcX2Sap::UeContextReleaseParams', 'params')])
     ## lte-enb-rrc.h (module 'lte'): void ns3::UeManager::ReleaseDataRadioBearer(uint8_t drbid) [member function]
     cls.add_method('ReleaseDataRadioBearer', 
                    'void', 
@@ -11352,6 +11592,19 @@
                    visibility='protected', is_virtual=True)
     return
 
+def register_Ns3UeMeasure_methods(root_module, cls):
+    ## lte-enb-rrc.h (module 'lte'): ns3::UeMeasure::UeMeasure() [constructor]
+    cls.add_constructor([])
+    ## lte-enb-rrc.h (module 'lte'): ns3::UeMeasure::UeMeasure(ns3::UeMeasure const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::UeMeasure const &', 'arg0')])
+    ## lte-enb-rrc.h (module 'lte'): ns3::UeMeasure::m_cellId [variable]
+    cls.add_instance_attribute('m_cellId', 'uint16_t', is_const=False)
+    ## lte-enb-rrc.h (module 'lte'): ns3::UeMeasure::m_rsrp [variable]
+    cls.add_instance_attribute('m_rsrp', 'uint8_t', is_const=False)
+    ## lte-enb-rrc.h (module 'lte'): ns3::UeMeasure::m_rsrq [variable]
+    cls.add_instance_attribute('m_rsrq', 'uint8_t', is_const=False)
+    return
+
 def register_Ns3UniformRandomVariable_methods(root_module, cls):
     ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::UniformRandomVariable::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
@@ -13950,6 +14203,11 @@
                    'bool', 
                    [param('uint32_t', 'interface'), param('uint32_t', 'addressIndex')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## ipv4.h (module 'internet'): bool ns3::Ipv4::RemoveAddress(uint32_t interface, ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4Address', 'address')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## ipv4.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4::SelectSourceAddress(ns3::Ptr<const ns3::NetDevice> device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function]
     cls.add_method('SelectSourceAddress', 
                    'ns3::Ipv4Address', 
@@ -14312,6 +14570,10 @@
     cls.add_method('RemoveAddress', 
                    'ns3::Ipv6InterfaceAddress', 
                    [param('uint32_t', 'index')])
+    ## ipv6-interface.h (module 'internet'): ns3::Ipv6InterfaceAddress ns3::Ipv6Interface::RemoveAddress(ns3::Ipv6Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'ns3::Ipv6InterfaceAddress', 
+                   [param('ns3::Ipv6Address', 'address')])
     ## ipv6-interface.h (module 'internet'): void ns3::Ipv6Interface::Send(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Address dest) [member function]
     cls.add_method('Send', 
                    'void', 
@@ -14562,10 +14824,18 @@
     cls.add_constructor([param('ns3::LteEnbRrc const &', 'arg0')])
     ## lte-enb-rrc.h (module 'lte'): ns3::LteEnbRrc::LteEnbRrc() [constructor]
     cls.add_constructor([])
+    ## lte-enb-rrc.h (module 'lte'): void ns3::LteEnbRrc::AddX2Neighbour(uint16_t cellId) [member function]
+    cls.add_method('AddX2Neighbour', 
+                   'void', 
+                   [param('uint16_t', 'cellId')])
     ## lte-enb-rrc.h (module 'lte'): void ns3::LteEnbRrc::ConfigureCell(uint8_t ulBandwidth, uint8_t dlBandwidth, uint16_t ulEarfcn, uint16_t dlEarfcn, uint16_t cellId) [member function]
     cls.add_method('ConfigureCell', 
                    'void', 
                    [param('uint8_t', 'ulBandwidth'), param('uint8_t', 'dlBandwidth'), param('uint16_t', 'ulEarfcn'), param('uint16_t', 'dlEarfcn'), param('uint16_t', 'cellId')])
+    ## lte-enb-rrc.h (module 'lte'): void ns3::LteEnbRrc::ConnectionRejectedTimeout(uint16_t rnti) [member function]
+    cls.add_method('ConnectionRejectedTimeout', 
+                   'void', 
+                   [param('uint16_t', 'rnti')])
     ## lte-enb-rrc.h (module 'lte'): void ns3::LteEnbRrc::ConnectionTimeout(uint16_t rnti) [member function]
     cls.add_method('ConnectionTimeout', 
                    'void', 
@@ -14604,6 +14874,14 @@
     cls.add_method('GetUeManager', 
                    'ns3::Ptr< ns3::UeManager >', 
                    [param('uint16_t', 'rnti')])
+    ## lte-enb-rrc.h (module 'lte'): void ns3::LteEnbRrc::HandoverJoiningTimeout(uint16_t rnti) [member function]
+    cls.add_method('HandoverJoiningTimeout', 
+                   'void', 
+                   [param('uint16_t', 'rnti')])
+    ## lte-enb-rrc.h (module 'lte'): void ns3::LteEnbRrc::HandoverLeavingTimeout(uint16_t rnti) [member function]
+    cls.add_method('HandoverLeavingTimeout', 
+                   'void', 
+                   [param('uint16_t', 'rnti')])
     ## lte-enb-rrc.h (module 'lte'): bool ns3::LteEnbRrc::SendData(ns3::Ptr<ns3::Packet> p) [member function]
     cls.add_method('SendData', 
                    'bool', 
@@ -14890,6 +15168,11 @@
     cls.add_method('GetRlcStats', 
                    'ns3::Ptr< ns3::RadioBearerStatsCalculator >', 
                    [])
+    ## lte-helper.h (module 'lte'): std::string ns3::LteHelper::GetSchedulerType() const [member function]
+    cls.add_method('GetSchedulerType', 
+                   'std::string', 
+                   [], 
+                   is_const=True)
     ## lte-helper.h (module 'lte'): static ns3::TypeId ns3::LteHelper::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
                    'ns3::TypeId', 
@@ -15582,10 +15865,10 @@
     cls.add_method('StartTxDataFrame', 
                    'bool', 
                    [param('ns3::Ptr< ns3::PacketBurst >', 'pb'), param('std::list< ns3::Ptr< ns3::LteControlMessage > >', 'ctrlMsgList'), param('ns3::Time', 'duration')])
-    ## lte-spectrum-phy.h (module 'lte'): bool ns3::LteSpectrumPhy::StartTxDlCtrlFrame(std::list<ns3::Ptr<ns3::LteControlMessage>, std::allocator<ns3::Ptr<ns3::LteControlMessage> > > ctrlMsgList) [member function]
+    ## lte-spectrum-phy.h (module 'lte'): bool ns3::LteSpectrumPhy::StartTxDlCtrlFrame(std::list<ns3::Ptr<ns3::LteControlMessage>, std::allocator<ns3::Ptr<ns3::LteControlMessage> > > ctrlMsgList, bool pss) [member function]
     cls.add_method('StartTxDlCtrlFrame', 
                    'bool', 
-                   [param('std::list< ns3::Ptr< ns3::LteControlMessage > >', 'ctrlMsgList')])
+                   [param('std::list< ns3::Ptr< ns3::LteControlMessage > >', 'ctrlMsgList'), param('bool', 'pss')])
     ## lte-spectrum-phy.h (module 'lte'): bool ns3::LteSpectrumPhy::StartTxUlSrsFrame() [member function]
     cls.add_method('StartTxUlSrsFrame', 
                    'bool', 
@@ -15610,6 +15893,10 @@
     cls.add_method('SetLtePhyRxCtrlEndErrorCallback', 
                    'void', 
                    [param('ns3::LtePhyRxCtrlEndErrorCallback', 'c')])
+    ## lte-spectrum-phy.h (module 'lte'): void ns3::LteSpectrumPhy::SetLtePhyRxPssCallback(ns3::LtePhyRxPssCallback c) [member function]
+    cls.add_method('SetLtePhyRxPssCallback', 
+                   'void', 
+                   [param('ns3::LtePhyRxPssCallback', 'c')])
     ## lte-spectrum-phy.h (module 'lte'): void ns3::LteSpectrumPhy::SetLtePhyDlHarqFeedbackCallback(ns3::LtePhyDlHarqFeedbackCallback c) [member function]
     cls.add_method('SetLtePhyDlHarqFeedbackCallback', 
                    'void', 
@@ -15634,8 +15921,12 @@
     cls.add_method('AddDataSinrChunkProcessor', 
                    'void', 
                    [param('ns3::Ptr< ns3::LteSinrChunkProcessor >', 'p')])
-    ## lte-spectrum-phy.h (module 'lte'): void ns3::LteSpectrumPhy::AddInterferenceChunkProcessor(ns3::Ptr<ns3::LteSinrChunkProcessor> p) [member function]
-    cls.add_method('AddInterferenceChunkProcessor', 
+    ## lte-spectrum-phy.h (module 'lte'): void ns3::LteSpectrumPhy::AddInterferenceCtrlChunkProcessor(ns3::Ptr<ns3::LteSinrChunkProcessor> p) [member function]
+    cls.add_method('AddInterferenceCtrlChunkProcessor', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::LteSinrChunkProcessor >', 'p')])
+    ## lte-spectrum-phy.h (module 'lte'): void ns3::LteSpectrumPhy::AddInterferenceDataChunkProcessor(ns3::Ptr<ns3::LteSinrChunkProcessor> p) [member function]
+    cls.add_method('AddInterferenceDataChunkProcessor', 
                    'void', 
                    [param('ns3::Ptr< ns3::LteSinrChunkProcessor >', 'p')])
     ## lte-spectrum-phy.h (module 'lte'): void ns3::LteSpectrumPhy::AddCtrlSinrChunkProcessor(ns3::Ptr<ns3::LteSinrChunkProcessor> p) [member function]
@@ -15710,6 +16001,8 @@
     cls.add_instance_attribute('cellId', 'uint16_t', is_const=False)
     ## lte-spectrum-signal-parameters.h (module 'lte'): ns3::LteSpectrumSignalParametersDlCtrlFrame::ctrlMsgList [variable]
     cls.add_instance_attribute('ctrlMsgList', 'std::list< ns3::Ptr< ns3::LteControlMessage > >', is_const=False)
+    ## lte-spectrum-signal-parameters.h (module 'lte'): ns3::LteSpectrumSignalParametersDlCtrlFrame::pss [variable]
+    cls.add_instance_attribute('pss', 'bool', is_const=False)
     return
 
 def register_Ns3LteSpectrumSignalParametersUlSrsFrame_methods(root_module, cls):
@@ -15776,6 +16069,46 @@
     cls.add_method('SetUlOutputFilename', 
                    'void', 
                    [param('std::string', 'outputFilename')])
+    ## lte-stats-calculator.h (module 'lte'): static uint16_t ns3::LteStatsCalculator::FindCellIdFromEnbMac(std::string path, uint16_t rnti) [member function]
+    cls.add_method('FindCellIdFromEnbMac', 
+                   'uint16_t', 
+                   [param('std::string', 'path'), param('uint16_t', 'rnti')], 
+                   is_static=True, visibility='protected')
+    ## lte-stats-calculator.h (module 'lte'): static uint16_t ns3::LteStatsCalculator::FindCellIdFromEnbRlcPath(std::string path) [member function]
+    cls.add_method('FindCellIdFromEnbRlcPath', 
+                   'uint16_t', 
+                   [param('std::string', 'path')], 
+                   is_static=True, visibility='protected')
+    ## lte-stats-calculator.h (module 'lte'): static uint64_t ns3::LteStatsCalculator::FindImsiForEnb(std::string path, uint16_t rnti) [member function]
+    cls.add_method('FindImsiForEnb', 
+                   'uint64_t', 
+                   [param('std::string', 'path'), param('uint16_t', 'rnti')], 
+                   is_static=True, visibility='protected')
+    ## lte-stats-calculator.h (module 'lte'): static uint64_t ns3::LteStatsCalculator::FindImsiForUe(std::string path, uint16_t rnti) [member function]
+    cls.add_method('FindImsiForUe', 
+                   'uint64_t', 
+                   [param('std::string', 'path'), param('uint16_t', 'rnti')], 
+                   is_static=True, visibility='protected')
+    ## lte-stats-calculator.h (module 'lte'): static uint64_t ns3::LteStatsCalculator::FindImsiFromEnbMac(std::string path, uint16_t rnti) [member function]
+    cls.add_method('FindImsiFromEnbMac', 
+                   'uint64_t', 
+                   [param('std::string', 'path'), param('uint16_t', 'rnti')], 
+                   is_static=True, visibility='protected')
+    ## lte-stats-calculator.h (module 'lte'): static uint64_t ns3::LteStatsCalculator::FindImsiFromEnbRlcPath(std::string path) [member function]
+    cls.add_method('FindImsiFromEnbRlcPath', 
+                   'uint64_t', 
+                   [param('std::string', 'path')], 
+                   is_static=True, visibility='protected')
+    ## lte-stats-calculator.h (module 'lte'): static uint64_t ns3::LteStatsCalculator::FindImsiFromLteNetDevice(std::string path) [member function]
+    cls.add_method('FindImsiFromLteNetDevice', 
+                   'uint64_t', 
+                   [param('std::string', 'path')], 
+                   is_static=True, visibility='protected')
+    ## lte-stats-calculator.h (module 'lte'): static uint64_t ns3::LteStatsCalculator::FindImsiFromUePhy(std::string path) [member function]
+    cls.add_method('FindImsiFromUePhy', 
+                   'uint64_t', 
+                   [param('std::string', 'path')], 
+                   is_static=True, visibility='protected')
     return
 
 def register_Ns3LteUeMac_methods(root_module, cls):
@@ -15919,6 +16252,11 @@
                    'void', 
                    [param('ns3::DlInfoListElement_s', 'mes')], 
                    is_virtual=True)
+    ## lte-ue-phy.h (module 'lte'): void ns3::LteUePhy::ReceivePss(uint16_t cellId, ns3::Ptr<ns3::SpectrumValue> p) [member function]
+    cls.add_method('ReceivePss', 
+                   'void', 
+                   [param('uint16_t', 'cellId'), param('ns3::Ptr< ns3::SpectrumValue >', 'p')], 
+                   is_virtual=True)
     ## lte-ue-phy.h (module 'lte'): void ns3::LteUePhy::ReportInterference(ns3::SpectrumValue const & interf) [member function]
     cls.add_method('ReportInterference', 
                    'void', 
@@ -16193,6 +16531,11 @@
     cls.add_method('DlScheduling', 
                    'void', 
                    [param('uint16_t', 'cellId'), param('uint64_t', 'imsi'), param('uint32_t', 'frameNo'), param('uint32_t', 'subframeNo'), param('uint16_t', 'rnti'), param('uint8_t', 'mcsTb1'), param('uint16_t', 'sizeTb1'), param('uint8_t', 'mcsTb2'), param('uint16_t', 'sizeTb2')])
+    ## mac-stats-calculator.h (module 'lte'): static void ns3::MacStatsCalculator::DlSchedulingCallback(ns3::Ptr<ns3::MacStatsCalculator> macStats, std::string path, uint32_t frameNo, uint32_t subframeNo, uint16_t rnti, uint8_t mcsTb1, uint16_t sizeTb1, uint8_t mcsTb2, uint16_t sizeTb2) [member function]
+    cls.add_method('DlSchedulingCallback', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::MacStatsCalculator >', 'macStats'), param('std::string', 'path'), param('uint32_t', 'frameNo'), param('uint32_t', 'subframeNo'), param('uint16_t', 'rnti'), param('uint8_t', 'mcsTb1'), param('uint16_t', 'sizeTb1'), param('uint8_t', 'mcsTb2'), param('uint16_t', 'sizeTb2')], 
+                   is_static=True)
     ## mac-stats-calculator.h (module 'lte'): std::string ns3::MacStatsCalculator::GetDlOutputFilename() [member function]
     cls.add_method('GetDlOutputFilename', 
                    'std::string', 
@@ -16218,6 +16561,11 @@
     cls.add_method('UlScheduling', 
                    'void', 
                    [param('uint16_t', 'cellId'), param('uint64_t', 'imsi'), param('uint32_t', 'frameNo'), param('uint32_t', 'subframeNo'), param('uint16_t', 'rnti'), param('uint8_t', 'mcs'), param('uint16_t', 'sizeTb')])
+    ## mac-stats-calculator.h (module 'lte'): static void ns3::MacStatsCalculator::UlSchedulingCallback(ns3::Ptr<ns3::MacStatsCalculator> macStats, std::string path, uint32_t frameNo, uint32_t subframeNo, uint16_t rnti, uint8_t mcs, uint16_t size) [member function]
+    cls.add_method('UlSchedulingCallback', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::MacStatsCalculator >', 'macStats'), param('std::string', 'path'), param('uint32_t', 'frameNo'), param('uint32_t', 'subframeNo'), param('uint16_t', 'rnti'), param('uint8_t', 'mcs'), param('uint16_t', 'size')], 
+                   is_static=True)
     return
 
 def register_Ns3MibLteControlMessage_methods(root_module, cls):
@@ -16301,6 +16649,23 @@
                    is_pure_virtual=True, visibility='private', is_virtual=True)
     return
 
+def register_Ns3NeighbourRelation_methods(root_module, cls):
+    ## lte-enb-rrc.h (module 'lte'): ns3::NeighbourRelation::NeighbourRelation() [constructor]
+    cls.add_constructor([])
+    ## lte-enb-rrc.h (module 'lte'): ns3::NeighbourRelation::NeighbourRelation(ns3::NeighbourRelation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::NeighbourRelation const &', 'arg0')])
+    ## lte-enb-rrc.h (module 'lte'): ns3::NeighbourRelation::m_detectedAsNeighbour [variable]
+    cls.add_instance_attribute('m_detectedAsNeighbour', 'bool', is_const=False)
+    ## lte-enb-rrc.h (module 'lte'): ns3::NeighbourRelation::m_noHo [variable]
+    cls.add_instance_attribute('m_noHo', 'bool', is_const=False)
+    ## lte-enb-rrc.h (module 'lte'): ns3::NeighbourRelation::m_noRemove [variable]
+    cls.add_instance_attribute('m_noRemove', 'bool', is_const=False)
+    ## lte-enb-rrc.h (module 'lte'): ns3::NeighbourRelation::m_noX2 [variable]
+    cls.add_instance_attribute('m_noX2', 'bool', is_const=False)
+    ## lte-enb-rrc.h (module 'lte'): ns3::NeighbourRelation::m_physCellId [variable]
+    cls.add_instance_attribute('m_physCellId', 'uint16_t', is_const=False)
+    return
+
 def register_Ns3NetDevice_methods(root_module, cls):
     ## net-device.h (module 'network'): ns3::NetDevice::NetDevice() [constructor]
     cls.add_constructor([])
@@ -16815,6 +17180,10 @@
     cls.add_method('RemoveTrailer', 
                    'uint32_t', 
                    [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('ReplacePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
     cls.add_method('Serialize', 
                    'uint32_t', 
@@ -16919,6 +17288,11 @@
     cls.add_method('DlPhyReception', 
                    'void', 
                    [param('ns3::PhyReceptionStatParameters', 'params')])
+    ## phy-rx-stats-calculator.h (module 'lte'): static void ns3::PhyRxStatsCalculator::DlPhyReceptionCallback(ns3::Ptr<ns3::PhyRxStatsCalculator> phyRxStats, std::string path, ns3::PhyReceptionStatParameters params) [member function]
+    cls.add_method('DlPhyReceptionCallback', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::PhyRxStatsCalculator >', 'phyRxStats'), param('std::string', 'path'), param('ns3::PhyReceptionStatParameters', 'params')], 
+                   is_static=True)
     ## phy-rx-stats-calculator.h (module 'lte'): std::string ns3::PhyRxStatsCalculator::GetDlRxOutputFilename() [member function]
     cls.add_method('GetDlRxOutputFilename', 
                    'std::string', 
@@ -16944,6 +17318,11 @@
     cls.add_method('UlPhyReception', 
                    'void', 
                    [param('ns3::PhyReceptionStatParameters', 'params')])
+    ## phy-rx-stats-calculator.h (module 'lte'): static void ns3::PhyRxStatsCalculator::UlPhyReceptionCallback(ns3::Ptr<ns3::PhyRxStatsCalculator> phyRxStats, std::string path, ns3::PhyReceptionStatParameters params) [member function]
+    cls.add_method('UlPhyReceptionCallback', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::PhyRxStatsCalculator >', 'phyRxStats'), param('std::string', 'path'), param('ns3::PhyReceptionStatParameters', 'params')], 
+                   is_static=True)
     return
 
 def register_Ns3PhyStatsCalculator_methods(root_module, cls):
@@ -16972,14 +17351,29 @@
     cls.add_method('ReportCurrentCellRsrpSinr', 
                    'void', 
                    [param('uint16_t', 'cellId'), param('uint64_t', 'imsi'), param('uint16_t', 'rnti'), param('double', 'rsrp'), param('double', 'sinr')])
+    ## phy-stats-calculator.h (module 'lte'): static void ns3::PhyStatsCalculator::ReportCurrentCellRsrpSinrCallback(ns3::Ptr<ns3::PhyStatsCalculator> phyStats, std::string path, uint16_t cellId, uint16_t rnti, double rsrp, double sinr) [member function]
+    cls.add_method('ReportCurrentCellRsrpSinrCallback', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::PhyStatsCalculator >', 'phyStats'), param('std::string', 'path'), param('uint16_t', 'cellId'), param('uint16_t', 'rnti'), param('double', 'rsrp'), param('double', 'sinr')], 
+                   is_static=True)
     ## phy-stats-calculator.h (module 'lte'): void ns3::PhyStatsCalculator::ReportInterference(uint16_t cellId, ns3::Ptr<ns3::SpectrumValue> interference) [member function]
     cls.add_method('ReportInterference', 
                    'void', 
                    [param('uint16_t', 'cellId'), param('ns3::Ptr< ns3::SpectrumValue >', 'interference')])
+    ## phy-stats-calculator.h (module 'lte'): static void ns3::PhyStatsCalculator::ReportInterference(ns3::Ptr<ns3::PhyStatsCalculator> phyStats, std::string path, uint16_t cellId, ns3::Ptr<ns3::SpectrumValue> interference) [member function]
+    cls.add_method('ReportInterference', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::PhyStatsCalculator >', 'phyStats'), param('std::string', 'path'), param('uint16_t', 'cellId'), param('ns3::Ptr< ns3::SpectrumValue >', 'interference')], 
+                   is_static=True)
     ## phy-stats-calculator.h (module 'lte'): void ns3::PhyStatsCalculator::ReportUeSinr(uint16_t cellId, uint64_t imsi, uint16_t rnti, double sinrLinear) [member function]
     cls.add_method('ReportUeSinr', 
                    'void', 
                    [param('uint16_t', 'cellId'), param('uint64_t', 'imsi'), param('uint16_t', 'rnti'), param('double', 'sinrLinear')])
+    ## phy-stats-calculator.h (module 'lte'): static void ns3::PhyStatsCalculator::ReportUeSinr(ns3::Ptr<ns3::PhyStatsCalculator> phyStats, std::string path, uint16_t cellId, uint16_t rnti, double sinrLinear) [member function]
+    cls.add_method('ReportUeSinr', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::PhyStatsCalculator >', 'phyStats'), param('std::string', 'path'), param('uint16_t', 'cellId'), param('uint16_t', 'rnti'), param('double', 'sinrLinear')], 
+                   is_static=True)
     ## phy-stats-calculator.h (module 'lte'): void ns3::PhyStatsCalculator::SetCurrentCellRsrpSinrFilename(std::string filename) [member function]
     cls.add_method('SetCurrentCellRsrpSinrFilename', 
                    'void', 
@@ -17003,6 +17397,11 @@
     cls.add_method('DlPhyTransmission', 
                    'void', 
                    [param('ns3::PhyTransmissionStatParameters', 'params')])
+    ## phy-tx-stats-calculator.h (module 'lte'): static void ns3::PhyTxStatsCalculator::DlPhyTransmissionCallback(ns3::Ptr<ns3::PhyTxStatsCalculator> phyTxStats, std::string path, ns3::PhyTransmissionStatParameters params) [member function]
+    cls.add_method('DlPhyTransmissionCallback', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::PhyTxStatsCalculator >', 'phyTxStats'), param('std::string', 'path'), param('ns3::PhyTransmissionStatParameters', 'params')], 
+                   is_static=True)
     ## phy-tx-stats-calculator.h (module 'lte'): std::string ns3::PhyTxStatsCalculator::GetDlTxOutputFilename() [member function]
     cls.add_method('GetDlTxOutputFilename', 
                    'std::string', 
@@ -17028,6 +17427,11 @@
     cls.add_method('UlPhyTransmission', 
                    'void', 
                    [param('ns3::PhyTransmissionStatParameters', 'params')])
+    ## phy-tx-stats-calculator.h (module 'lte'): static void ns3::PhyTxStatsCalculator::UlPhyTransmissionCallback(ns3::Ptr<ns3::PhyTxStatsCalculator> phyTxStats, std::string path, ns3::PhyTransmissionStatParameters params) [member function]
+    cls.add_method('UlPhyTransmissionCallback', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::PhyTxStatsCalculator >', 'phyTxStats'), param('std::string', 'path'), param('ns3::PhyTransmissionStatParameters', 'params')], 
+                   is_static=True)
     return
 
 def register_Ns3PointerChecker_methods(root_module, cls):
@@ -17955,13 +18359,6 @@
                    [param('uint16_t', 'rnti'), param('uint8_t', 'txMode')])
     return
 
-def register_Ns3TimeChecker_methods(root_module, cls):
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor]
-    cls.add_constructor([])
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')])
-    return
-
 def register_Ns3TimeValue_methods(root_module, cls):
     ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
     cls.add_constructor([])
@@ -19772,10 +20169,116 @@
                    [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')])
     return
 
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_functions(root_module):
     module = root_module
     register_functions_ns3_Config(module.get_submodule('Config'), root_module)
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     register_functions_ns3_internal(module.get_submodule('internal'), root_module)
     return
 
@@ -19785,6 +20288,13 @@
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def register_functions_ns3_internal(module, root_module):
     return
 
diff -Naur ns-3.17/src/lte/bindings/modulegen__gcc_LP64.py ns-3.18/src/lte/bindings/modulegen__gcc_LP64.py
--- ns-3.17/src/lte/bindings/modulegen__gcc_LP64.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/lte/bindings/modulegen__gcc_LP64.py	2013-10-26 07:07:30.503364405 -0700
@@ -196,6 +196,8 @@
     module.add_class('EpsBearer')
     ## eps-bearer.h (module 'lte'): ns3::EpsBearer::Qci [enumeration]
     module.add_enum('Qci', ['GBR_CONV_VOICE', 'GBR_CONV_VIDEO', 'GBR_GAMING', 'GBR_NON_CONV_VIDEO', 'NGBR_IMS', 'NGBR_VIDEO_TCP_OPERATOR', 'NGBR_VOICE_VIDEO_GAMING', 'NGBR_VIDEO_TCP_PREMIUM', 'NGBR_VIDEO_TCP_DEFAULT'], outer_class=root_module['ns3::EpsBearer'])
+    ## lte-common.h (module 'lte'): ns3::EutranMeasurementMapping [class]
+    module.add_class('EutranMeasurementMapping')
     ## event-id.h (module 'core'): ns3::EventId [class]
     module.add_class('EventId', import_from_module='ns.core')
     ## ff-mac-csched-sap.h (module 'lte'): ns3::FfMacCschedSapProvider [class]
@@ -276,6 +278,8 @@
     module.add_class('GbrQosInformation')
     ## lte-harq-phy.h (module 'lte'): ns3::HarqProcessInfoElement_t [struct]
     module.add_class('HarqProcessInfoElement_t')
+    ## hash.h (module 'core'): ns3::Hasher [class]
+    module.add_class('Hasher', import_from_module='ns.core')
     ## ff-mac-common.h (module 'lte'): ns3::HigherLayerSelected_s [struct]
     module.add_class('HigherLayerSelected_s')
     ## lte-common.h (module 'lte'): ns3::ImsiLcidPair_t [struct]
@@ -443,7 +447,7 @@
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::MeasGapConfig [enumeration]
     module.add_enum('', ['SETUP', 'RESET'], outer_class=root_module['ns3::LteRrcSap::MeasGapConfig'])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::MeasGapConfig [enumeration]
-    module.add_enum('', ['gp0', 'gp1'], outer_class=root_module['ns3::LteRrcSap::MeasGapConfig'])
+    module.add_enum('', ['GP0', 'GP1'], outer_class=root_module['ns3::LteRrcSap::MeasGapConfig'])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::MeasIdToAddMod [struct]
     module.add_class('MeasIdToAddMod', outer_class=root_module['ns3::LteRrcSap'])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::MeasObjectEutra [struct]
@@ -487,17 +491,17 @@
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::ReportConfigEutra [struct]
     module.add_class('ReportConfigEutra', outer_class=root_module['ns3::LteRrcSap'])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::ReportConfigEutra [enumeration]
-    module.add_enum('', ['event', 'periodical'], outer_class=root_module['ns3::LteRrcSap::ReportConfigEutra'])
+    module.add_enum('', ['EVENT', 'PERIODICAL'], outer_class=root_module['ns3::LteRrcSap::ReportConfigEutra'])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::ReportConfigEutra [enumeration]
-    module.add_enum('', ['eventA1', 'eventA2', 'eventA3', 'eventA4', 'eventA5'], outer_class=root_module['ns3::LteRrcSap::ReportConfigEutra'])
+    module.add_enum('', ['EVENT_A1', 'EVENT_A2', 'EVENT_A3', 'EVENT_A4', 'EVENT_A5'], outer_class=root_module['ns3::LteRrcSap::ReportConfigEutra'])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::ReportConfigEutra [enumeration]
-    module.add_enum('', ['reportStrongestCells', 'reportCgi'], outer_class=root_module['ns3::LteRrcSap::ReportConfigEutra'])
+    module.add_enum('', ['REPORT_STRONGEST_CELLS', 'REPORT_CGI'], outer_class=root_module['ns3::LteRrcSap::ReportConfigEutra'])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::ReportConfigEutra [enumeration]
-    module.add_enum('', ['rsrp', 'rsrq'], outer_class=root_module['ns3::LteRrcSap::ReportConfigEutra'])
+    module.add_enum('', ['RSRP', 'RSRQ'], outer_class=root_module['ns3::LteRrcSap::ReportConfigEutra'])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::ReportConfigEutra [enumeration]
-    module.add_enum('', ['sameAsTriggerQuantity', 'both'], outer_class=root_module['ns3::LteRrcSap::ReportConfigEutra'])
+    module.add_enum('', ['SAME_AS_TRIGGER_QUANTITY', 'BOTH'], outer_class=root_module['ns3::LteRrcSap::ReportConfigEutra'])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::ReportConfigEutra [enumeration]
-    module.add_enum('', ['ms120', 'ms240', 'ms480', 'ms640', 'ms1024', 'ms2048', 'ms5120', 'ms10240', 'min1', 'min6', 'min12', 'min30', 'min60', 'spare3', 'spare2', 'spare1'], outer_class=root_module['ns3::LteRrcSap::ReportConfigEutra'])
+    module.add_enum('', ['MS120', 'MS240', 'MS480', 'MS640', 'MS1024', 'MS2048', 'MS5120', 'MS10240', 'MIN1', 'MIN6', 'MIN12', 'MIN30', 'MIN60', 'SPARE3', 'SPARE2', 'SPARE1'], outer_class=root_module['ns3::LteRrcSap::ReportConfigEutra'])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::ReportConfigToAddMod [struct]
     module.add_class('ReportConfigToAddMod', outer_class=root_module['ns3::LteRrcSap'])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::RlcConfig [struct]
@@ -551,7 +555,7 @@
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::ThresholdEutra [struct]
     module.add_class('ThresholdEutra', outer_class=root_module['ns3::LteRrcSap'])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::ThresholdEutra [enumeration]
-    module.add_enum('', ['thresholdRsrp', 'thresholdRsrq'], outer_class=root_module['ns3::LteRrcSap::ThresholdEutra'])
+    module.add_enum('', ['THRESHOLD_RSRP', 'THRESHOLD_RSRQ'], outer_class=root_module['ns3::LteRrcSap::ThresholdEutra'])
     ## lte-spectrum-value-helper.h (module 'lte'): ns3::LteSpectrumValueHelper [class]
     module.add_class('LteSpectrumValueHelper')
     ## lte-ue-cmac-sap.h (module 'lte'): ns3::LteUeCmacSapProvider [class]
@@ -568,6 +572,10 @@
     module.add_class('LteUeCphySapProvider', allow_subclassing=True)
     ## lte-ue-cphy-sap.h (module 'lte'): ns3::LteUeCphySapUser [class]
     module.add_class('LteUeCphySapUser', allow_subclassing=True)
+    ## lte-ue-cphy-sap.h (module 'lte'): ns3::LteUeCphySapUser::UeMeasurementsElement [struct]
+    module.add_class('UeMeasurementsElement', outer_class=root_module['ns3::LteUeCphySapUser'])
+    ## lte-ue-cphy-sap.h (module 'lte'): ns3::LteUeCphySapUser::UeMeasurementsParameters [struct]
+    module.add_class('UeMeasurementsParameters', outer_class=root_module['ns3::LteUeCphySapUser'])
     ## lte-ue-phy-sap.h (module 'lte'): ns3::LteUePhySapProvider [class]
     module.add_class('LteUePhySapProvider', allow_subclassing=True)
     ## lte-ue-phy-sap.h (module 'lte'): ns3::LteUePhySapUser [class]
@@ -618,6 +626,8 @@
     module.add_class('PacketTagList', import_from_module='ns.network')
     ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct]
     module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList'])
+    ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration]
+    module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network')
     ## ff-mac-common.h (module 'lte'): ns3::PagingInfoListElement_s [struct]
     module.add_class('PagingInfoListElement_s')
     ## ff-mac-common.h (module 'lte'): ns3::PhichListElement_s [struct]
@@ -735,9 +745,9 @@
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header [class]
     module.add_class('Ipv4Header', import_from_module='ns.internet', parent=root_module['ns3::Header'])
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType [enumeration]
-    module.add_enum('DscpType', ['DscpDefault', 'CS1', 'AF11', 'AF12', 'AF13', 'CS2', 'AF21', 'AF22', 'AF23', 'CS3', 'AF31', 'AF32', 'AF33', 'CS4', 'AF41', 'AF42', 'AF43', 'CS5', 'EF', 'CS6', 'CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
+    module.add_enum('DscpType', ['DscpDefault', 'DSCP_CS1', 'DSCP_AF11', 'DSCP_AF12', 'DSCP_AF13', 'DSCP_CS2', 'DSCP_AF21', 'DSCP_AF22', 'DSCP_AF23', 'DSCP_CS3', 'DSCP_AF31', 'DSCP_AF32', 'DSCP_AF33', 'DSCP_CS4', 'DSCP_AF41', 'DSCP_AF42', 'DSCP_AF43', 'DSCP_CS5', 'DSCP_EF', 'DSCP_CS6', 'DSCP_CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
     ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType [enumeration]
-    module.add_enum('EcnType', ['NotECT', 'ECT1', 'ECT0', 'CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
+    module.add_enum('EcnType', ['ECN_NotECT', 'ECN_ECT1', 'ECN_ECT0', 'ECN_CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet')
     ## ipv6-header.h (module 'internet'): ns3::Ipv6Header [class]
     module.add_class('Ipv6Header', import_from_module='ns.internet', parent=root_module['ns3::Header'])
     ## ipv6-header.h (module 'internet'): ns3::Ipv6Header::NextHeader_e [enumeration]
@@ -818,6 +828,8 @@
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, template_parameters=['ns3::EpcTftClassifier', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EpcTftClassifier>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter<ns3::EventImpl>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > [class]
+    module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Hash::Implementation', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Hash::Implementation>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> > [class]
     module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Ipv4MulticastRoute', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Ipv4MulticastRoute>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> > [class]
@@ -894,6 +906,8 @@
     module.add_class('UeManager', parent=root_module['ns3::Object'])
     ## lte-enb-rrc.h (module 'lte'): ns3::UeManager::State [enumeration]
     module.add_enum('State', ['INITIAL_RANDOM_ACCESS', 'CONNECTION_SETUP', 'CONNECTION_REJECTED', 'CONNECTED_NORMALLY', 'CONNECTION_RECONFIGURATION', 'CONNECTION_REESTABLISHMENT', 'HANDOVER_PREPARATION', 'HANDOVER_JOINING', 'HANDOVER_PATH_SWITCH', 'HANDOVER_LEAVING', 'NUM_STATES'], outer_class=root_module['ns3::UeManager'])
+    ## lte-enb-rrc.h (module 'lte'): ns3::UeMeasure [class]
+    module.add_class('UeMeasure', parent=root_module['ns3::Object'])
     ## random-variable-stream.h (module 'core'): ns3::UniformRandomVariable [class]
     module.add_class('UniformRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
     ## ff-mac-common.h (module 'lte'): ns3::VendorSpecificValue [struct]
@@ -1128,6 +1142,8 @@
     module.add_class('MibLteControlMessage', parent=root_module['ns3::LteControlMessage'])
     ## mobility-model.h (module 'mobility'): ns3::MobilityModel [class]
     module.add_class('MobilityModel', import_from_module='ns.mobility', parent=root_module['ns3::Object'])
+    ## lte-enb-rrc.h (module 'lte'): ns3::NeighbourRelation [class]
+    module.add_class('NeighbourRelation', parent=root_module['ns3::Object'])
     ## net-device.h (module 'network'): ns3::NetDevice [class]
     module.add_class('NetDevice', import_from_module='ns.network', parent=root_module['ns3::Object'])
     ## net-device.h (module 'network'): ns3::NetDevice::PacketType [enumeration]
@@ -1196,8 +1212,6 @@
     module.add_class('TdMtFfMacScheduler', parent=root_module['ns3::FfMacScheduler'])
     ## tdtbfq-ff-mac-scheduler.h (module 'lte'): ns3::TdTbfqFfMacScheduler [class]
     module.add_class('TdTbfqFfMacScheduler', parent=root_module['ns3::FfMacScheduler'])
-    ## nstime.h (module 'core'): ns3::TimeChecker [class]
-    module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## nstime.h (module 'core'): ns3::TimeValue [class]
     module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
     ## tta-ff-mac-scheduler.h (module 'lte'): ns3::TtaFfMacScheduler [class]
@@ -1329,6 +1343,7 @@
     module.add_container('std::list< ns3::LteRrcSap::MeasIdToAddMod >', 'ns3::LteRrcSap::MeasIdToAddMod', container_type='list')
     module.add_container('std::list< unsigned int >', 'unsigned int', container_type='list')
     module.add_container('std::list< ns3::LteRrcSap::MeasResultEutra >', 'ns3::LteRrcSap::MeasResultEutra', container_type='list')
+    module.add_container('std::vector< ns3::LteUeCphySapUser::UeMeasurementsElement >', 'ns3::LteUeCphySapUser::UeMeasurementsElement', container_type='vector')
     module.add_container('std::vector< ns3::HigherLayerSelected_s >', 'ns3::HigherLayerSelected_s', container_type='vector')
     module.add_container('std::vector< ns3::SiMessageListElement_s >', 'ns3::SiMessageListElement_s', container_type='vector')
     module.add_container('std::list< ns3::Ptr< ns3::Packet > >', 'ns3::Ptr< ns3::Packet >', container_type='list')
@@ -1346,6 +1361,9 @@
     typehandlers.add_type_alias('std::vector< std::vector< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > >, std::allocator< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > > > >, std::allocator< std::vector< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > >, std::allocator< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > > > > > >', 'ns3::DlHarqRlcPduListBuffer_t')
     typehandlers.add_type_alias('std::vector< std::vector< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > >, std::allocator< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > > > >, std::allocator< std::vector< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > >, std::allocator< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > > > > > >*', 'ns3::DlHarqRlcPduListBuffer_t*')
     typehandlers.add_type_alias('std::vector< std::vector< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > >, std::allocator< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > > > >, std::allocator< std::vector< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > >, std::allocator< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > > > > > >&', 'ns3::DlHarqRlcPduListBuffer_t&')
+    typehandlers.add_type_alias('ns3::Callback< void, unsigned short, ns3::Ptr< ns3::SpectrumValue >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::LtePhyRxPssCallback')
+    typehandlers.add_type_alias('ns3::Callback< void, unsigned short, ns3::Ptr< ns3::SpectrumValue >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::LtePhyRxPssCallback*')
+    typehandlers.add_type_alias('ns3::Callback< void, unsigned short, ns3::Ptr< ns3::SpectrumValue >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::LtePhyRxPssCallback&')
     typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::LtePhyTxEndCallback')
     typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::LtePhyTxEndCallback*')
     typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::LtePhyTxEndCallback&')
@@ -1461,6 +1479,12 @@
     register_types_ns3_FatalImpl(nested_module)
     
     
+    ## Register a nested module for the namespace Hash
+    
+    nested_module = module.add_cpp_namespace('Hash')
+    register_types_ns3_Hash(nested_module)
+    
+    
     ## Register a nested module for the namespace internal
     
     nested_module = module.add_cpp_namespace('internal')
@@ -1479,6 +1503,36 @@
     root_module = module.get_root()
     
 
+def register_types_ns3_Hash(module):
+    root_module = module.get_root()
+    
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation [class]
+    module.add_class('Implementation', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash64Function_ptr')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash64Function_ptr*')
+    typehandlers.add_type_alias('uint64_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash64Function_ptr&')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *', 'ns3::Hash::Hash32Function_ptr')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) **', 'ns3::Hash::Hash32Function_ptr*')
+    typehandlers.add_type_alias('uint32_t ( * ) ( char const *, size_t ) *&', 'ns3::Hash::Hash32Function_ptr&')
+    
+    ## Register a nested module for the namespace Function
+    
+    nested_module = module.add_cpp_namespace('Function')
+    register_types_ns3_Hash_Function(nested_module)
+    
+
+def register_types_ns3_Hash_Function(module):
+    root_module = module.get_root()
+    
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a [class]
+    module.add_class('Fnv1a', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32 [class]
+    module.add_class('Hash32', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64 [class]
+    module.add_class('Hash64', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class]
+    module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation'])
+
 def register_types_ns3_internal(module):
     root_module = module.get_root()
     
@@ -1555,6 +1609,7 @@
     register_Ns3EpcX2SapProvider_methods(root_module, root_module['ns3::EpcX2SapProvider'])
     register_Ns3EpcX2SapUser_methods(root_module, root_module['ns3::EpcX2SapUser'])
     register_Ns3EpsBearer_methods(root_module, root_module['ns3::EpsBearer'])
+    register_Ns3EutranMeasurementMapping_methods(root_module, root_module['ns3::EutranMeasurementMapping'])
     register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
     register_Ns3FfMacCschedSapProvider_methods(root_module, root_module['ns3::FfMacCschedSapProvider'])
     register_Ns3FfMacCschedSapProviderCschedCellConfigReqParameters_methods(root_module, root_module['ns3::FfMacCschedSapProvider::CschedCellConfigReqParameters'])
@@ -1587,6 +1642,7 @@
     register_Ns3FfMacSchedSapUserSchedUlConfigIndParameters_methods(root_module, root_module['ns3::FfMacSchedSapUser::SchedUlConfigIndParameters'])
     register_Ns3GbrQosInformation_methods(root_module, root_module['ns3::GbrQosInformation'])
     register_Ns3HarqProcessInfoElement_t_methods(root_module, root_module['ns3::HarqProcessInfoElement_t'])
+    register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3HigherLayerSelected_s_methods(root_module, root_module['ns3::HigherLayerSelected_s'])
     register_Ns3ImsiLcidPair_t_methods(root_module, root_module['ns3::ImsiLcidPair_t'])
     register_Ns3Inet6SocketAddress_methods(root_module, root_module['ns3::Inet6SocketAddress'])
@@ -1703,6 +1759,8 @@
     register_Ns3LteUeConfig_t_methods(root_module, root_module['ns3::LteUeConfig_t'])
     register_Ns3LteUeCphySapProvider_methods(root_module, root_module['ns3::LteUeCphySapProvider'])
     register_Ns3LteUeCphySapUser_methods(root_module, root_module['ns3::LteUeCphySapUser'])
+    register_Ns3LteUeCphySapUserUeMeasurementsElement_methods(root_module, root_module['ns3::LteUeCphySapUser::UeMeasurementsElement'])
+    register_Ns3LteUeCphySapUserUeMeasurementsParameters_methods(root_module, root_module['ns3::LteUeCphySapUser::UeMeasurementsParameters'])
     register_Ns3LteUePhySapProvider_methods(root_module, root_module['ns3::LteUePhySapProvider'])
     register_Ns3LteUePhySapUser_methods(root_module, root_module['ns3::LteUePhySapUser'])
     register_Ns3LteUeRrcSapProvider_methods(root_module, root_module['ns3::LteUeRrcSapProvider'])
@@ -1803,6 +1861,7 @@
     register_Ns3SimpleRefCount__Ns3EpcTft_Ns3Empty_Ns3DefaultDeleter__lt__ns3EpcTft__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EpcTft, ns3::empty, ns3::DefaultDeleter<ns3::EpcTft> >'])
     register_Ns3SimpleRefCount__Ns3EpcTftClassifier_Ns3Empty_Ns3DefaultDeleter__lt__ns3EpcTftClassifier__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EpcTftClassifier, ns3::empty, ns3::DefaultDeleter<ns3::EpcTftClassifier> >'])
     register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter<ns3::EventImpl> >'])
+    register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >'])
     register_Ns3SimpleRefCount__Ns3Ipv4MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4MulticastRoute__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> >'])
     register_Ns3SimpleRefCount__Ns3Ipv4Route_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4Route__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> >'])
     register_Ns3SimpleRefCount__Ns3LteControlMessage_Ns3Empty_Ns3DefaultDeleter__lt__ns3LteControlMessage__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::LteControlMessage, ns3::empty, ns3::DefaultDeleter<ns3::LteControlMessage> >'])
@@ -1836,6 +1895,7 @@
     register_Ns3Trailer_methods(root_module, root_module['ns3::Trailer'])
     register_Ns3TriangularRandomVariable_methods(root_module, root_module['ns3::TriangularRandomVariable'])
     register_Ns3UeManager_methods(root_module, root_module['ns3::UeManager'])
+    register_Ns3UeMeasure_methods(root_module, root_module['ns3::UeMeasure'])
     register_Ns3UniformRandomVariable_methods(root_module, root_module['ns3::UniformRandomVariable'])
     register_Ns3VendorSpecificValue_methods(root_module, root_module['ns3::VendorSpecificValue'])
     register_Ns3WeibullRandomVariable_methods(root_module, root_module['ns3::WeibullRandomVariable'])
@@ -1941,6 +2001,7 @@
     register_Ns3MacStatsCalculator_methods(root_module, root_module['ns3::MacStatsCalculator'])
     register_Ns3MibLteControlMessage_methods(root_module, root_module['ns3::MibLteControlMessage'])
     register_Ns3MobilityModel_methods(root_module, root_module['ns3::MobilityModel'])
+    register_Ns3NeighbourRelation_methods(root_module, root_module['ns3::NeighbourRelation'])
     register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice'])
     register_Ns3NixVector_methods(root_module, root_module['ns3::NixVector'])
     register_Ns3Node_methods(root_module, root_module['ns3::Node'])
@@ -1974,7 +2035,6 @@
     register_Ns3TdBetFfMacScheduler_methods(root_module, root_module['ns3::TdBetFfMacScheduler'])
     register_Ns3TdMtFfMacScheduler_methods(root_module, root_module['ns3::TdMtFfMacScheduler'])
     register_Ns3TdTbfqFfMacScheduler_methods(root_module, root_module['ns3::TdTbfqFfMacScheduler'])
-    register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
     register_Ns3TtaFfMacScheduler_methods(root_module, root_module['ns3::TtaFfMacScheduler'])
     register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker'])
@@ -2018,6 +2078,11 @@
     register_Ns3RrcConnectionSetupHeader_methods(root_module, root_module['ns3::RrcConnectionSetupHeader'])
     register_Ns3LteEnbNetDevice_methods(root_module, root_module['ns3::LteEnbNetDevice'])
     register_Ns3ConfigMatchContainer_methods(root_module, root_module['ns3::Config::MatchContainer'])
+    register_Ns3HashImplementation_methods(root_module, root_module['ns3::Hash::Implementation'])
+    register_Ns3HashFunctionFnv1a_methods(root_module, root_module['ns3::Hash::Function::Fnv1a'])
+    register_Ns3HashFunctionHash32_methods(root_module, root_module['ns3::Hash::Function::Hash32'])
+    register_Ns3HashFunctionHash64_methods(root_module, root_module['ns3::Hash::Function::Hash64'])
+    register_Ns3HashFunctionMurmur3_methods(root_module, root_module['ns3::Hash::Function::Murmur3'])
     return
 
 def register_Ns3Address_methods(root_module, cls):
@@ -3539,6 +3604,43 @@
     cls.add_instance_attribute('qci', 'ns3::EpsBearer::Qci', is_const=False)
     return
 
+def register_Ns3EutranMeasurementMapping_methods(root_module, cls):
+    ## lte-common.h (module 'lte'): ns3::EutranMeasurementMapping::EutranMeasurementMapping() [constructor]
+    cls.add_constructor([])
+    ## lte-common.h (module 'lte'): ns3::EutranMeasurementMapping::EutranMeasurementMapping(ns3::EutranMeasurementMapping const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::EutranMeasurementMapping const &', 'arg0')])
+    ## lte-common.h (module 'lte'): static uint8_t ns3::EutranMeasurementMapping::Db2RsrqRange(double db) [member function]
+    cls.add_method('Db2RsrqRange', 
+                   'uint8_t', 
+                   [param('double', 'db')], 
+                   is_static=True)
+    ## lte-common.h (module 'lte'): static uint8_t ns3::EutranMeasurementMapping::Dbm2RsrpRange(double dbm) [member function]
+    cls.add_method('Dbm2RsrpRange', 
+                   'uint8_t', 
+                   [param('double', 'dbm')], 
+                   is_static=True)
+    ## lte-common.h (module 'lte'): static double ns3::EutranMeasurementMapping::QuantizeRsrp(double v) [member function]
+    cls.add_method('QuantizeRsrp', 
+                   'double', 
+                   [param('double', 'v')], 
+                   is_static=True)
+    ## lte-common.h (module 'lte'): static double ns3::EutranMeasurementMapping::QuantizeRsrq(double v) [member function]
+    cls.add_method('QuantizeRsrq', 
+                   'double', 
+                   [param('double', 'v')], 
+                   is_static=True)
+    ## lte-common.h (module 'lte'): static double ns3::EutranMeasurementMapping::RsrpRange2Dbm(uint8_t range) [member function]
+    cls.add_method('RsrpRange2Dbm', 
+                   'double', 
+                   [param('uint8_t', 'range')], 
+                   is_static=True)
+    ## lte-common.h (module 'lte'): static double ns3::EutranMeasurementMapping::RsrqRange2Db(uint8_t range) [member function]
+    cls.add_method('RsrqRange2Db', 
+                   'double', 
+                   [param('uint8_t', 'range')], 
+                   is_static=True)
+    return
+
 def register_Ns3EventId_methods(root_module, cls):
     cls.add_binary_comparison_operator('!=')
     cls.add_binary_comparison_operator('==')
@@ -4234,6 +4336,35 @@
     cls.add_instance_attribute('m_rv', 'uint8_t', is_const=False)
     return
 
+def register_Ns3Hasher_methods(root_module, cls):
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher() [constructor]
+    cls.add_constructor([])
+    ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Ptr<ns3::Hash::Implementation> hp) [constructor]
+    cls.add_constructor([param('ns3::Ptr< ns3::Hash::Implementation >', 'hp')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint32_t ns3::Hasher::GetHash32(std::string const s) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')])
+    ## hash.h (module 'core'): uint64_t ns3::Hasher::GetHash64(std::string const s) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('std::string const', 's')])
+    ## hash.h (module 'core'): ns3::Hasher & ns3::Hasher::clear() [member function]
+    cls.add_method('clear', 
+                   'ns3::Hasher &', 
+                   [])
+    return
+
 def register_Ns3HigherLayerSelected_s_methods(root_module, cls):
     ## ff-mac-common.h (module 'lte'): ns3::HigherLayerSelected_s::HigherLayerSelected_s() [constructor]
     cls.add_constructor([])
@@ -4798,6 +4929,11 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsDocumentation() const [member function]
+    cls.add_method('IsDocumentation', 
+                   'bool', 
+                   [], 
+                   is_const=True)
     ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function]
     cls.add_method('IsEqual', 
                    'bool', 
@@ -4837,16 +4973,36 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac16Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function]
     cls.add_method('MakeAutoconfiguredAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac64Address addr, ns3::Ipv6Address prefix) [member function]
+    cls.add_method('MakeAutoconfiguredAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], 
+                   is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac16Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac16Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function]
     cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
                    'ns3::Ipv6Address', 
                    [param('ns3::Mac48Address', 'mac')], 
                    is_static=True)
+    ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac64Address mac) [member function]
+    cls.add_method('MakeAutoconfiguredLinkLocalAddress', 
+                   'ns3::Ipv6Address', 
+                   [param('ns3::Mac64Address', 'mac')], 
+                   is_static=True)
     ## ipv6-address.h (module 'network'): static ns3::Ipv6Address ns3::Ipv6Address::MakeIpv4MappedAddress(ns3::Ipv4Address addr) [member function]
     cls.add_method('MakeIpv4MappedAddress', 
                    'ns3::Ipv6Address', 
@@ -5626,6 +5782,8 @@
     cls.add_constructor([])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::LteRrcSap(ns3::LteRrcSap const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::LteRrcSap const &', 'arg0')])
+    ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::MaxReportCells [variable]
+    cls.add_static_attribute('MaxReportCells', 'uint8_t const', is_const=True)
     return
 
 def register_Ns3LteRrcSapAntennaInfoDedicated_methods(root_module, cls):
@@ -6571,6 +6729,33 @@
                    'void', 
                    [param('ns3::LteRrcSap::MasterInformationBlock', 'mib')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## lte-ue-cphy-sap.h (module 'lte'): void ns3::LteUeCphySapUser::ReportUeMeasurements(ns3::LteUeCphySapUser::UeMeasurementsParameters params) [member function]
+    cls.add_method('ReportUeMeasurements', 
+                   'void', 
+                   [param('ns3::LteUeCphySapUser::UeMeasurementsParameters', 'params')], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3LteUeCphySapUserUeMeasurementsElement_methods(root_module, cls):
+    ## lte-ue-cphy-sap.h (module 'lte'): ns3::LteUeCphySapUser::UeMeasurementsElement::UeMeasurementsElement() [constructor]
+    cls.add_constructor([])
+    ## lte-ue-cphy-sap.h (module 'lte'): ns3::LteUeCphySapUser::UeMeasurementsElement::UeMeasurementsElement(ns3::LteUeCphySapUser::UeMeasurementsElement const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::LteUeCphySapUser::UeMeasurementsElement const &', 'arg0')])
+    ## lte-ue-cphy-sap.h (module 'lte'): ns3::LteUeCphySapUser::UeMeasurementsElement::m_cellId [variable]
+    cls.add_instance_attribute('m_cellId', 'uint16_t', is_const=False)
+    ## lte-ue-cphy-sap.h (module 'lte'): ns3::LteUeCphySapUser::UeMeasurementsElement::m_rsrp [variable]
+    cls.add_instance_attribute('m_rsrp', 'double', is_const=False)
+    ## lte-ue-cphy-sap.h (module 'lte'): ns3::LteUeCphySapUser::UeMeasurementsElement::m_rsrq [variable]
+    cls.add_instance_attribute('m_rsrq', 'double', is_const=False)
+    return
+
+def register_Ns3LteUeCphySapUserUeMeasurementsParameters_methods(root_module, cls):
+    ## lte-ue-cphy-sap.h (module 'lte'): ns3::LteUeCphySapUser::UeMeasurementsParameters::UeMeasurementsParameters() [constructor]
+    cls.add_constructor([])
+    ## lte-ue-cphy-sap.h (module 'lte'): ns3::LteUeCphySapUser::UeMeasurementsParameters::UeMeasurementsParameters(ns3::LteUeCphySapUser::UeMeasurementsParameters const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::LteUeCphySapUser::UeMeasurementsParameters const &', 'arg0')])
+    ## lte-ue-cphy-sap.h (module 'lte'): ns3::LteUeCphySapUser::UeMeasurementsParameters::m_ueMeasurementsList [variable]
+    cls.add_instance_attribute('m_ueMeasurementsList', 'std::vector< ns3::LteUeCphySapUser::UeMeasurementsElement >', is_const=False)
     return
 
 def register_Ns3LteUePhySapProvider_methods(root_module, cls):
@@ -6690,6 +6875,11 @@
     cls.add_constructor([])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteUeRrcSapUser::LteUeRrcSapUser(ns3::LteUeRrcSapUser const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::LteUeRrcSapUser const &', 'arg0')])
+    ## lte-rrc-sap.h (module 'lte'): void ns3::LteUeRrcSapUser::SendMeasurementReport(ns3::LteRrcSap::MeasurementReport msg) [member function]
+    cls.add_method('SendMeasurementReport', 
+                   'void', 
+                   [param('ns3::LteRrcSap::MeasurementReport', 'msg')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## lte-rrc-sap.h (module 'lte'): void ns3::LteUeRrcSapUser::SendRrcConnectionReconfigurationCompleted(ns3::LteRrcSap::RrcConnectionReconfigurationCompleted msg) [member function]
     cls.add_method('SendRrcConnectionReconfigurationCompleted', 
                    'void', 
@@ -7271,6 +7461,10 @@
     cls.add_method('RemoveAll', 
                    'void', 
                    [])
+    ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function]
+    cls.add_method('Replace', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     return
 
 def register_Ns3PacketTagListTagData_methods(root_module, cls):
@@ -7981,6 +8175,11 @@
                    'std::string', 
                    [], 
                    is_const=True)
+    ## type-id.h (module 'core'): uint32_t ns3::TypeId::GetHash() const [member function]
+    cls.add_method('GetHash', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## type-id.h (module 'core'): std::string ns3::TypeId::GetName() const [member function]
     cls.add_method('GetName', 
                    'std::string', 
@@ -8040,6 +8239,16 @@
                    'bool', 
                    [param('std::string', 'name'), param('ns3::TypeId::AttributeInformation *', 'info', transfer_ownership=False)], 
                    is_const=True)
+    ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByHash(uint32_t hash) [member function]
+    cls.add_method('LookupByHash', 
+                   'ns3::TypeId', 
+                   [param('uint32_t', 'hash')], 
+                   is_static=True)
+    ## type-id.h (module 'core'): static bool ns3::TypeId::LookupByHashFailSafe(uint32_t hash, ns3::TypeId * tid) [member function]
+    cls.add_method('LookupByHashFailSafe', 
+                   'bool', 
+                   [param('uint32_t', 'hash'), param('ns3::TypeId *', 'tid')], 
+                   is_static=True)
     ## type-id.h (module 'core'): static ns3::TypeId ns3::TypeId::LookupByName(std::string name) [member function]
     cls.add_method('LookupByName', 
                    'ns3::TypeId', 
@@ -8334,19 +8543,6 @@
 def register_Ns3Int64x64_t_methods(root_module, cls):
     cls.add_binary_comparison_operator('!=')
     cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', 'right'))
-    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right'))
-    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long unsigned int const', 'right'))
-    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned int const', 'right'))
-    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short unsigned int const', 'right'))
-    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned char const', 'right'))
-    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long int const', 'right'))
-    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long int const', 'right'))
-    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('int const', 'right'))
-    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short int const', 'right'))
-    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('signed char const', 'right'))
-    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('double const', 'right'))
-    cls.add_unary_numeric_operator('-')
-    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', 'right'))
     cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right'))
     cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long unsigned int const', 'right'))
     cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned int const', 'right'))
@@ -8371,6 +8567,19 @@
     cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('signed char const', 'right'))
     cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('double const', 'right'))
     cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short unsigned int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned char const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short int const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('signed char const', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('double const', 'right'))
+    cls.add_unary_numeric_operator('-')
+    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', 'right'))
     cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right'))
     cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long unsigned int const', 'right'))
     cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned int const', 'right'))
@@ -9907,6 +10116,18 @@
                    is_static=True)
     return
 
+def register_Ns3SimpleRefCount__Ns3HashImplementation_Ns3Empty_Ns3DefaultDeleter__lt__ns3HashImplementation__gt___methods(root_module, cls):
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount() [constructor]
+    cls.add_constructor([])
+    ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::SimpleRefCount(ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> > const & o) [copy constructor]
+    cls.add_constructor([param('ns3::SimpleRefCount< ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter< ns3::Hash::Implementation > > const &', 'o')])
+    ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount<ns3::Hash::Implementation, ns3::empty, ns3::DefaultDeleter<ns3::Hash::Implementation> >::Cleanup() [member function]
+    cls.add_method('Cleanup', 
+                   'void', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3SimpleRefCount__Ns3Ipv4MulticastRoute_Ns3Empty_Ns3DefaultDeleter__lt__ns3Ipv4MulticastRoute__gt___methods(root_module, cls):
     ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> >::SimpleRefCount() [constructor]
     cls.add_constructor([])
@@ -10854,13 +11075,13 @@
     return
 
 def register_Ns3SpectrumValue_methods(root_module, cls):
-    cls.add_unary_numeric_operator('-')
-    cls.add_binary_numeric_operator('-', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('double', 'right'))
-    cls.add_binary_numeric_operator('-', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('ns3::SpectrumValue const &', 'right'))
     cls.add_binary_numeric_operator('*', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('double', 'right'))
     cls.add_binary_numeric_operator('*', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('ns3::SpectrumValue const &', 'right'))
     cls.add_binary_numeric_operator('+', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('double', 'right'))
     cls.add_binary_numeric_operator('+', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('ns3::SpectrumValue const &', 'right'))
+    cls.add_unary_numeric_operator('-')
+    cls.add_binary_numeric_operator('-', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('double', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('ns3::SpectrumValue const &', 'right'))
     cls.add_binary_numeric_operator('/', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('double', 'right'))
     cls.add_binary_numeric_operator('/', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('ns3::SpectrumValue const &', 'right'))
     cls.add_output_stream_operator()
@@ -10926,8 +11147,8 @@
 def register_Ns3Time_methods(root_module, cls):
     cls.add_binary_comparison_operator('!=')
     cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', 'right'))
-    cls.add_binary_numeric_operator('-', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))
     cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))
+    cls.add_binary_numeric_operator('-', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))
     cls.add_binary_comparison_operator('<')
     cls.add_binary_comparison_operator('>')
     cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', 'right'))
@@ -11057,11 +11278,26 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Max() [member function]
+    cls.add_method('Max', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
+    ## nstime.h (module 'core'): static ns3::Time ns3::Time::Min() [member function]
+    cls.add_method('Min', 
+                   'ns3::Time', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function]
     cls.add_method('SetResolution', 
                    'void', 
                    [param('ns3::Time::Unit', 'resolution')], 
                    is_static=True)
+    ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function]
+    cls.add_method('StaticInit', 
+                   'bool', 
+                   [], 
+                   is_static=True)
     ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
     cls.add_method('To', 
                    'ns3::int64x64_t', 
@@ -11304,6 +11540,10 @@
     cls.add_method('RecvSnStatusTransfer', 
                    'void', 
                    [param('ns3::EpcX2Sap::SnStatusTransferParams', 'params')])
+    ## lte-enb-rrc.h (module 'lte'): void ns3::UeManager::RecvUeContextRelease(ns3::EpcX2Sap::UeContextReleaseParams params) [member function]
+    cls.add_method('RecvUeContextRelease', 
+                   'void', 
+                   [param('ns3::EpcX2Sap::UeContextReleaseParams', 'params')])
     ## lte-enb-rrc.h (module 'lte'): void ns3::UeManager::ReleaseDataRadioBearer(uint8_t drbid) [member function]
     cls.add_method('ReleaseDataRadioBearer', 
                    'void', 
@@ -11352,6 +11592,19 @@
                    visibility='protected', is_virtual=True)
     return
 
+def register_Ns3UeMeasure_methods(root_module, cls):
+    ## lte-enb-rrc.h (module 'lte'): ns3::UeMeasure::UeMeasure() [constructor]
+    cls.add_constructor([])
+    ## lte-enb-rrc.h (module 'lte'): ns3::UeMeasure::UeMeasure(ns3::UeMeasure const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::UeMeasure const &', 'arg0')])
+    ## lte-enb-rrc.h (module 'lte'): ns3::UeMeasure::m_cellId [variable]
+    cls.add_instance_attribute('m_cellId', 'uint16_t', is_const=False)
+    ## lte-enb-rrc.h (module 'lte'): ns3::UeMeasure::m_rsrp [variable]
+    cls.add_instance_attribute('m_rsrp', 'uint8_t', is_const=False)
+    ## lte-enb-rrc.h (module 'lte'): ns3::UeMeasure::m_rsrq [variable]
+    cls.add_instance_attribute('m_rsrq', 'uint8_t', is_const=False)
+    return
+
 def register_Ns3UniformRandomVariable_methods(root_module, cls):
     ## random-variable-stream.h (module 'core'): static ns3::TypeId ns3::UniformRandomVariable::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
@@ -13950,6 +14203,11 @@
                    'bool', 
                    [param('uint32_t', 'interface'), param('uint32_t', 'addressIndex')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## ipv4.h (module 'internet'): bool ns3::Ipv4::RemoveAddress(uint32_t interface, ns3::Ipv4Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'bool', 
+                   [param('uint32_t', 'interface'), param('ns3::Ipv4Address', 'address')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## ipv4.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4::SelectSourceAddress(ns3::Ptr<const ns3::NetDevice> device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function]
     cls.add_method('SelectSourceAddress', 
                    'ns3::Ipv4Address', 
@@ -14312,6 +14570,10 @@
     cls.add_method('RemoveAddress', 
                    'ns3::Ipv6InterfaceAddress', 
                    [param('uint32_t', 'index')])
+    ## ipv6-interface.h (module 'internet'): ns3::Ipv6InterfaceAddress ns3::Ipv6Interface::RemoveAddress(ns3::Ipv6Address address) [member function]
+    cls.add_method('RemoveAddress', 
+                   'ns3::Ipv6InterfaceAddress', 
+                   [param('ns3::Ipv6Address', 'address')])
     ## ipv6-interface.h (module 'internet'): void ns3::Ipv6Interface::Send(ns3::Ptr<ns3::Packet> p, ns3::Ipv6Address dest) [member function]
     cls.add_method('Send', 
                    'void', 
@@ -14562,10 +14824,18 @@
     cls.add_constructor([param('ns3::LteEnbRrc const &', 'arg0')])
     ## lte-enb-rrc.h (module 'lte'): ns3::LteEnbRrc::LteEnbRrc() [constructor]
     cls.add_constructor([])
+    ## lte-enb-rrc.h (module 'lte'): void ns3::LteEnbRrc::AddX2Neighbour(uint16_t cellId) [member function]
+    cls.add_method('AddX2Neighbour', 
+                   'void', 
+                   [param('uint16_t', 'cellId')])
     ## lte-enb-rrc.h (module 'lte'): void ns3::LteEnbRrc::ConfigureCell(uint8_t ulBandwidth, uint8_t dlBandwidth, uint16_t ulEarfcn, uint16_t dlEarfcn, uint16_t cellId) [member function]
     cls.add_method('ConfigureCell', 
                    'void', 
                    [param('uint8_t', 'ulBandwidth'), param('uint8_t', 'dlBandwidth'), param('uint16_t', 'ulEarfcn'), param('uint16_t', 'dlEarfcn'), param('uint16_t', 'cellId')])
+    ## lte-enb-rrc.h (module 'lte'): void ns3::LteEnbRrc::ConnectionRejectedTimeout(uint16_t rnti) [member function]
+    cls.add_method('ConnectionRejectedTimeout', 
+                   'void', 
+                   [param('uint16_t', 'rnti')])
     ## lte-enb-rrc.h (module 'lte'): void ns3::LteEnbRrc::ConnectionTimeout(uint16_t rnti) [member function]
     cls.add_method('ConnectionTimeout', 
                    'void', 
@@ -14604,6 +14874,14 @@
     cls.add_method('GetUeManager', 
                    'ns3::Ptr< ns3::UeManager >', 
                    [param('uint16_t', 'rnti')])
+    ## lte-enb-rrc.h (module 'lte'): void ns3::LteEnbRrc::HandoverJoiningTimeout(uint16_t rnti) [member function]
+    cls.add_method('HandoverJoiningTimeout', 
+                   'void', 
+                   [param('uint16_t', 'rnti')])
+    ## lte-enb-rrc.h (module 'lte'): void ns3::LteEnbRrc::HandoverLeavingTimeout(uint16_t rnti) [member function]
+    cls.add_method('HandoverLeavingTimeout', 
+                   'void', 
+                   [param('uint16_t', 'rnti')])
     ## lte-enb-rrc.h (module 'lte'): bool ns3::LteEnbRrc::SendData(ns3::Ptr<ns3::Packet> p) [member function]
     cls.add_method('SendData', 
                    'bool', 
@@ -14890,6 +15168,11 @@
     cls.add_method('GetRlcStats', 
                    'ns3::Ptr< ns3::RadioBearerStatsCalculator >', 
                    [])
+    ## lte-helper.h (module 'lte'): std::string ns3::LteHelper::GetSchedulerType() const [member function]
+    cls.add_method('GetSchedulerType', 
+                   'std::string', 
+                   [], 
+                   is_const=True)
     ## lte-helper.h (module 'lte'): static ns3::TypeId ns3::LteHelper::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
                    'ns3::TypeId', 
@@ -15582,10 +15865,10 @@
     cls.add_method('StartTxDataFrame', 
                    'bool', 
                    [param('ns3::Ptr< ns3::PacketBurst >', 'pb'), param('std::list< ns3::Ptr< ns3::LteControlMessage > >', 'ctrlMsgList'), param('ns3::Time', 'duration')])
-    ## lte-spectrum-phy.h (module 'lte'): bool ns3::LteSpectrumPhy::StartTxDlCtrlFrame(std::list<ns3::Ptr<ns3::LteControlMessage>, std::allocator<ns3::Ptr<ns3::LteControlMessage> > > ctrlMsgList) [member function]
+    ## lte-spectrum-phy.h (module 'lte'): bool ns3::LteSpectrumPhy::StartTxDlCtrlFrame(std::list<ns3::Ptr<ns3::LteControlMessage>, std::allocator<ns3::Ptr<ns3::LteControlMessage> > > ctrlMsgList, bool pss) [member function]
     cls.add_method('StartTxDlCtrlFrame', 
                    'bool', 
-                   [param('std::list< ns3::Ptr< ns3::LteControlMessage > >', 'ctrlMsgList')])
+                   [param('std::list< ns3::Ptr< ns3::LteControlMessage > >', 'ctrlMsgList'), param('bool', 'pss')])
     ## lte-spectrum-phy.h (module 'lte'): bool ns3::LteSpectrumPhy::StartTxUlSrsFrame() [member function]
     cls.add_method('StartTxUlSrsFrame', 
                    'bool', 
@@ -15610,6 +15893,10 @@
     cls.add_method('SetLtePhyRxCtrlEndErrorCallback', 
                    'void', 
                    [param('ns3::LtePhyRxCtrlEndErrorCallback', 'c')])
+    ## lte-spectrum-phy.h (module 'lte'): void ns3::LteSpectrumPhy::SetLtePhyRxPssCallback(ns3::LtePhyRxPssCallback c) [member function]
+    cls.add_method('SetLtePhyRxPssCallback', 
+                   'void', 
+                   [param('ns3::LtePhyRxPssCallback', 'c')])
     ## lte-spectrum-phy.h (module 'lte'): void ns3::LteSpectrumPhy::SetLtePhyDlHarqFeedbackCallback(ns3::LtePhyDlHarqFeedbackCallback c) [member function]
     cls.add_method('SetLtePhyDlHarqFeedbackCallback', 
                    'void', 
@@ -15634,8 +15921,12 @@
     cls.add_method('AddDataSinrChunkProcessor', 
                    'void', 
                    [param('ns3::Ptr< ns3::LteSinrChunkProcessor >', 'p')])
-    ## lte-spectrum-phy.h (module 'lte'): void ns3::LteSpectrumPhy::AddInterferenceChunkProcessor(ns3::Ptr<ns3::LteSinrChunkProcessor> p) [member function]
-    cls.add_method('AddInterferenceChunkProcessor', 
+    ## lte-spectrum-phy.h (module 'lte'): void ns3::LteSpectrumPhy::AddInterferenceCtrlChunkProcessor(ns3::Ptr<ns3::LteSinrChunkProcessor> p) [member function]
+    cls.add_method('AddInterferenceCtrlChunkProcessor', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::LteSinrChunkProcessor >', 'p')])
+    ## lte-spectrum-phy.h (module 'lte'): void ns3::LteSpectrumPhy::AddInterferenceDataChunkProcessor(ns3::Ptr<ns3::LteSinrChunkProcessor> p) [member function]
+    cls.add_method('AddInterferenceDataChunkProcessor', 
                    'void', 
                    [param('ns3::Ptr< ns3::LteSinrChunkProcessor >', 'p')])
     ## lte-spectrum-phy.h (module 'lte'): void ns3::LteSpectrumPhy::AddCtrlSinrChunkProcessor(ns3::Ptr<ns3::LteSinrChunkProcessor> p) [member function]
@@ -15710,6 +16001,8 @@
     cls.add_instance_attribute('cellId', 'uint16_t', is_const=False)
     ## lte-spectrum-signal-parameters.h (module 'lte'): ns3::LteSpectrumSignalParametersDlCtrlFrame::ctrlMsgList [variable]
     cls.add_instance_attribute('ctrlMsgList', 'std::list< ns3::Ptr< ns3::LteControlMessage > >', is_const=False)
+    ## lte-spectrum-signal-parameters.h (module 'lte'): ns3::LteSpectrumSignalParametersDlCtrlFrame::pss [variable]
+    cls.add_instance_attribute('pss', 'bool', is_const=False)
     return
 
 def register_Ns3LteSpectrumSignalParametersUlSrsFrame_methods(root_module, cls):
@@ -15776,6 +16069,46 @@
     cls.add_method('SetUlOutputFilename', 
                    'void', 
                    [param('std::string', 'outputFilename')])
+    ## lte-stats-calculator.h (module 'lte'): static uint16_t ns3::LteStatsCalculator::FindCellIdFromEnbMac(std::string path, uint16_t rnti) [member function]
+    cls.add_method('FindCellIdFromEnbMac', 
+                   'uint16_t', 
+                   [param('std::string', 'path'), param('uint16_t', 'rnti')], 
+                   is_static=True, visibility='protected')
+    ## lte-stats-calculator.h (module 'lte'): static uint16_t ns3::LteStatsCalculator::FindCellIdFromEnbRlcPath(std::string path) [member function]
+    cls.add_method('FindCellIdFromEnbRlcPath', 
+                   'uint16_t', 
+                   [param('std::string', 'path')], 
+                   is_static=True, visibility='protected')
+    ## lte-stats-calculator.h (module 'lte'): static uint64_t ns3::LteStatsCalculator::FindImsiForEnb(std::string path, uint16_t rnti) [member function]
+    cls.add_method('FindImsiForEnb', 
+                   'uint64_t', 
+                   [param('std::string', 'path'), param('uint16_t', 'rnti')], 
+                   is_static=True, visibility='protected')
+    ## lte-stats-calculator.h (module 'lte'): static uint64_t ns3::LteStatsCalculator::FindImsiForUe(std::string path, uint16_t rnti) [member function]
+    cls.add_method('FindImsiForUe', 
+                   'uint64_t', 
+                   [param('std::string', 'path'), param('uint16_t', 'rnti')], 
+                   is_static=True, visibility='protected')
+    ## lte-stats-calculator.h (module 'lte'): static uint64_t ns3::LteStatsCalculator::FindImsiFromEnbMac(std::string path, uint16_t rnti) [member function]
+    cls.add_method('FindImsiFromEnbMac', 
+                   'uint64_t', 
+                   [param('std::string', 'path'), param('uint16_t', 'rnti')], 
+                   is_static=True, visibility='protected')
+    ## lte-stats-calculator.h (module 'lte'): static uint64_t ns3::LteStatsCalculator::FindImsiFromEnbRlcPath(std::string path) [member function]
+    cls.add_method('FindImsiFromEnbRlcPath', 
+                   'uint64_t', 
+                   [param('std::string', 'path')], 
+                   is_static=True, visibility='protected')
+    ## lte-stats-calculator.h (module 'lte'): static uint64_t ns3::LteStatsCalculator::FindImsiFromLteNetDevice(std::string path) [member function]
+    cls.add_method('FindImsiFromLteNetDevice', 
+                   'uint64_t', 
+                   [param('std::string', 'path')], 
+                   is_static=True, visibility='protected')
+    ## lte-stats-calculator.h (module 'lte'): static uint64_t ns3::LteStatsCalculator::FindImsiFromUePhy(std::string path) [member function]
+    cls.add_method('FindImsiFromUePhy', 
+                   'uint64_t', 
+                   [param('std::string', 'path')], 
+                   is_static=True, visibility='protected')
     return
 
 def register_Ns3LteUeMac_methods(root_module, cls):
@@ -15919,6 +16252,11 @@
                    'void', 
                    [param('ns3::DlInfoListElement_s', 'mes')], 
                    is_virtual=True)
+    ## lte-ue-phy.h (module 'lte'): void ns3::LteUePhy::ReceivePss(uint16_t cellId, ns3::Ptr<ns3::SpectrumValue> p) [member function]
+    cls.add_method('ReceivePss', 
+                   'void', 
+                   [param('uint16_t', 'cellId'), param('ns3::Ptr< ns3::SpectrumValue >', 'p')], 
+                   is_virtual=True)
     ## lte-ue-phy.h (module 'lte'): void ns3::LteUePhy::ReportInterference(ns3::SpectrumValue const & interf) [member function]
     cls.add_method('ReportInterference', 
                    'void', 
@@ -16193,6 +16531,11 @@
     cls.add_method('DlScheduling', 
                    'void', 
                    [param('uint16_t', 'cellId'), param('uint64_t', 'imsi'), param('uint32_t', 'frameNo'), param('uint32_t', 'subframeNo'), param('uint16_t', 'rnti'), param('uint8_t', 'mcsTb1'), param('uint16_t', 'sizeTb1'), param('uint8_t', 'mcsTb2'), param('uint16_t', 'sizeTb2')])
+    ## mac-stats-calculator.h (module 'lte'): static void ns3::MacStatsCalculator::DlSchedulingCallback(ns3::Ptr<ns3::MacStatsCalculator> macStats, std::string path, uint32_t frameNo, uint32_t subframeNo, uint16_t rnti, uint8_t mcsTb1, uint16_t sizeTb1, uint8_t mcsTb2, uint16_t sizeTb2) [member function]
+    cls.add_method('DlSchedulingCallback', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::MacStatsCalculator >', 'macStats'), param('std::string', 'path'), param('uint32_t', 'frameNo'), param('uint32_t', 'subframeNo'), param('uint16_t', 'rnti'), param('uint8_t', 'mcsTb1'), param('uint16_t', 'sizeTb1'), param('uint8_t', 'mcsTb2'), param('uint16_t', 'sizeTb2')], 
+                   is_static=True)
     ## mac-stats-calculator.h (module 'lte'): std::string ns3::MacStatsCalculator::GetDlOutputFilename() [member function]
     cls.add_method('GetDlOutputFilename', 
                    'std::string', 
@@ -16218,6 +16561,11 @@
     cls.add_method('UlScheduling', 
                    'void', 
                    [param('uint16_t', 'cellId'), param('uint64_t', 'imsi'), param('uint32_t', 'frameNo'), param('uint32_t', 'subframeNo'), param('uint16_t', 'rnti'), param('uint8_t', 'mcs'), param('uint16_t', 'sizeTb')])
+    ## mac-stats-calculator.h (module 'lte'): static void ns3::MacStatsCalculator::UlSchedulingCallback(ns3::Ptr<ns3::MacStatsCalculator> macStats, std::string path, uint32_t frameNo, uint32_t subframeNo, uint16_t rnti, uint8_t mcs, uint16_t size) [member function]
+    cls.add_method('UlSchedulingCallback', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::MacStatsCalculator >', 'macStats'), param('std::string', 'path'), param('uint32_t', 'frameNo'), param('uint32_t', 'subframeNo'), param('uint16_t', 'rnti'), param('uint8_t', 'mcs'), param('uint16_t', 'size')], 
+                   is_static=True)
     return
 
 def register_Ns3MibLteControlMessage_methods(root_module, cls):
@@ -16301,6 +16649,23 @@
                    is_pure_virtual=True, visibility='private', is_virtual=True)
     return
 
+def register_Ns3NeighbourRelation_methods(root_module, cls):
+    ## lte-enb-rrc.h (module 'lte'): ns3::NeighbourRelation::NeighbourRelation() [constructor]
+    cls.add_constructor([])
+    ## lte-enb-rrc.h (module 'lte'): ns3::NeighbourRelation::NeighbourRelation(ns3::NeighbourRelation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::NeighbourRelation const &', 'arg0')])
+    ## lte-enb-rrc.h (module 'lte'): ns3::NeighbourRelation::m_detectedAsNeighbour [variable]
+    cls.add_instance_attribute('m_detectedAsNeighbour', 'bool', is_const=False)
+    ## lte-enb-rrc.h (module 'lte'): ns3::NeighbourRelation::m_noHo [variable]
+    cls.add_instance_attribute('m_noHo', 'bool', is_const=False)
+    ## lte-enb-rrc.h (module 'lte'): ns3::NeighbourRelation::m_noRemove [variable]
+    cls.add_instance_attribute('m_noRemove', 'bool', is_const=False)
+    ## lte-enb-rrc.h (module 'lte'): ns3::NeighbourRelation::m_noX2 [variable]
+    cls.add_instance_attribute('m_noX2', 'bool', is_const=False)
+    ## lte-enb-rrc.h (module 'lte'): ns3::NeighbourRelation::m_physCellId [variable]
+    cls.add_instance_attribute('m_physCellId', 'uint16_t', is_const=False)
+    return
+
 def register_Ns3NetDevice_methods(root_module, cls):
     ## net-device.h (module 'network'): ns3::NetDevice::NetDevice() [constructor]
     cls.add_constructor([])
@@ -16815,6 +17180,10 @@
     cls.add_method('RemoveTrailer', 
                    'uint32_t', 
                    [param('ns3::Trailer &', 'trailer')])
+    ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function]
+    cls.add_method('ReplacePacketTag', 
+                   'bool', 
+                   [param('ns3::Tag &', 'tag')])
     ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function]
     cls.add_method('Serialize', 
                    'uint32_t', 
@@ -16919,6 +17288,11 @@
     cls.add_method('DlPhyReception', 
                    'void', 
                    [param('ns3::PhyReceptionStatParameters', 'params')])
+    ## phy-rx-stats-calculator.h (module 'lte'): static void ns3::PhyRxStatsCalculator::DlPhyReceptionCallback(ns3::Ptr<ns3::PhyRxStatsCalculator> phyRxStats, std::string path, ns3::PhyReceptionStatParameters params) [member function]
+    cls.add_method('DlPhyReceptionCallback', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::PhyRxStatsCalculator >', 'phyRxStats'), param('std::string', 'path'), param('ns3::PhyReceptionStatParameters', 'params')], 
+                   is_static=True)
     ## phy-rx-stats-calculator.h (module 'lte'): std::string ns3::PhyRxStatsCalculator::GetDlRxOutputFilename() [member function]
     cls.add_method('GetDlRxOutputFilename', 
                    'std::string', 
@@ -16944,6 +17318,11 @@
     cls.add_method('UlPhyReception', 
                    'void', 
                    [param('ns3::PhyReceptionStatParameters', 'params')])
+    ## phy-rx-stats-calculator.h (module 'lte'): static void ns3::PhyRxStatsCalculator::UlPhyReceptionCallback(ns3::Ptr<ns3::PhyRxStatsCalculator> phyRxStats, std::string path, ns3::PhyReceptionStatParameters params) [member function]
+    cls.add_method('UlPhyReceptionCallback', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::PhyRxStatsCalculator >', 'phyRxStats'), param('std::string', 'path'), param('ns3::PhyReceptionStatParameters', 'params')], 
+                   is_static=True)
     return
 
 def register_Ns3PhyStatsCalculator_methods(root_module, cls):
@@ -16972,14 +17351,29 @@
     cls.add_method('ReportCurrentCellRsrpSinr', 
                    'void', 
                    [param('uint16_t', 'cellId'), param('uint64_t', 'imsi'), param('uint16_t', 'rnti'), param('double', 'rsrp'), param('double', 'sinr')])
+    ## phy-stats-calculator.h (module 'lte'): static void ns3::PhyStatsCalculator::ReportCurrentCellRsrpSinrCallback(ns3::Ptr<ns3::PhyStatsCalculator> phyStats, std::string path, uint16_t cellId, uint16_t rnti, double rsrp, double sinr) [member function]
+    cls.add_method('ReportCurrentCellRsrpSinrCallback', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::PhyStatsCalculator >', 'phyStats'), param('std::string', 'path'), param('uint16_t', 'cellId'), param('uint16_t', 'rnti'), param('double', 'rsrp'), param('double', 'sinr')], 
+                   is_static=True)
     ## phy-stats-calculator.h (module 'lte'): void ns3::PhyStatsCalculator::ReportInterference(uint16_t cellId, ns3::Ptr<ns3::SpectrumValue> interference) [member function]
     cls.add_method('ReportInterference', 
                    'void', 
                    [param('uint16_t', 'cellId'), param('ns3::Ptr< ns3::SpectrumValue >', 'interference')])
+    ## phy-stats-calculator.h (module 'lte'): static void ns3::PhyStatsCalculator::ReportInterference(ns3::Ptr<ns3::PhyStatsCalculator> phyStats, std::string path, uint16_t cellId, ns3::Ptr<ns3::SpectrumValue> interference) [member function]
+    cls.add_method('ReportInterference', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::PhyStatsCalculator >', 'phyStats'), param('std::string', 'path'), param('uint16_t', 'cellId'), param('ns3::Ptr< ns3::SpectrumValue >', 'interference')], 
+                   is_static=True)
     ## phy-stats-calculator.h (module 'lte'): void ns3::PhyStatsCalculator::ReportUeSinr(uint16_t cellId, uint64_t imsi, uint16_t rnti, double sinrLinear) [member function]
     cls.add_method('ReportUeSinr', 
                    'void', 
                    [param('uint16_t', 'cellId'), param('uint64_t', 'imsi'), param('uint16_t', 'rnti'), param('double', 'sinrLinear')])
+    ## phy-stats-calculator.h (module 'lte'): static void ns3::PhyStatsCalculator::ReportUeSinr(ns3::Ptr<ns3::PhyStatsCalculator> phyStats, std::string path, uint16_t cellId, uint16_t rnti, double sinrLinear) [member function]
+    cls.add_method('ReportUeSinr', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::PhyStatsCalculator >', 'phyStats'), param('std::string', 'path'), param('uint16_t', 'cellId'), param('uint16_t', 'rnti'), param('double', 'sinrLinear')], 
+                   is_static=True)
     ## phy-stats-calculator.h (module 'lte'): void ns3::PhyStatsCalculator::SetCurrentCellRsrpSinrFilename(std::string filename) [member function]
     cls.add_method('SetCurrentCellRsrpSinrFilename', 
                    'void', 
@@ -17003,6 +17397,11 @@
     cls.add_method('DlPhyTransmission', 
                    'void', 
                    [param('ns3::PhyTransmissionStatParameters', 'params')])
+    ## phy-tx-stats-calculator.h (module 'lte'): static void ns3::PhyTxStatsCalculator::DlPhyTransmissionCallback(ns3::Ptr<ns3::PhyTxStatsCalculator> phyTxStats, std::string path, ns3::PhyTransmissionStatParameters params) [member function]
+    cls.add_method('DlPhyTransmissionCallback', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::PhyTxStatsCalculator >', 'phyTxStats'), param('std::string', 'path'), param('ns3::PhyTransmissionStatParameters', 'params')], 
+                   is_static=True)
     ## phy-tx-stats-calculator.h (module 'lte'): std::string ns3::PhyTxStatsCalculator::GetDlTxOutputFilename() [member function]
     cls.add_method('GetDlTxOutputFilename', 
                    'std::string', 
@@ -17028,6 +17427,11 @@
     cls.add_method('UlPhyTransmission', 
                    'void', 
                    [param('ns3::PhyTransmissionStatParameters', 'params')])
+    ## phy-tx-stats-calculator.h (module 'lte'): static void ns3::PhyTxStatsCalculator::UlPhyTransmissionCallback(ns3::Ptr<ns3::PhyTxStatsCalculator> phyTxStats, std::string path, ns3::PhyTransmissionStatParameters params) [member function]
+    cls.add_method('UlPhyTransmissionCallback', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::PhyTxStatsCalculator >', 'phyTxStats'), param('std::string', 'path'), param('ns3::PhyTransmissionStatParameters', 'params')], 
+                   is_static=True)
     return
 
 def register_Ns3PointerChecker_methods(root_module, cls):
@@ -17955,13 +18359,6 @@
                    [param('uint16_t', 'rnti'), param('uint8_t', 'txMode')])
     return
 
-def register_Ns3TimeChecker_methods(root_module, cls):
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor]
-    cls.add_constructor([])
-    ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')])
-    return
-
 def register_Ns3TimeValue_methods(root_module, cls):
     ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor]
     cls.add_constructor([])
@@ -19772,10 +20169,116 @@
                    [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')])
     return
 
+def register_Ns3HashImplementation_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation(ns3::Hash::Implementation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Implementation const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Implementation::Implementation() [constructor]
+    cls.add_constructor([])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Implementation::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Implementation::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Implementation::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_pure_virtual=True, is_virtual=True)
+    return
+
+def register_Ns3HashFunctionFnv1a_methods(root_module, cls):
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a(ns3::Hash::Function::Fnv1a const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Fnv1a const &', 'arg0')])
+    ## hash-fnv.h (module 'core'): ns3::Hash::Function::Fnv1a::Fnv1a() [constructor]
+    cls.add_constructor([])
+    ## hash-fnv.h (module 'core'): uint32_t ns3::Hash::Function::Fnv1a::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): uint64_t ns3::Hash::Function::Fnv1a::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-fnv.h (module 'core'): void ns3::Hash::Function::Fnv1a::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash32_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Function::Hash32 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash32 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash32::Hash32(ns3::Hash::Hash32Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash32Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash32::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash32::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionHash64_methods(root_module, cls):
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Function::Hash64 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Hash64 const &', 'arg0')])
+    ## hash-function.h (module 'core'): ns3::Hash::Function::Hash64::Hash64(ns3::Hash::Hash64Function_ptr hp) [constructor]
+    cls.add_constructor([param('ns3::Hash::Hash64Function_ptr', 'hp')])
+    ## hash-function.h (module 'core'): uint32_t ns3::Hash::Function::Hash64::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): uint64_t ns3::Hash::Function::Hash64::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-function.h (module 'core'): void ns3::Hash::Function::Hash64::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
+def register_Ns3HashFunctionMurmur3_methods(root_module, cls):
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3(ns3::Hash::Function::Murmur3 const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Hash::Function::Murmur3 const &', 'arg0')])
+    ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3::Murmur3() [constructor]
+    cls.add_constructor([])
+    ## hash-murmur3.h (module 'core'): uint32_t ns3::Hash::Function::Murmur3::GetHash32(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash32', 
+                   'uint32_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): uint64_t ns3::Hash::Function::Murmur3::GetHash64(char const * buffer, size_t const size) [member function]
+    cls.add_method('GetHash64', 
+                   'uint64_t', 
+                   [param('char const *', 'buffer'), param('size_t const', 'size')], 
+                   is_virtual=True)
+    ## hash-murmur3.h (module 'core'): void ns3::Hash::Function::Murmur3::clear() [member function]
+    cls.add_method('clear', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    return
+
 def register_functions(root_module):
     module = root_module
     register_functions_ns3_Config(module.get_submodule('Config'), root_module)
     register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
+    register_functions_ns3_Hash(module.get_submodule('Hash'), root_module)
     register_functions_ns3_internal(module.get_submodule('internal'), root_module)
     return
 
@@ -19785,6 +20288,13 @@
 def register_functions_ns3_FatalImpl(module, root_module):
     return
 
+def register_functions_ns3_Hash(module, root_module):
+    register_functions_ns3_Hash_Function(module.get_submodule('Function'), root_module)
+    return
+
+def register_functions_ns3_Hash_Function(module, root_module):
+    return
+
 def register_functions_ns3_internal(module, root_module):
     return
 
diff -Naur ns-3.17/src/lte/doc/Makefile ns-3.18/src/lte/doc/Makefile
--- ns-3.17/src/lte/doc/Makefile	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/lte/doc/Makefile	2013-10-26 07:07:30.107364395 -0700
@@ -79,6 +79,7 @@
 $(FIGURES)/mac-random-access-contention.pdf_width = 10cm
 $(FIGURES)/mac-random-access-noncontention.pdf_width = 15cm
 $(FIGURES)/lte-ue-rrc-states.pdf_width = 7cm
+$(FIGURES)/lte-handover-algorithm.pdf_width = 10cm
 $(FIGURES)/helpers.pdf_width = 8cm
 
 IMAGES_SEQDIAG = \
@@ -93,7 +94,8 @@
 
 IMAGES_DOT = \
 	$(FIGURES)/lte-enb-rrc-states.dot \
-	$(FIGURES)/lte-ue-rrc-states.dot
+	$(FIGURES)/lte-ue-rrc-states.dot \
+	$(FIGURES)/lte-handover-algorithm.dot
 
 IMAGES_NOBUILD = $(FIGURES)/fading_pedestrian.png \
 	$(FIGURES)/fading_vehicular.png \
@@ -146,6 +148,8 @@
 
 IMAGES = $(IMAGES_NOBUILD) $(IMAGES_BUILD)
 
+RESCALE = $(shell hg root)/utils/rescale-pdf.sh
+
 %.eps : %.dia; $(DIA) -t eps $< -e $@
 %.png : %.dia; $(DIA) -t png $< -e $@
 %.png : %.seqdiag; $(SEQDIAG) -Tpng --no-transparency -o $@ $< 
@@ -153,19 +157,14 @@
 %.png : %.eps; $(CONVERT) $< $@
 %.pdf : %.seqdiag
 	$(SEQDIAG) -Tpdf -o $@ $<
-	if test x$($@_width) != x; then ./rescale-pdf.sh $($@_width) $@ ; fi
+	if test x$($@_width) != x; then $(RESCALE) $($@_width) $@ ; fi
 %.pdf : %.dot
 	$(DOT) -Tpdf -o $@ $<
-	if test x$($@_width) != x; then ./rescale-pdf.sh $($@_width) $@ ; fi
+	if test x$($@_width) != x; then $(RESCALE) $($@_width) $@ ; fi
 %.pdf : %.eps
 	$(EPSTOPDF) $< -o=$@
-	if test x$($@_width) != x; ./rescale-pdf.sh $($@_width) $@ ; fi
-
+	if test x$($@_width) != x; then $(RESCALE) $($@_width) $@ ; fi
 
-%.png : %.eps; $(CONVERT) $< $@
-%.pdf : %.eps
-	$(EPSTOPDF) $< -o=$@
-	if test x$($@_width) != x; then ./rescale-pdf.sh $($@_width) $@ ; fi
 
 # You can set these variables from the command line.
 SPHINXOPTS    =
diff -Naur ns-3.17/src/lte/doc/rescale-pdf.sh ns-3.18/src/lte/doc/rescale-pdf.sh
--- ns-3.17/src/lte/doc/rescale-pdf.sh	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/lte/doc/rescale-pdf.sh	1969-12-31 16:00:00.000000000 -0800
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-TMPDIR=/tmp
-
-TMPFILE=`mktemp`
-
-echo "\documentclass{book}
-\usepackage{pdfpages}
-\begin{document}
-\includepdf[width=${1},fitpaper]{${2}}
-\end{document}" >${TMPFILE}.tex
-pdflatex -output-directory /tmp ${TMPFILE}.tex >/dev/null 2>/dev/null
-cp ${TMPFILE}.pdf ${2}
-rm -f ${TMPFILE}{,.{tex,aux,log,pdf}}
diff -Naur ns-3.17/src/lte/doc/source/conf.py ns-3.18/src/lte/doc/source/conf.py
--- ns-3.17/src/lte/doc/source/conf.py	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/lte/doc/source/conf.py	2013-10-26 07:07:30.107364395 -0700
@@ -50,7 +50,7 @@
 # The short X.Y version.
 version = 'lena-dev'
 # The full version, including alpha/beta/rc tags.
-release = 'M5'
+release = 'M6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff -Naur ns-3.17/src/lte/doc/source/figures/lte-enb-rrc-states.dot ns-3.18/src/lte/doc/source/figures/lte-enb-rrc-states.dot
--- ns-3.17/src/lte/doc/source/figures/lte-enb-rrc-states.dot	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/lte/doc/source/figures/lte-enb-rrc-states.dot	2013-10-26 07:07:30.147364396 -0700
@@ -17,8 +17,8 @@
 
 NO_CONTEXT -> INITIAL_RANDOM_ACCESS [label="rx RA preamble",labeldistance=0]
 INITIAL_RANDOM_ACCESS -> CONNECTION_REJECTED [label="rx RRC CONN REQUEST, AdmitRrcConnectionRequest = false"]
-CONNECTION_REJECTED -> CONTEXT_DESTROYED [label="maxRecvConnRejectDelay timeout"]
-INITIAL_RANDOM_ACCESS -> CONTEXT_DESTROYED [label="maxConnectionDelay timeout"]
+CONNECTION_REJECTED -> CONTEXT_DESTROYED [label="ConnectionRejectedTimeout"]
+INITIAL_RANDOM_ACCESS -> CONTEXT_DESTROYED [label="ConnectionTimeout"]
 INITIAL_RANDOM_ACCESS -> CONNECTION_SETUP [label="rx RRC CONN REQUEST, AdmitRrcConnectionRequest = true"]
 CONNECTION_SETUP -> CONNECTED_NORMALLY [label="rx RRC CONN SETUP COMPLETED"]
 CONNECTED_NORMALLY -> CONNECTION_RECONFIGURATION [label="reconfiguration trigger"]
@@ -27,8 +27,10 @@
 HANDOVER_PREPARATION -> CONNECTED_NORMALLY [label="rx X2 HO PREP FAILURE"]
 HANDOVER_PREPARATION -> HANDOVER_LEAVING [label="rx X2 HO REQUEST ACK"]
 HANDOVER_LEAVING -> CONTEXT_DESTROYED [label="rx X2 UE CONTEXT RELEASE"]
+HANDOVER_LEAVING -> CONTEXT_DESTROYED [label="HandoverLeavingTimeout"]
 NO_CONTEXT -> HANDOVER_JOINING [label="rx & admit X2 HANDOVER REQUEST"]
 HANDOVER_JOINING -> HANDOVER_PATH_SWITCH [label="RRC CONN RECONF COMPLETED"]
+HANDOVER_JOINING -> CONTEXT_DESTROYED [label="HandoverJoiningTimeout"]
 HANDOVER_PATH_SWITCH -> CONNECTED_NORMALLY [label="rx S1 PATH SWITCH REQUEST ACK"]
 
 
diff -Naur ns-3.17/src/lte/doc/source/figures/lte-handover-algorithm.dot ns-3.18/src/lte/doc/source/figures/lte-handover-algorithm.dot
--- ns-3.17/src/lte/doc/source/figures/lte-handover-algorithm.dot	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/lte/doc/source/figures/lte-handover-algorithm.dot	2013-10-26 07:07:30.115364395 -0700
@@ -0,0 +1,21 @@
+digraph LteHandoverAlgorithm {
+
+size = "30,30"
+
+GET_MEASUREMENTS [shape = box,
+                  label = "Get measurements from UE\n(The eNB receives events A2 and A4 with UE measurements)"]
+CHECK_SERVING_RSRQ [shape = diamond, fixedsize = true, width = 8, height = 1.0,
+                    label = "serving cell RSRQ <= servingHandoverThreshold"]
+LOOK_BEST_NEIGHBOUR [shape = box,
+                     label = "Look for the neighbour cell with the best RSRQ"]
+CHECK_BEST_NEIGHBOUR [shape = diamond, fixedsize = true, width = 9, height = 1.0,
+                      label = "best neighbour RSRQ - serving cell RSRQ >= neighbourHandoverOffset"]
+TRIGGER_HANDOVER [shape = box,
+                  label = "Trigger Handover procedure for this UE"]
+
+GET_MEASUREMENTS -> CHECK_SERVING_RSRQ
+CHECK_SERVING_RSRQ -> LOOK_BEST_NEIGHBOUR
+LOOK_BEST_NEIGHBOUR -> CHECK_BEST_NEIGHBOUR
+CHECK_BEST_NEIGHBOUR -> TRIGGER_HANDOVER
+
+}
diff -Naur ns-3.17/src/lte/doc/source/figures/lte-handover-algorithm.pdf ns-3.18/src/lte/doc/source/figures/lte-handover-algorithm.pdf
--- ns-3.17/src/lte/doc/source/figures/lte-handover-algorithm.pdf	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/lte/doc/source/figures/lte-handover-algorithm.pdf	2013-10-26 07:07:30.163364396 -0700
@@ -0,0 +1,147 @@
+%PDF-1.5
+%����
+6 0 obj <<
+/Length 61        
+/Filter /FlateDecode
+>>
+stream
+x�+��3��03S0B$fr.W!�������)X�
����=s�\���@!(�N�0]t
+endstream
+endobj
+3 0 obj <<
+/Type /XObject
+/Subtype /Form
+/FormType 1
+/PTEX.FileName (./source/figures/lte-handover-algorithm.pdf)
+/PTEX.PageNumber 1
+/PTEX.InfoDict 10 0 R
+/BBox [0 0 728 478]
+/Group 7 0 R
+/Resources <<
+/ExtGState <<
+/a0 <<
+/CA 1
+/ca 1
+>>
+>>/Font << /f-0-1 11 0 R>>
+>>
+/Length 676
+/Filter /FlateDecode
+>>
+stream
+x��U�j\1��+��X�J�R(t�v����<2)�)$]��+��\gr�v.�ɶ�9:��B(��\m��Q6�s�GX9�����෬��G��|��^}�
F�+4�f6�ʡ����M�`������
+�6ƐsunQ�ڃ#�ɘ����2������q�X6��ؼ�[d�&�\�m$>ʚ������=�����Z�-�
+�����}=��NǞ�k-�����}�;���+q��ܐ[L�Yh~̃o#��Qu���ft����J���XO<��=@`)��:�L��d�]�̮%��Yv�$�B�{���m�:whKj�1�uN6�S�w5�@�	��E�$�<�Z�:��ȵio}�'�Z7:���ݨ�a�X����oڨ�`o��Z!�������e �@y�
+�."���<�aW�fP���
+-Q�i�,�[󲸧T��8Qү���0G
e�9dA���~UQ�ö����EjJ1\��o�NM�6jJ��$W��JB�J�Bis�*	}��a3м$�GU��Jz�@ՉB�̓@/ȬU�Q�����v���Vf�k��4��H2�Yo�����(1�V!��z	t����r�?���G�T<+���Iz��k1�x�0�<��e�^05����#��C3i/O�K�U^���.���Q���
+endstream
+endobj
+13 0 obj
+<<
+/Length 15 0 R
+/Filter /FlateDecode
+>>
+stream
+x�]��n�0E�|���""3I_B��
�>T�{�H�X�,��%���af,�t'=υ�&���A�2�����8��UK�لX�NOg�o�W.I�p9���m�$�T����g�y2C-7�R*}�F|g[��:����܏�b'�K�\i�u/�{�zQi�&Իiކ�k���DqdZIFFWi�m%�v��*k����_��_��FW>���n�H�:��
�==U@5�2@��%�
��������������������������_�B��[B�l�%���}w\���%ϝ����-S��P��
+endstream
+endobj
+16 0 obj
+<<
+/Length 17 0 R
+/Filter /FlateDecode
+/Length1 17200
+>>
+stream
+x��{	xU��9�tU����TW��5�$M�NRY	�%,�
�,�@#� .������̸;a5�2
+�̨3�8.���u̝�w�Y�;�_�	�}����}�{]��שs�����TF)�&D"n��Z���eN!Dy���|�k�T TC!Do����K����O<m:�-Y��W_��7���eP`(�f@���V�]wd��w���W�Z�QS���	��+�[�^�|�Pa2����,Y��on��DH�*"ｏ��1�� �'Ҋ!<[t#��H"MM$I©T01r��?��3����Ӆ)��T�La
+W,��B�����2�5���<=0t�_t�
����	T9�Gz��Q�,�>'p��uy8x�'*�.�F�u�3��2Ğp:$8H���hR�4iLE��B�a�3�xp���@��i��)ԁ*���A﫪L�8=̝��+�i$w
+57�!W0��\��+���0�İ�~z8�̴��є�%Æ�>��)�
+c�����/��Fԇ�٪�\�$�#a!���
��P�����̔���
\��ȕ�!m�K7���x�}\�qhqrb���PMvT�v��t��<�:��Ӌ����{&n*�_z��Y���.���:&���ť��u{�۰��$��|A�#�B&�F�k�o9�B��x��:f={�f�����9����]�.0�^7��>W�A�ֳJ��N*U�RE*�8$&'�
+�{���ܭ���P4i�{�h�p侮j� �ȏ�!��yG)m̟N����c~ �g/B�����L�
+�і�3l6ڼ�js!�;촎#��
i
�W��K�
+�_���n�X��M��QSm��^Z�q���f�K7-�^/�~��~��/������Ԯʫ��S����w�hn���������X\�3
o��=(��Jv3����WM`�jQū���G
"mv�EC��'>q�������+;
I�Pcq������D�S��`�E �6�ml�4�H�� �pM��7�*������	8��kk*l+iZio����䮎��ɑ�@��m�[�_B�#�Jm�O�Ii� �Ȳ��|ME�ݵ�j?a�?�#�Ŧn<7�7�l�%[ܱ��Y���10K
�'�:����Q��kt����S���Ow�ݚ��-]9qbG���M]f�ҴM5��lU
>�M�L�R����$��`:uW��$ё�Dm�X�K7�%�+"�<�N�"�4u��ii�����}vI��%>�"� ��
s�2�d~2����9�u\�R���2#1H�6W+	�P05@جDX)�YmP%� �V�����U_���Z4V�OuF#I�E��O�Ģ�/��[&��/�S�k�Q������lC��KK5����ɚ�R�ɘ<szR����U��2��=��l�y�å��������{�f���>�t:5���}W�e-��O'�a�$۝#�A�FDj$�&��~>&�H����T��O��T?�}A�����ۙO��d>��J9���a�6���CY��'V�j�	�
+)̬9bR
�j��^��4�#�:�T!V���+�V�B�Z�Wk��j%Yoi�d�4,֙�����)yP�pIk3*��'�_���
�BTc�҆ac�0b(/�e-`
+s^������F֋���
+��(k`Y��aIϖ��&��
Ռ���l����x��yY�$�őrT��Ϋ:�"���%��K���"�J�BO2��㯴�Xm��
�C��Z��ɵ�̘�o *©��K��I�+.�^mq�Қ<;Ϊl�c�-�Uuֈ�Uq�{������a$��e�k�$��JT�I�7!�1m^�L�\�^�^�U���w�{"v�P���4H/�v��=���>'vJu��HuqިE*6�*��e����PW��/�'�lg��P&�#Ձ!�7�C�����G���U��l�D��I{ߩa�$h��c}��t�l.�]�r~�'�NɆ�E`C?Ü�^6���4��9:�z���"&J{���e�c�h�Z�+XNcY!��^l^a9}TZ1I4���EڷtΩj\}�ڇ����9���
W�wm���}wv�4FډCx����3�+����[/Y�=�R��ma���u�vLX�k�ިAC�u1���
��zB���t��2s}+������>�O��VU����p�;��~���6ow�a�R�qR8�t�N0�*�O$B�L%:�B8
+�}�$����H�
��)Y�@Ӂ��T�LFc HPd�
+`/����
����^y���YtTZ \�e.�
�E�&��M�E�M�pa.n�����w��D���s�L
X;�_ȇ��Zc��������ؚ%�z�YP*�L��L����5��QC�#���*N>�Ź��0ق�10'-�9Q��F�[}7�y�x0�H*f����<���x�=.bc�xl���"�4E������ñ>0�SN���4�˖�v��1PFa�
�Z��8�"S�W^ZU�xc~����!�kĬX
+O�
+K��J&���¯.�)�\�4�U�#���S�q���R���/�3D�ɟ�,�Fϊ��'q��1�d}<W�˦�F�5�y@�L�t׹�~!U箒L,U&v�>��M�d��X�-�g�U�_U�T�C�j��z��I�I�����Fb"N��IK�X2���
y����dV�"Q�3j�rF1/�I���E����K4�6sy��ġ	y�i�Ҥ��?�!/��:�uܕu���u�����Z��ԉ?q+k.������;f�+#�_-%;@��U�K�ӳ�������(�Qh��(��s9f�U�i�lD��o�|�;�����j7�cϪ���{=�B�H�?����J��O3i�҈�O��ԝ��/�I��*��^���ٹcv�k X2E��l�D�Q֑ԓD�Z�2�+Z�~:>���3
O�Ǡ&��g�Yc��n�mqS�C+�k�W	���mn)n�oT�e�^=�{��9jdGt��xM��������0���kmEf�f�V���:֞u�1˪�V�1����z5VK���~�(�{Tm�˞@6mH��ad#-alPB��@J��al� �T�02+ ��G�����k�Y�895H2�FYSB����k�:�����[�x�]���;D܇M�s�^�;��U_����?�\U�d�
>������~O���9������T��>�z��/�2ĄԵL���iS�v.w-�,�>�yҫ�x�lK]�d@��eL
+<�
+Eަ��p�dD�2�V��~�N���`�E)��A�F�k\��	T��4ٲ���9-c
+u̕�����TD,hO�����L�j��5�֕K�5��%ޤ;�lc���G��w��<ޭ���{�>y���}�ش�Q���
!�u�E��[�K"��R��ڥ�z�g�ӥw`G�C����lT0&lO�=f����PDE�
ʤc�ὁTT�bͦx��KD�X�t��*;UkQ�+L��ա��5��tl�4}�O�.ȴi�"�p��l�ˈN�Q�ۇ��t&ǣYIt.x�&po^R��d�
r�F��$�m�-�k(��v.;X�2i��o�f2���Jǧ}��i������4���]+[�p飭]�h)7��R��)%��z���c@B$٢y��*z2�6ѭ�R��՘(J�%
Z��fsR?a;�i��7�72�OOm[�
+�F�(d��)y�F�j`A
��hc��0��M?1�i[���;�uw
��0��2~��_����=Y�p?��؃�(�$�����=b��
�E��{	b7�M��|��aA&���˻4I���E�L��,k�*L)���u���':�fE�ƌ>�|�n�^e�����v�P"{�O�o�O.k�)����o�IA^/���8i�L���E�]FWQj��2�j��I�O�$�y�:_�Yz�Eg��&��T͛)t٣����>�ע:,Z۬��6��9m`���/C�n����
Iog�Ag�����4���.�cB<�R�P�E�"
&��yU�`;�`�Wq�x�wv
+�ѓ����
KK7���f�x���V{��b�=d�\0{��������ߘ=�h�qF�3Nm�&nt, +{��p��rriڜ���S��.Mp���<:��$���e��:��W���Un���;����VJ���4�2���|A?
��4�Sl���8�9>U����[�V�bF���P�Y�"Ǻx���"���+y���m*��ը6�1j���Fp���������
��W_�_��%o�}5&ܒП�Lb� �G��>mg8:�Q���U$�A�qQ��� �P	�n�p'�|�R����_=U87P�_U�?i{Hn�kD�\�x��,�
+�5s��}�Zt�OdyMH�d	 7/BRV�
+�+v����%Ƒ�%�����5�
�0��"�J��u��A�$O$��4���6D�U��+~K�whL�!K2e��T0bcC8+=�,ѿ�����Wg�1'QHr�d]x�o<�FP����t_��(N0ʌ����/���Áp���H �q�=ٍ1��F�
�[XA��*pD҄�yeYEI+�Ų��#0@e<f1���Q(�,�r�ĉ�
g0�$���7~s�����˭7�;�I���k���F\"j|!��*��&E���~�3���s��_|��ke����.
>O'��P�Iq���G�c���`���Ԩ��W(W��[�[�U�W]k�֪��6;��lv�f71*-��*�a¦&�Z ��]�!q�>	����Bc����`�D���vtk���UF��.�t<*��Fz�6,���LC	���xl�?,�@�Q��e��C��P��h�|�<�c�t�������+V�� ��8��gR����G��kk�۰���3�|W�e0(�ݦ>�ÂFߨq��A�ﷃ�gs��v�}��r��{�0��*"�������SN/�ΰ��U
+�Z�q��SRF���q��x
b֐#qi7+;���($����Da�����R���f��’��m��k�T5W�O�1J���=�-V��c�e���~�����8/��Xrꜥ����1̱�[�^�]n�ܶ�s���:���V���~lcV���YgmV��i�z=^FieiG ��H�6H�o�e�J+a��O�y��@�Є�������m���E��_��6���D���[�$0!#2��<���*���j8"-�UǕ�wjm!k�+��oY�R�cK?U82����<��Y��a����G�//fL:�����oT���ǽяҋ`�A���'9頌z#���q2N�y2O�_�߭��A�AmeoUެ�Yw��f���]�.j�v�n�~�˷�lն��e�f�b�n������|\���Z�.���z��A�Id��u���Y�"
�+%O*�U�dyZ�V����1����>��E�R�,���HVhR*����0 B }��(��U���
�`�a̟yܢK��
�q��r"^�zy���0Ns_K!�RbGo8V����NZ9��j�%g1X޲%�vxxiE%s�ɻ��,-�6m
~:�K������V����/�|�!tDu�D�?Cʥ ��^�6�
+�X[R?������j�F������{�^�\hH�2�+�w�r���WF�L�z�٢��8k�*�T$����ap��*L+̊+t����SD��ȭ��,�"`�y���:$��?awʮ�
iY�
7�:��7�(�
1ZU
R�4jZO�`�FQ�)T>ې7r�X��J������v�%�l#�z��xx�m��x��/�=��J��L�t�:�{�/~��,έQ~~��]���-]��Ք�
���
���K'Q�X\�3�d��蛉?&N'he�����RO��z.�|�g����}�8��8�#v��~[�������̤)�T�IW�QƤ
Wg�L]C$«T�m�&��B���
+\!����Q��޸��������H&��&M�$ra��BP��q�:��H�E��\�����\���B�G7~�\d!�ǎ	$�A��!WVc��H�
p!�	�ߦ��������_��j�������>�%��S�[4N
�#��׏?�NS5&x"3^y]�3��g~�s瞸4������hϹ��G�Nσ�m}�HLk�� � �W�Zk���T�
+��x-b��wHE�*�j{E%zD��~G��}֯+H�� �z�!���:�M�$O@�U�N���
�oI�)ii��a��7e
�~�`�k����y�{��.��'����~s�iܽY�#_���Q�ȭa&��[�<_P(�O֬����5�-fe���*G�����qf2yc2�r��5N���e�F��R�4V�j�E29���d���
̼ۢ�B�qHG�uNᳫf��p#sC�(j'X��wf�Mq�ğ���;�$�0%�&��8<>�Z? ��>�>�(�����ʩ��B$PkǎŹc�d��1,�RJ�r��.�P`��c*!��!�eT�p��E�P�N�>�_�N%J��t�R(4�J�$ZC�ޯ���Te�Zs������C��8#�����ݗ�BN��C�'����UPD��K������9G����W:�oҘWƓ�+�Z�'��lF�D���z�Q���3zgP���/�;�?�;,V�_�2��/�.~�_�$Vv�
��t
�b�`�sV��@L��9�9�M�&l��~������ҙ��+;<���~�a�a�w�=�K�^�1�`l��+�IM��Fs�X8�������Z�r�t��)[�-����3?fW6��TG"ဋO暪��'c��ӫ�b��l�/6-�r��M�����;�!��3'l�<}{�ayG��^:[��MշE��!�QW82���f�ۭ[)��}���O%׀��'� h�c�I'�m$��
+���ae�w^>	�1�O;"2��t`e�?��-�,F��-�����Y����X:�;�ʒo�x�c�Ϊ�^hF�z�]��D�<�����n������Î&����8�/�����#G��͚�-���u������i`[��xլ���$�ut�XKDv-��m��
+_]�������z�'��C/l�lk�1|�P�b�7s������Sš2~�t�I[�6��7j>*�x
I
αYUX��c��O��2b��2n��P��չ�1p\�׬6��xǖ��0��v+�3���
+,h�g���2��}7z<��jT��*��p~�""�#�������?ܧ�,B�;���S��<�~��U
r����`Ǩ�@ f�xܞ`���H	]��M�� jL&�2~M��nO@pc���+E��&\B�qz��L�/l�ɨ�o��yZ�?�7���r��f��ШV�D}��"��R�BtXa%�1eg����X������)�Sjxt�X;�GwO�qN��i��i��7�ןƏE�֗��k��_'��[��o�S\�n�D^se�2��>u�#��?3	E��K+�ԫ$v@�#�
Y�jQ�ŰAX��N�M�M��g!���Uu���	ݦ�M�%���d���>��l{+�W�{)�T�sng[�Z	랰)Ҫ(ʗʙH*�R�ծ�!�\�#W��S�Q�s��2,?�vy]=���Ϲ�L�/���ڞ���Yf�����'N�m>e�N�
}�l���;A��e�Ր� �<8�9�꓎>�'����Q�O�Ơ.Ѝ�1X
+:	��Y`�n�l��ǢJ�"Au#���>�]>����4vL);��8(�&dU��c��|VJ�[�ۯ=t�]���NK���S��ua[������Y2�%�lk�ۋ���T���6��W-�����*���~��K��?��gڸ|êesz����#���e�Y_�A�����b:dL�����[���>֝�NZ?~Ҽe~+�k�j:+�\��Ʀ�$�����mO��V�ҳ|�ݦ�M�FL�i�P�PϊJ�wU��-�R��)��A&�N&G�gQr����2����#�H0B*,am��Au�V:��:H1�P��!��զҰ9�0B ���yH<^1�
�1[%}�@�@�jy�����Urj�@T��>*9�q�����/~�"6c��6o/����EO�z�4�|�
��g�e��qw�i���v���ڡ�K�J�:�j�@g�9��(����yp�dg�/�ʍh�XK+�F��I)��
+�T4�I�@�����)��J�FN�p0�|�ɚ��>w�F�����E�L��?v#Bl�����`�&�=C��Ė��l��Y�YZ{���)C�:���3�K#�J�FN��p��;�)�_rg
+(=<�(XCp�����3x�w��q��I�61��{�]�B˻�Q�kAK4 Lr��
rr��NF���ɻ�Q!̃�‚��Bq��(V�KC!�Ŭd�x���rBL�^�%��ѳ�dbT
��.�-��H��eC>�
ҙQ�E��I;���gF総��o��Z��|+��y
�--���׏/�h�8�m�L^�f6f��S��w�����n�W#n��-�]-*C@���M�����KW;nu��x�qȡ�h�H'F�1�8lVRGZ͔���5��0'��~{���KfȭՍ���:o��}�)\�pT�1�Ŀy�36O/���#�D�h�b�ز��ptn���/��
K�E�$�)���E)��F�~4�Bh��,�Z�|�W���a�����^so�r������,f! f�J��2cɘ++3B����������v+Pm����"*K%ԓ!CD�<"�"G�E��Igjsez�_��Q�
uy�W=u�X8F���JfY�˒��X���ϕ�5���8�N�=�d�r�����<	��F]��zl+o��ʅc{�Ԃ�L��6̽�#
�[��d޳z�O�������V)Koe�K����I~9!Ln�ˮ���=��kl��f:���uh=�tX�S�4xg�m�� ���0�"��
��)V|��
+
ޥ��?�t!7�.(B���5��5�ZdP{[uC!�@�*��l�f��urg�Q�y�>ѱLٝw�5�_�
c7�Oˇ�G�ȝ��y����9J33���DI4���a�5��Y}����U��r[�[6�9a+���ST(��3���v����U�]���=�純�2�u���/��B�$v��A�Cx�
��٣z��KGf����$t��g���W�zx��S�
+DW)�T �*�
+��=L҄W"P�t%����񰬈%�a�S��Yп���YY�$5\���%g%����,ѹ�o*�_֏���N��.�F��կ��:���?r�o�sǭo۩�u�s�[?�S-,�r�	Nٔn������%K��}��Մz�K��^�dm���;7/XP���ШM��Mu��������} !��=��
����v���J�{���o������J���:G�Z�'J٧܇4(������Z�^����B�FNE�����"� �\�֝�(�jqW�F��
�f�K�V�t�KŲI�A��	��mC,���U:�5,�E�7�J��{#�j�/鴲�����}�_�`�d�(�L*B��"Ć�tH0��/x��o*���X�7���`g���W޿{��kK��ˆ�j�q>}���������_����ͫJ��-�::t��DIY|Z�:�<:9N���*[����|��s:˸ґ%)V�� �yඓ��ߎF��0�_����J/�|@z��J�n��X@a��
h'p��T6-��� ��~�&��������64��J\����=����K��z�
+ڶ��
Z8��y�j��h�AJ�
l��܁�9�F_��G��|	<�Z�?��F���;�>W��8I�ق�};�s�7�:Ҁ,�P+�-C+�w�-P�"z�
+K�*I�����9�v�݇�k؇��?��#�FV��0����0�wџ�`~�>�982���5����=��L��p�B�x&�C
+d��v�j�,���Dԉ.�'V��a&;�q�6\���Fq-�ƫ�&�
�N4�&����H�Q�����
+F��4|=׫�@y%�&bq�4�"5��ad��K#����H��k2Z�֡��6���0z}k�WT��
�p��L ������F�� �)�@o)=V:5r��=#o��f6hE9���;�t4���@�+d���E������#�)*�8��8���\|-�>�O��>xg��B��(q�x�t�2JV���{����z1�O�ާ�3������4P����H��}#?9
+��a4Қv��0��h��Rt�L�m/�x�Cp�Q=�^@'`l�G����
�2�@���g3n��x���f����=x!^�7���� \?�{`�:���o�w��:�����M0���0!�ṕk!��XF,'Vw����8H��l �Ʌp
�G���_��%�I9���u�O��G�)�?�34Gg�nz�®�+�(0W0�0��@���.�-B�{������7@��Et�Jl��#@�G�o���.�J�Tp�4����p(����z�.��.9�&���봠S�,8OI`�h������ё���B(XxQ��A?��͠����͖"�\�_Z�������P!��	����
+�!<wz��lz���rz���.����yx��f_����m��˶�-h�@4U2
�
�PK�����!�Z�
:�ֶA��*ב����������x�7��-�����<���>.=燦3z����ri��v�ba��C"�l��Zxi� ��w�X ���	���k?�_Ȏ��r��/\��Hs{G9�@�-�r�3��-���go�-B{yK�6�d�
+��Rh�m[�h�f��w��6aak� ����r&�8b�8��I6%��x<o�X��ts��G�r�c���s�y�`�M�D���
�:N
+��C���f���0��ʖ۸:xj�q���J��%GK!�$�+i~x�y������$:����g���þy�z���!�σ���[�i��PP�C�"�o�Q�K�����6q�6�,8�c�X��7
әٳ�Y=����:�\��[�ĥ~(��m��Ê�V�=@Eh�Ht��]=�{7����^ 	��Ѯ���@��^h�<?R�7,���9cNV@"]�e&�
]�n�V�	���m�\�$9(�0���h��;V›��M�EH/�0��VxU�kly�P����US8���)\����5�
+���(��v
+��1�$
+���Q��"
+#\V�Ӽ����_c+�T��q�ojJ����R%��ZţO@�@%Hh���hw��t���_G<ܕ�(J�C�y�C����e�����b�(����M�� ?b���l�l$�si�Gj�2/��pW�m�|<S�Zh��6�*�
�����[��7���f�}��6��ʿ+ar`�H ���)��#�|-4рU�nEH��.�n5B��⠝�R.ԛ�"d�>BV��x��W�BN��u
+!<�� ��B~h���
+By���BQxG�A�b����)�Jf�O��P����e�'P?,ƽ0qp���~�xQ��AO�E��YX?7�ûga�I����9��!'�H�����3x���i
���$�G	i�����8p/��B�@�	�R7�Z�@H1���]��D����VA�*(Y%���B�!�o�/�8
r�[�ɹ�!��six[ri9�#����ß�)x�!��~��US�eȇ+��:��~���%�7�:��7~�G~�]~�
~�K�v�W�!u]���-]��.m]��y<����9�}1��j�j��j��d���?.�������}c�v�$��I�k'i�N�򓴗��A����ፇ�w����k��e_�L�����e}�D�o߶V����z��d�7��aF�P����Q���9^�3r�5��1x��
AԿ����
+��+W�Ϟ��q�g��5)qv��*��Jqr���؟���ɀ#(�CPDY�Z@Y�y`4V����A�Hl�����!��M��I
QP�uj�����!����O��6���y�_7L��^�u��r�J�s	��'[_�zGOR�%�}��w�I���a�\�pV���YrtO
+�n�n�J
���}k��Ծ+���N�"(�%�}�D�73��ozz�oZ�M[�#��<����&��)���7��7�f�ߗ���.��*%O��a�/ӣ�*fU��J,&}ݗ3�n&��0&̄/�a̬��X�aU,�*X��e�C#��5+8)RP򮧜�)$�:��,
�%Y�A|�u���hl0��[�%X0ƿ������S���*)1��������'�Y[����B��j�!�󭽽����]=C���CP�p�T�9�����~P�Z��YR��(&�,[+7���,
�@�V)���Bi�Y�8%7���l��X[�XLnB��V��V:%5
��G��G[���r+� ���Ψ�<rG�,4i�JM�Ue���l�\��P�(W�(Wϐ�/�P�*W?\�~������%���v.y��%d�@h[�����y�t�߿��F!wx�e��I��%�KZoZ��.y�[���/Z���f��{P\Һ��������o������[:�S�_z׭m�R�&U�*��MzW���[�[�wIsk[>���o�����yW]5�/��4B
+endstream
+endobj
+19 0 obj <<
+/Producer (pdfTeX-1.40.12)
+/Creator (TeX)
+/CreationDate (D:20130806123210-07'00')
+/ModDate (D:20130806123210-07'00')
+/Trapped /False
+/PTEX.Fullbanner (This is pdfTeX, Version 3.1415926-2.3-1.40.12 (TeX Live 2011/Fink) kpathsea version 6.0.1)
+>> endobj
+8 0 obj <<
+/Type /ObjStm
+/N 11
+/First 73
+/Length 635       
+/Filter /FlateDecode
+>>
+stream
+xڕTYo�0~���c�!��+�9�6�vIwmT[s5$�!+���G�q�m�
qdR�H~<�A�	
RJ�4�@�� R�H�r<r��8�&
�����q��F���h`ת�����ڷ�a�u�ֺ�{W��A�^�F���娐�x�d)�q6�>B/�%�;�o0<	gg!��i孃A��� 6�p7x��y�X�VN5��hG�Uw''���r_��Cv��+b���")y�f��t����r����t;\۝�#��.li�
+تDR��[��u�jO�n��H��؏�A�?��b
+�Ղ4t'��	�n�׻U���\�ʴ�`0-��]�R;�v�g{Bњf�w�Nل$��3
uA��ip|r�$z�$�� S9�$��	��C����$�Lt2�O�,{������{dC�i�uvY��w�	�G=����������闫J�K�3[�b���-���Y�.ga�a(y�D��䘃���f��ښbZW[��eS�
+y���$i��m�G����'���"��T�V�g���2������B N�Su�жL������B7�^���	!�\=|ӅDZ�A�a)�0�Z�"�^,�b���/��`��L�Ӟv����\a-lu����O�M@l
+endstream
+endobj
+20 0 obj <<
+/Type /XRef
+/Index [0 21]
+/Size 21
+/W [1 2 1]
+/Root 18 0 R
+/Info 19 0 R
+/ID [<3A059312CAB0EAE8569256FB038E740F> <3A059312CAB0EAE8569256FB038E740F>]
+/Length 69        
+/Filter /FlateDecode
+>>
+stream
+x�ȱ
�0C��#�@C�$ Q1%��_��/�:���GК!��IǓ;�,lPy�+6�n���7:/~b*�
+endstream
+endobj
+startxref
+15426
+%%EOF
diff -Naur ns-3.17/src/lte/doc/source/figures/lte-handover-algorithm.png ns-3.18/src/lte/doc/source/figures/lte-handover-algorithm.png
--- ns-3.17/src/lte/doc/source/figures/lte-handover-algorithm.png	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.18/src/lte/doc/source/figures/lte-handover-algorithm.png	2013-10-26 07:07:30.139364395 -0700
@@ -0,0 +1,83 @@
+�PNG
+
+
IHDRk,�r�bKGD������� IDATx���g\���캈."*P�(�Q��������]�Dc�Ĩ����k���v
k�S�+����U��(�"v��޹�ew؅����/�0gf�����i�c�(MK�@�	�A��4]4�����њ����ꪯ���*����I�9�HTXX��*�js��=|������ A
+O�<9m�4M\�M�����Z�>HP
$�	T�	�A�� A�j�6���իW>�����x]�v���O������&N�����onݺ���SWWWgg�:�chh�۷o�A++��}�B>~�¶�²�2E�899�lٲV���� 
�
+�X�jժΝ;߸q���fĈ�޽spp000�qㆦ���������_W�Zխ[777����:�i�>}���������utt���h{�V�LLL|||~��'cc�C�޽{�����˫��������"??������{��u�
+�s�MBQQш#�>}z���~������{xx4������;6{��Z.�q�ƪ[�nݠA��B�u�<==[�hQK�IkӦ����ƍ;v����¶�x������	�!C�BfϞ��o�u��u�ܹ�=hiiq����� 
�������[�v-)}}�]�vUy�+44t͚5�Y`�U�U���	!<��Ȩ꒯U�V�2Z�nݺuk�����܏/_��S�N�W�8	���~�z�֭͛7_�|y�cǎm߾��ė/_���<x�Q�!aaa...<������h���2=�;w���)+++$$�N���߾}{��y---WWW�PRyԳg��޽7x��)S��F�a"""bbb�|���՘1c!.\x��H$������?v�X,644tss#�|��!  `ɒ%�.]���[�r�@ �;S�T����lٲ���s�Ι��xxxhii�]urGZDDD|||zz��{�|}}


����.Q~~~HHHbb����رc�����PJ�����x\�|�_�~zzz��
Pc���'Oj�
+P�ܹs�KK�*�

]�p�ÇE"ђ%K�y������
���=z$���pBȶm�-Z�jժ-Z|���~~~ӧO��x49q̂a�;v888H$���33�}�����k����1s���~������ٳS�N�缼�V�Z
8�a�#G��h�B �޽��Ɔ+w�j�������;v̛7oҤI���ʫN��RRR���!�/��~bb��%������>}�tVV�֭[E"�ѣG��P2>~�H�޽{�Q{��=p��9))�2l�0v�X,:thZZ�����puuuuu�t� A� A�s>>>�����˴_�~}ɒ%�������ׯ���477/((�c,X@���d������XQ�۷o'���իWBN�>M���{mm튊
+�a���͢k׮K�.��...'NdF"��k�.,,��{{{�3�:u*� �����	�aBHpp0�0���3UK��Sׯ_g+���c�^u�#�ƸM�6�-2KTZZjee�~�zvwww�P��B)���	�u��#G�9r�����il$��	�W�
?mmmB�D"�i5jT�.]:w�ܬY����������U�Vѱ���]�ty����
!W0�Kkkk:hiiI�g�!VVV����_��ԩS@@��Y���ӷ�$$$������љZZZ���<x������K��7�7�XYY���)��Z*��ѡ�Q=z��r�t=쪫��T^����?}��njܸq������m�6�Jɹ+һwo�)����v
$@�gkkK����]y���������E�֭���


���+��{�5o�\z�Y�f����BB�,:v�x��Ջ/>�K�.��Ѵ}Ϟ=���...�F�:q�D��,�ރH�垩Z*������n�^u�XRi�!"���`�С����D���f͚�x����ʣ�b1�#�͛7_�v-
���Yl�Ưo߾-[�LMMMII�<�}B���'%%��b��(� 9p�bݺu���?����NC��������%K������ھ�^�3��N�W]��ҦMBHdd$�bjjڬY3}}�j�&MGG���"55���\fTNN��S''�v�����V�,4>H���������%Ɋ+8&���),,<p�ے���o�>B���R�R4���oo�3gғX������Ǐ����ݻ���������AIIIMf��ʫ�����X���ߟr��M��ɓ'b�x�����r祥�Ϟ=�i���������3gΔ9�$@�0k֬�˗�={v����o��ɩ�������܌�����~���������E�͚5�bhh��͛���/^T����O)--��������U4��������[�nݼy�Çyyy��
B�رc۵k׮];��رc߽{w������Ç���$''����cNN��c�j^9!�޲ɾI�ݻw���l��^u�GګW�!o޼a[d����fΜ97o�LKK�-�o߶��X�h�J%ׂttt�.]*������O�>�[�RSS	!����,..��ox<�P��F��F��Y��֭[�
266����W�^=k֬
,Z�(!!�N���Э[7�ˡgϞ>��aaa��u�ֿ���L�w�ܡOi̙3'999,,��v�������ǴiӞ={�1������]�8p�ԩSB�p�ȑ�^�244�>}zPP�֭[��>��ϧ=w��=88���>7n���ߡC�:v�H�ű\j�<<<��ܜ��陙�@_��a��X,�ꊋ�-+22�������ѣ���r����x�ҥ={�<r�ȡC��sЪ.�\7o޴����O&O�<mڴ��o޼�{��	���vvv#G�tpp����l�ܹSɽ4�b���\n���x'O��6m��
������ߥ��ݻw�ŷJMM��x&&&ҍ?~���R�e$��;���|����R�H���%ɛ7od&������y%%%r��ʙ��rnҫ�{qT������x���&������cccCCC�w�BQj�h� A
� 
$HP�	�A�� A�j� 
@5H��|/6Ե���{��
4(22��˗�&���?~��7"##}||�^�իW���������˶���^�t�lٲ������ڶmkbb¾��%''{{{oڴ�6^��@N�:���h�����GJJJ׮]���9�ܹ&
+
+
+���n߾���?W91w�������Y��&�q�0EEEJe���o߾e���Ǐ!!!l�P(d_�^���S˖-U^P��Çm۶555�t!��h������(�����㓗��0�������������/^Lqppصk׏?�hooߺu���`SS�N�:�F��ׯ'����%%%���$::��ںG�aaa?~<~�8=Xv�ܹk׮�����������ի�QX����!!!!�{=TXX������c�>}��'�XXX�BBH�.]233k���� 333�*��.X���K�j^���Q�����?�c�̙3EEE�]"�ܾ}�W�^�{��u��۷o���kB�����Ç�?~��q__�+Vhkks���G,��JN�7��� A�(� 322&O����K���دB�x�"!d���t����{���̚5��$ESE���i�e�s6�g�DҺukBHEEmy��y���鷀Խ��l�̷�=z�ڟ���%�6L��	&���2������I�?~���mڴi���UN�]0����5O���Fz�+����B:v�Xy��͛�l�B~�������z��
+u�0J���&L���S�7$HP�	ugŊS�L��ӣ�C��޽��)����ϟO���\{�v�:v�����ٳg3Ro�o۶-M���'�E,m۶utt,))�׿�U��)"�˔���К\�=~�����͛7=z$3*::��ãw�ބ�M�6iiiݹs�F�*���U�i�Y0�ٳg�=�4i�Z
+��adV��G��F���֭[����/.Z�|9n�P�2G��_�b�Vt�:�� ��ܻwﯿ�:t������rL������0̽{��\�ҥKwww�G�_�~}��匌����5JQW�	�?�������ٳ����֭��UF
zs�H$�;�Ç


K�,�t�R\\�ʕ+
GgϞMJJ���7n��~D"�DDD�D"{{����{��BڶmKO����GEE�o�~޼y�0��󭬬ƌ�䪫���Ӄ���-[���p��9--���0����kdd4y�d%k�"""������~����;w=zTz����Vh������N P�{�ٳgw�ލ��<x0�rj������ߟ:u��˗�~�)�0��Y��)�X��?�����U���j'����>��ϯ���2p��aÆedd�<y�E�_~���C���i���2%iiiq�������c�mi����Νsrr���
+		�U����oߞ?^KK���U:�*:��n>��Ӆ^�x!�<==���;&�


��܈*ǯZ*����?:F��|�r��*m8�����Oh<�W�?���ѣG++s�5w�\CCåK�.X���ٙ��y{{�Q���.|��a``�H$Z�d�ܞ�'�ݻ7�0�?�D<�…����wϞ=�d����W�+**.\� ��^ZZZy�G�iѢ�@ ؽ{���
!$66�����ĉ'��Ɗ��3f�m��ŋ�*����:u*!d�����NNN����H:(�H:w����k׮���c�������Si�Uc��ϟ��^�cǎy���Sk>>>�<z�h���aaa�=R�6�ԩS�}��
+�U����'���'�رc����D"III133۷ow��<}�����Ν;b����W[[�[�n5/��~�׿��0�7�|��*vEEE�^��7o^^^�0Lbb�@ pqqa'������T^�G���?B�&2���{��
�sRR��Ul�X<t�P�w}���[XXB�m۶hѢU�V�h����?������>}:�ǣɉR�[��|��ݩgϞ�����V�Z
8�Q��UK��;�JGǢE����+w�I�UlP$HPe����R,G����f�t������c&??��ܼ����/X�@:Ӱ���&H�aN�>���اj�&�1c���ݛ>I�n�:�D�hq<<<!����$&&r�Q^^ާO���Q���B��…����/^����������˗/.\Ƚ���]�vaaa�]n\�(�sdf��Մ��ׯ�Q���tS2���bllLV�6VZZژ1c�Ͽ��;�.�GDDt��)??_�خ]�.]��-i�ĉ�g��������߲����s'He
+߰a��#A2�����Çlͦ���n9~�x.ev��+�Q|�U�R�lݺ�ȑ#G�9|�����B�7�}�vBHPP�+����t�����֦�����n>��i�ԩ�w����ɨr���r��Q��صk�@ ���ZiH��.��
u���,99�z�Wttt�W�����ܹs��������U�V�����.]�<�|��
ҟUr2B�g�}����{{{���Ћ��]�|����ѣGQQQ6l

=t萕�U�)���!��΄+++z�Qn!!!111���t���m~~�P(�����������Ǐ���a��@�����ű����nnntvv��a@�UW�9���еAG����ʕ+����<���X`g=cƌo�����k׮m޼y�+**֯_��yE������$$$�������vE����FEE��y<���}LLLM
+���ݳgO@@G',www//�����:zzz�������F�����߿?��Qf�a���{��P�޽oܸA.))qppP4%��mmmM---	!��!��ʪ�����ם:u����n>�v'��ǯZ*�>4��G���^yy����{���b�$ԅ���WTT�_�5!***!��񆆆{���^�ɨM�6���^�pa����Ǐ�;�H$:t�СC۷o?gΜ�3g��Ne�{��[�8ʈ��mٲ%��E���U�|�ҥ����ϟwqq���ݸqc��ݳg������˨Q�N�8ѡC�	���e��|F��%�@SemTii���ޥK�ݻw�}fgg�8q�������b�
+�w��ر�իW/^�8|��.]�DGGsWK�ի�ܥ�^��|󍽽�����������`z>O�C�H4s��cǎmٲ%;;����K�.����F�:x� �Q��(�=�*k֬�Ǔ;V,s�h�y��k׮U�7���5kF�{�1��h�)�;IS��UK�2d
���A�k����	u	��'�|Һu���|uu��󓒒�b1�]��(�����������K�rL<h� BHLLLEEE���r�!�H
+���Ǝ[��'L�`nn���ۼy�	&(�I�>}>|�z�j___[[�Ǐ�i�F��1Gn�#������?���K�gM�<ybmm�s���	����}���wp*�nݺ���+W����>}�ʚ�Y���(z�C��F����׮]c'���cQQ��_ݳg��	���_�߿?888::��ˋ^
ONN.,,�~�Y�e(������r��rrr�v���Y��sssE"��L�8v0E�O�ݩz3��N�<:>|�@��
j��u�gϞYYY������J666���`[rss��ۧ�d�IOߪU��g����%&&r���kBH�>}�y
+G���������9s挒H�x�/���ڵk۶msww�r����Ǐ���ݻw�_�����|�՘#���>��LmԮ]��+�X�z�1bē'O�_�.�N��={�l�%""B����oo�3g��d���f��mZ��|���)_~����AFF��eMV�޽�}��gϞ�������dʔ)s���D�yDe��߿���ٳg2�QQQ�Yon3g�T�`��hS��8v'�@PRRR�����*?��ё�����:w�Raէ�{0�� J<I�z��>}�(K��e޼y2�'O������)S�|~qqqII����P(��_N�<���*�Vp�a�'{�ꕎ�Nqq�̧.^�����>ISXXH�,�LII8p�@ 8v����ꫯ!�޽�����rz]u���ׯ_߾}���SII	�G��7o��cNN���΢E��Y����A��G.$���A��G�r
�4G�aV�\IINN�S:::�����,YҬY�/^<��ݻwU��0�����>����G�~��ڵk�����_;w�\�h�o��&�A�V>~�x��MCC�6m�������)�\,[YY�D"�u �^�244�D���j,��o�����}@�7$�������o�g��0�+���@�Q&wv���:::�w�0��O?�Z���z�*!�}L�***Z�|��I�*��s�NB}�;��ur��=:H9�c�`�6_VV�����ߟ���_PP���ojjڡC����3��5���<4U�����7N�V��'i@]� A
�I��߿o߾����e����v��Mo���������a&  �^�Y�re^^މ'ڶmK���*--MHH`���ٳ'�D�E�
6�2f̘��P�O����	�ҥK�e(���Ǐ777���vss�}���9:t�cǎ��iӦEEEq��0LFFƘ1cx<��spp`_�#�#w�ޥ������ŋ��?~tt�2�_\\lhh8}������[��_�^�UW�9������B<==333�K�6l� ����A�֭��7ej;|�p۶mutt���g�Ν;�u�|��!::��07o�<''�r����]�v=p���S��B�ȑ#���9*OII�'�������'O�<dȐ�����/��)I�YTT�>��0LXX�.F�#�¹�2�s�y󦕕�'�|2y��iӦ
<X:��8q�_�~t����F����`ccC�ٹs�Low�ܡ��̙3'999,,������1>>�Ν;���iӦ�oDT�[��|4��ݝ���i�ݻw��Q7n�����ǯZ*�>4d6��QZZڶm�k׮q�-$�������<yrڴiܓ���>~�xϞ=j�ujj*��311Q�dҲ���+HԈ����\�DR�-�+/**R�(C�N���%ɛ7oj��T�#��?jii��2Q�6����g�O���T�S̕egg�hѢe˖�% IDAT���U���������}]��
+�������cccCC�jwRmrw0���{w��Φϱ)�Ҫ�kD-�(st�8q��ٳU�FQ�X8�,$HP%�D"���X�j�����O��^�:  @��ݑ A]�$
�--�#G��߿�������1HMMݲe����_����ꔶ�������4]@c 
+�9R��3
�$h@����(i�>T����*$HP
$�	T��A��x<kk�:h������aÆ�}�PsH��?��stt���P�����wﺺ�j�5�ꫯ�w��$����nnn�
	 �� A�j� 
@5H��$HP
$�	T�	�A�� A�j� 
@5H��$HP
$�	T�	�A�� A�j� 
@5H��$HP
$�	T�	�A�� A�j� 
@5H��$HP
$�	T#�t
�E\\�ݻw��< �<x����.�4S@=�cF�5����|>��(�X�q������}U��A�Lj#�������4hP�Po�$�����1B�(�7o�hi��qB�$
kذa�۷��.
+���
X���ZZZ3g�
+�2�eee3f��HI��b�σ���eMMM_�|��r�)����O?��s���-B�p֬Y���~B���ٳgK_�.++����`=��b�MRR���;أG���x
�P�$��XZZZ[[�x<BH�f�fϞ���$HY�gϦ�LS^^����r�\�����fffF��������
�wp@���ɠA���7o��k
�����QTT��Z�n������r��1SSS33��;
+��	@�b@$�_�|���J���"��N�:������z��r;չsg$Kh�� 
�qb&%%���י���R^�~]RRB����֭�������������Y___�+�X���-�OrrrZZZyy9!D__�r?ݺu�������>$Hh�ԘU�d	M$4L��B��F	��U�d	�$hF#N��B��	j�b�!Y@��	ꁤXg�,
@� 
@5H���%�$H�I��@��C�h��,$K�6$H��I��d	UB�hl��� Y	��BR�z��	B�����B�hР
�$Eh"�,

$H���� �%@�	P[�
���B��)$E�@�� $He!)4H�u	@�"@��d	�FH��t!)A��$Hh��
��,
8 ABつu�� ABC����%4)H�P!)@#�d	�$h�"4AH�Р!AB�AR��%4H��~H�j�d	�
+$T�"��!Y�F ABՐ
$K�UH��?H���%�dS��2�,A%H���"��%ȅ� )@C�l� $E��,�$��I$�F	R��
��C�l�� ��"�J�,�9$HuBR�UH��du )�\�����ޛ6m�ԩ��j(++�u��ŋnj3q�D�A���^�����jkk[XXt��UGGGn�Ǐ������!C���srr�R'Ttt�


���G�-
+k��������W�^���{��ٳgAA���'�6m�ϯ~��B
+
+
+���n߾���?װ+%EFF�|�R�Xmm����߸q#22���G�s/**�^��QݯFPɲ�1��D"y��ŭ[���E��=��ܼy��t������ٹ��~��w;w�|������5]8hFPP!$$$D�5DGG/Z�����WyP�۷o/^L�ر��l��������̙���/=eaa���͸q�_�~���#FB�mۦR'�dee͘1���"((��˗ӧO�޽��۷km���l�>lܸ��z9s�Lqq1m��q�^�!Æ
{��:�e������LLL�қ2\]]�������o�N��]�v�������[�655�ԩSm̽ڝsDu�AUeee�^�z���̟r�@@�5}}}���믿�駟��<M^�!A2�"�Ovv��K`bcc����ʸu�!d�ĉl���!dʔ)ғ���hii����-�-Z�r�J�[ZZ���S��������w�ܩ���'j�����4�˴�X���믿�|�iӦ�����CnNNN			��/B�/_NKJJ�w��0̬Y�j)A֤s�W#��e
	j��f=�(}����nҤI���j׮��K ���Ǔ;(���ww�/���ʕ+�����ڴ1&&F"���屓mٲe�ʕ*u��?$%%�P�ׯ����3gNLLL�-�YƊ��S�N���)3q�Q��oժ��4���{�MKKKKKK�r2dH������֞?>!��W�9T�s�W#�K�f͌���������+_
OHH�x�"���h�	Ia&"""&&���[YY�3���~������5j;���,Yr�ҥ��8[[ۇBڶm���I	���j߾��y�$IDD�H$���'����/[�,!!�ܹs&&&�i
+
+
+�?���faaѯ_��ݻ+�WPPp��٤�$kk�q�����q�]b�X�Աc�Ι3�̙3�>�6m�гbJvRXX�c�==��>�Lfb]]��>��СC���s���.����ĉ>>>o߾U5A*��D�����'U��o}Ϟ=�{�n\\�����L���|߿�ԩ�/_~���Ȥ���������Dcc�c�B����ݻ�h����+��/�\^^^�[�޽{W�\�ҥ���;[d��ܹslkE�+Z|��W#4hH�����Ou��gP�ڵk饨�����׏6���.\���Ç���"�hɒ%��ȑ#-Z��wﶱ�!����:99B"##�4��s�����S�N%��߿�a����Bv��1o޼I�&B|||�J޿߭[��7oп�����E=i���'N�����3f�h۶�/8ʎ��'�:tH��"u
���bٲe��HOVXXhbbB1008v�X5:���"�X[[�-c��̈́�+V�K����������D���.;;�իW��{c�ܭ�(X�5��LU;�����#!�^ҕ��?B8���ر���A"��������۷���>}�����Ν;b����W[[�[�n���������YYY[�n�DG���-����h�󒹊͚;w����ҥK,X�����񼽽9:T4w�ۚ�s�ŗ9��W#45M�jx�H�H����]�vaaat������777/((��,��K���A	f&11�a�/^hii}���t��/_.\���'�!V�^M�~�:������c�Y�f���)�9::��ɯ\syyy�>}<�N)
+/\��Qv5d�^�~����˗���{��с��eee2S�}�v����3f��=��t���O�0a��2>L;v�ܱ%%%���311�D�W�fo7ܾ}����N�n}�s���g8w��O�H$r�;KKK�ٵkץK�ҟ]\\��1��������
+�'H�`ii�����������݅Ba||<ǂ�z��8���vRR����>jd:T4wEۚ�s�ŗ9�8V#��'��~{ݺuW�^}��eVV!D t��������lȐ!�;w655533�ر#�I��x���nnntvv�W����W�ZE�����ҥ����@122"�8;;B���!����Ǐ���߰a�@ �����iB��(�:�)BH�=�\�Ž}��EvvvYY�P(���iٲ%}�BFHHHLL���#������
+�~~~e��y��>>>���


=z��<M���/]���~���׮]�۷�k����d'-[�$��-��ˬ@BHII����嗼��e˖�X��m۶��e˖}��J.�ܭO8w��l}¹T��?��;vH��ܹ3))I�%<<��Մ����t�.UE�


�����2�
+�����r���O�J�?�ƍ��?~���m۶)ZpUe���t�֍�ܫW�s�α�d:�8
+�nk�ι_�<���Rt5���襔��Իw�V�9k֬;v��jW
+R4-{��quuuqq5jԉ':t�ohh�w�^��ӻ�dn�_�t�������]\\bcc�ׯp������WG�x���#G~�𡬬L�V-Vlll˖-�uI��:��lU�o��������'Ovvv�w{��O�>z��3f\�~��o��v횒�����!�[���v�*���?���X�b���2�	���Xy��5�ƭO��T���5kֹsg��[�cǎW�^�x����ût�B�er̗>PL�
+DI߽���@�Dl�СC	!���^��G%����BQ�s���9:�r�Yܫ���	r������w�޾}�رcM�V��>}�<|�p��վ������?���IIIb��Y�fJv2a�sss__��͛O�0�z�xzz>���/���?��e���4�DRXX&��j�]%GG������{���!!!�)))qqq��!�]�v����;w���mݺ�2�XYY���}��rz��	!��l'm���/_�ܽ{��;�=�r�ʯ���=��߿��u������SS��[�M�6��ɺ���֭[q���ӧOW9==I%���~ڴiC����ɉbjjڬY3vc�]�����1w�ۚ��*�Ž
(F�o4hPC|���'H����+--
�5k�޽{���&L�lccSXXx��
��!$77��?�X�d��~x<ޗ_~�jժ���g�V��@`hhx���v��999U�JY[[B���6A���ܼy�e����[�6n�u�����n�֭��]�v�|������"���---�={F[��D(n۶mƌ���{�JLL�믿����P�B==�~�a���{��ݶm۶m�V�\�l�2�H��ٳS�N�].�@ � �n}OOOU�dmo}F����v6����x{{����k���ʙ�})44�>�#������7o���ɓ'b�x���tP�W{?T��*Q4����]U��,��M��I���ES7`ֶF+TCqq�A�$	�0�����̙3%%%���B��_~IHH8y򤫫+�'|��W��w���t�������h�"�F�,��͛� }wIrr2ttt��եsgf߾}���{�왢}����o߾��ŋ_�~}���NNN%%%e߹s��s�Nڃ̠���0BH�=ؖ��lzr�ȑ#lc��̙SRR"�����S��aV�Z���w��e�%33���vvvYYYr+�VXX�m۶O>��m۶?��S��K�����X�5�����������ꖗ�K������5k�H������Ǐ7o�444lӦM~~~^^�����b+++�H�0̫W�

E"}̟a�9s���ꦦ���ݻ��¢���c��w�0s��q�]�5y�d�@��iS�L����w��t�h5w��/}U��Q���5���eSV\\lhh8}������[���]&$$�7������Ç��СC;v$�L�6-**J�����GGG��w�ޥ�$z��u�����psssB���gfff@@}G�
蟙3g��� X�G���̬\vFFƘ1cx<��spp��PQTvTTԸq�!}��
		������Ӄ
"��x��K�>}��]�P����|�r��zԨQ����!C�-[�p�¶m�.Y����P�N��7oZXXL�2���g��Ń
ڰa�J�Xqq�o��fff��G�[_њ���g�{P��/_��>5���Ag�����/��oߞbdd�i�&.�ϟ/�v�z���S�N	�‘#Gs�7%%���������}���C�ٿ?MQ���K�.�ٳ�#G:��蘖�ƽ����
+,++۽{7}�JOO��ۛ���a���z5y�ʕyyy'N��Nyyy�����P���nk��9��AĽ�ACRT�Qǥ�F���D���K$�7o�зJKMM��x��)**R�T�v�ګW����͛������S�NY[[�W�T���+�H*�˥j�Փ��ihhHIOO����3�*..�<y�7�|~hh�aê�	}�Y��pl}�⚬㭯H~~>�+H���egg�hѢe˖���Ǐ���MLL��e(Z���<w�ḿ{�q�F��U�S�����>�	d�,�6DGG;99���I
Innn`` �v�ƭ��tٲe~~~����O�1b��+�;��uI�� AV�%���Ç,X���ѣG����|��޽{qqqk֬a���)8w�ܡC��^����L/ʼ¦Q��P;$ź��fH���av��q�…��H�@`mm=o޼�s�zY�q���OOO���\\\j���
[�ڐ�$�:�d	ri�EzP`�(��X�!Aj�%4YH�
d=�d	��b��� Y@����t A6H�Pg�
	��C��jCRE� �($K`!)��� �o�,
1$EP$HP
+�%@���
	j�@��AS� �V Y��"�7H�P��,
8 )BC�	��%4)H���!AB��d	
�"4VH�� !Y@���M
$4*H�P��
($Hh�,
@%H�ܐ �IC�h�
�	@$K�FI@�� 
T�d	P�!)�
$H5@��cH���	P��,
jI�~B��$KH�
$@=�d	��"@�	� YB���и!A4`H��qH�M$@#�d	j��Ґ 
�$K��"(	�,�"$E�	$HPɲ@R�ڀ	*C����
�.!A�� Y�
$E�� 
��!YV�"�gH��1H�I&$H�we�DR��	��,�
�)@��O#�I�2$Hh�Ԓ,�
*C��&���襔��T�CVV!D t�����L__�իW�۩Ν;������u��Q hz��$�H'�+W��?~Æ
H��!A����ߐrii�h`� 
@5H��$HP
$�	T�	�A�� A�j� 
@5H��$HP
$�	T�	�A�� A�j� 
@5H��$HP
$�	T�	�A�� A�j� 
@5H��$HP
$�	T�	�h���"..��ݻ��B<Ȏuww�D�����1������d>�O��y<%�7nܸ~�zM�Po�$��1"--���L��A��q=��A�Gxx��#�200x�捖� O���
־}���B�������_�����5s�L�P(�^VV6c���P?�*6��<x����^������˗�(���9H�����O;w�,�"
+g͚��z�'$H���={��첲2
�P�*6��$%%YYY��=z􈏏�`=��A�������5}�x�f�fϞ���$HY�gϦ�LS^^����r�\�����fffF��������
�wp@���ɠA���7o��k
��p������뚮������T[[��/���͛��*j$4r<o��
��ƚ.����ȁj��Z$�t
��o��6m������p�)�}��$HP
$�	T�	�A�� A�j� 
@5H��$HP
$�	T�	�A��4]��]�z5''��ݻwϞ=��sIIIxx��K�v�ڥ�Gnݺ���SWWWggg��A)**�q�Fdd������TRrr�����M�:u��1w�7n܈�����k�Қ*++�u��ŋnj3q�D����̱��eղK��v�9B���-,,�v����SyⲲ��Ǐ?�O�� IDAT~����xȐ!���999T�*::�����������֣G�
+��]4���
h�!'O�� ++�믿&���������Ru�:((�{���e<�<yrii�ƍ����UIpp���i�N��ա򂂂!!!!ܓqWx���v��YZZ�B�j�h�"B���_����X��޲j�%�f��}�v��ń��;8p`˖-nnn|>Μ9����S��،7����1b!d۶m*u�0LVV֌3,,,���^�|1}���ݻ߾}[ɚ]]]]]]ղ��$4rU&H�a<x@���S��W�\�|��0a��͛��H$�^���܏=��<k�,�$H�a��������������0Lll�td��	�uX�-��]B��E�6�n�"�L�8�m���#�L�2Ez2--���t�eѢE+W�T����bKK˞={��^���ˋ��߹sG�eA����A]]]BH˖-�޳@�"���|>���񌌌j8����5kְ��g�h׮�2�qW���y<��*�-ts�u�ք�:�����]B]�E�6�����.�\�RZZ�6���H$���<�e˖-��k%;�����6lؠ��/=��������̙STT���
4N�@Y���!!!������cǎ566Vf��ŋ�޽#��o�^�Ƹ���������{�����:99q���Ç���%K�\�t)..n�ʕ�i5,,��Ņ�����M�<��3s�޽+W�t����ݝ������˗/gdd<xԨQr?===88xٲe			�Ν311��������B�v"�H"""D"���=m)((8~�xZZ���E�~��w�.eUȺs�Ε+Wz�����s��.�x�B$yzz���;vL,���)��jϞ=���dmm=n�8===������(B�������������	!6lXFF�ɓ'[�h��_ʬCU�,�Ti�n�=0��󭬬ƌ��6b�Xz;vl``��9sΜ9C�mӦ͊+�擄�pǎzzz�}���ĺ���}�١C��Ν[e���Fπ�:��U줤$BȰa�8�������>}�tVV�֭[E"{эc�w�}�e�������s�X,��<%%%,,��x�����'&&r�|�ȑ-Z�ݻw���Bbcc�;|������
���=z�0�ܹs


�.]�`�ggg����M'

]�p�ÇE"ђ%K*/����
!;v�7oޤI�!>>>�r;����:u*!d���t����w����͛S�L!����/_���B�a;w�<i�$GGGzw�̙3�\�={�d/����j�j���t��u�0Lbb�ĉccc�b�3ڶm����5O9t��Ai�z�j޼yyy9��@ pqqa'�����Uڲ��%��+����֮]K��߿�_�~rk�C�.@WTT,[���`���
+MLL!ǎ�F'4�[[[�]�͛7BV�X!w�4\ņ�	9�$���R++���׳-���B�0>>�c#� ��–,Y���Ǐ	!�6mRf��xxxB����a�4cccvp�ܹ���IIIt��Ύ�����onn^PP@�,X@�������ի	!ׯ_�����읣����I'�5k֘��ҟ���i$宐rtt
+�O�>eF"���CBB���ԩS�o����ed�밼��O�>d�
+�.\�XX�$�0�������ASSS�DBǏO�e�u�䖭L�*�W(�.�z�H$�ڵ��lf��M
�z����_�/_޻w�ѣG����L���������#cƌ��'R�N���	!&L�[��Ç	!cǎUT'	��	P�˗/?}�t��
l˸q����~��w�QlK@@@PPО={Tzw��FI����Jn2�2utt�u�F�ի׋/hm��ūV�Z�t�ҥK333�t�����ʽ������ѣGZZ���:��֖��ŋ���eee���-[���sW��ٳ���%].zy����Rf�+½CBBbbb頭�m~~��I��_c����uuu����A==������PBHTTT���ً�2�(�e�R�*-������gii���v��9B������*k޼����ѣGSRRv�����ڬY3�iڷo�ҥ���k׮��ۗG%;�7C�;
+*��7@ӄ� 
����@�Dl�СC	!����ڮ�Qlˆ
�|~aa��d5�)!�޹%}Xe�AEE!$>>���p�޽�F��|�a���w2bĈ���۷o�9�Çeeecƌ�P�
hii�~��{-q�^����-[��ۗ��
���!�fΜy�ر-[�dggv�����ԨQܸq#�g�ٲ5�`����.�@Q{��quuuqq5jԉ':t�PemT��흝��?>y�dgg�{���<�š>}��ѣg̘q���o���ڵkJvB�#���!�[����]�r�	�D�$�������6m�B"##�vSS�f͚���s�b[SRR.\�Ҭ�陛2������$�X�Rm�����s�ʕ_|�EPP����l��^sTI�V�D"���y�ג"�����ޟ*M-k���/޽{�s�N//��'''r���ڏ?+��j/#�]8z�ӧ�Ç�,Ynkk���{�jstt����?>}�t鬜��B�kR�ڵ��������ṹ�Jvbeeedd�����Çʳ~��	!�}�
��C��p�B>�߿B�͛7��'O����r�b[lll�����n۶M�Y+�3��q.J������-������S�N�:���>ܻw�;v��eVãG����&L����AIII�fammM��?ؖ���3gΨe�Q�{�8p���۟={ֿ����K$�)S�̙3��SJnٚ|����nE=���?~\WWw�޽��Wfffppp���g���7�3��ի�>c�]�v�|��{y�����uz�Y�N�B�m����~��7�����Ç;88T��
߇	PˈO�\�z�2`������e˖}��gtpΜ9������tp�޽���Q�aO�������ޝ�5q5|?�\p�n��(����**��,�
+�+nX���˭mo��G۪�W[[Qn��([�7�QAD
�E�EI @0�~8}�N����>pe��9g�L�g�,066>y��:г�*w�r�����B�={��Q+W�411���}��T*���q�N�1c����L&�������D_�uVVֱc�f͚UQQ�^ M{�=�����]�t�w~pB��OJg��5jTBBBFFƃ������lmm_�zE7l�X�Z�7FDFFJ����Hkk�>}��O��^�uuuÆ
#����\�x�o��������h�k�!�~�--AeP�C�BΟ?O�|�M����:Աg՗��u�*����d2٘1c�f�P(z��E����,�	vttdǔ���g6<x�٧O���-��-88�W!ì_��[�nqqq����#G������_�+A�	ڸz�#GF�A#G��<y�1c������쭸2�,44�������������ܓ>L�-�����ќjbb�|��O�*�!99�>�����СC����%GDDXXXBRRR4�+!!A(v����ﾋ���g{׬YSQQq�ȑ=zB֮][SS�����N����������666���K�GEEu�ڕ�y�f��5r��u�$�A��9s�a��'O�<���ݝ�QC�aΟ??l�0ww�͛7���|��g�C�8�F"�ЛlbccgΜ���I%��:,,,������ͭ������ؔ�OOOBȰa�Ξ=�2�m󫪪���P�5�g$i\���l�7	mmT��/K��db�x���111�v�bo�W���"N�81f�����������DFFF�W���L�<��w�7nܪU��-[֣G��+W�_ս*))���vƌ۷o		3f��͛5fh�� �=0�<����cǎ4Ii/_���̴��R�L�cR�-��7���FO�<4�6X��\�p���hܸq%%%UUU���Ǐwvv��
+��L&{����s����RzCLuuu��4�B���
+�[ʚd�Bd2�ϝҥ��z�1oԱ���^B]]�B�())Q)���b��bBHAA��g�lmmyݻ�B&����\�t���8>>~��񺿗~�DGG7x��	ڸ�M������������?BS^^�|�r=V@����U�V�߿����ĉ'N��H���Nh!������uuu><z��_~��� �A155ݷo߯��:v�ةS�>|�������A�� 
��,Z�����_~����B���spp�֭[y=h��������I$����?���������܏bh� 
����?���?����&`Ⱥt��������
+�-
���C�~� 
�$H�	�A�~� 
�$H�	�A�~� 
�$H�	�0��:4#�@���ܧO}Wڋ�w�?>::Z�
hFH���}��W������>/_����wvv�wE�Uz���Ǐ��Z4#$H
����		���~� 
�$H�	�A�~� 
�$H�	�A�~� 
�$H�	�A�~� 
�$H�	�A�~� 
�$H�	�A�~� 
�$H�	�A�~� 
�$H�	�A�~� 
�$H�G��
+���������w��%�\�x��:a�������w����{��M���׭[ג�
0X8�
�7�P��@`cc���
0XH�[�`A]]��Ifff>>>-\��	�7OOϮ]����D�f��D-_%Ä	�7�ٳg��.S[[��*
&�I�_���nnn*#{��URRbd��
��D��z���{��<F$͝;�@>
����h����'�kkk�̙��*
 ������Է�z��������_u�A����k�~��k��>	@Ղ�l�\���
��,6����lGGGB���}vv���`pp@�������	!������!����B�())���/***,,|���LLL������gaaammmaaann��j���vD%&*�(..�?�ݩS'��u�FgV��fJ�Kh�� 
���H$4�=z���ӧ�/���!FFF}���۷����X,V~aaaajj�^�L&�X�Ç_�|I�177W/��������ظEW
@3C��V�9bb� \@;�	��pbb� \@[�	z��cb� \@��	-�}�ĆA�Ç	M1��!\��@�~
�%�$$H�1�-A��&�	�~!&�%4$@��
�p	� 
��DhI��	�j &��C�h'� 
b"�U�m	$� &(C�hu� 
�b"@�!\&$H�FAL��K=B��b"@�p	�ܐ 
���� \4	$Hh_
@�K�!AB��M�@$�V��`.�}B������%�aH������ \Bk�	-1@��* ABSBLh>�`8� �7�DC�p	-	4CLh.�9 A�k����%4dۇ�|!\7$�61Z�%$��1�e��ip
��A�lc� �1�B�l�� �b"@c \,$��BLhy�����D��� A�b"@ۆp�T�]�DLu������M�R]+N���|I��K�.����������=ڶm�֭[�x�
�9���.]�����}�v�Izi����?�������0�cǎ�3���>|��ݻ����ƍ377����ѣyBIMM�u�Vvv�X,vvvvww�DM޴��{�6����+W��9s���cڴi*�*3��Mա�����wؤ����"vp���NNNR�����ʳ4�׼T*MHH�z��W_}���xQބ<i�$��tW�\ILL����Y����4�
ݵ�p�����{��]�p!<<���?_�|���������9�����X,vuu�5k�|��_FGG_�r%77���Z��7,�ٳ�����+�YLL!��ٳ��kmm��o�O�K���ϐ�B����޽{w��hll�p�B�D�<gee�!C<==/^�x����'Bv��ͫ����kΜ9���111yyy����g�vpp�z�jK���;�����._����~�A:vG�t(���T�;lYYٖ-[�W�ɓ'e2���A�BƏ�����Z\LL̛o�iee�T�B�&dggw���9oݺ���SSS�e�SS���J�1-Y󶭪�*77�…����/�/_>}�tWW�nݺ�1������u���˗/���/:t�…��ܺ�:}W�� [�ԩS����СCMUUZZ���������4uut��Bȴi��1���'�̘1Cy��۷�c�/_�f����dvvvNNN/^�P.y�ڵ���׮]k�v5!�;��ܹsG92��Х;ߡL��S��4ͫ����	!;w�l�����4m�86!###��C�������a
+EQQ��1|5�wA{�¥���ij�뤳�����{;?�����A��q��4IiTϞ=u����Qw]�tQ��{�;w�����z���
+EEE;ێ;֬Y�{!�}�YNNNLL���iӦ��ȅ���w�ԩi[�$t���#
+	!��2�B��h|���iLL��������7�V��v�ڕ�����zO5������QӖɁ{
+Vބ233�~�mB�@ �۷��1�4�wA{бcG�IO�����i�&N����ŵk�Ν;7x��w�y����Ӹ����±c�N�<��0Lbbbzz���������GBB����@ �۷����J�����V�������߬���Ν�~�j\�B�HLL433>|8[�T*=|�p~~����#��
�anܸq�ܹ����|il#!D"��={6;;���rʔ)�����ӧO��暙�-]�T"�����r�\,B��ʢ��V�\��ddd�Y���R��իWr�\��dʔ)���.<y�$�z��^�GAt)���2,,�[�n3g�T��K�.3gΌ�����^�hw�ԩw1;Icg�����4BH�=�.]J�|�rJJJ�޽����Z�roܝ��~~��ל�gggOOO�wm[r#��i#;�4�Ow���bŊU�V����7��ﰼ�ƃ�_����1v��3f貊!/^�8~�x^^�[o��0�r�46!!!�ƍD�^�mͫ�nŊ:nB������7n���ݺuS�����@ce��.�h5�
�-qҹ�����ׯ���ӽ��!��ͣ����-[���mff�r�J�]�|�	=�w���#F0s����c����+!!����*K9u�T�^�!aaa���ӧO'�l߾�cA�����.!䧟~b�y���������R)�>|��ի�Y�h�X,

]�d����@ ضm[�md&==����ĉ��׮]������/NNN쉶����]��=�a��v��I(~���C�!�ܹsG�����D�|�W�V�ZEY�d��l���VVV��^�z����|III!�8;;k��/������k��M��)���q����B����
+E�~�
+����<8:]Evv��i��ܹ#���̙ӣG���\mu�233	!U�ҧ��P��}*�����goo/�/^����2CQQ�-ԯ�l;,�ruppPi;��g�޽옰�0777�B����7�|���w1s����Ç_�vM.�������8��&p�5�ּz��ܛ�G}�0��Ǐ!!!!7o����V�h�4ж[q@Kj���Z$bb����-��߿�0�B���ܝ={V"����H�R:ے%K��5�Bѳgτ�:���������Զ�
6B.^�H]\\\]]��XPFF���ƢS�$ IDAT��������T��M-Zdjj���C]]]i�md������~ӦM�"���D"�~��w�/�rqq�_H�̝;��0��UA� A�v�ܹz�������GGG��֪���N�:��Dʗ��[Hdd$!���K�:?p�!dʔ)�r������Brss���>��S:s^^޲e��E�t��̓��teuuuC�ݷo;�H$:}�4G��%�z��1�4�O
+��ӧ�����i��d�o��v�@(���wX� ��������N%A0 44�����g�
��h�9r�u��~����	��	{��{�M����[��3����i��[q�!h�p�z&���?�t�=]WWG�ԩ���������Ř1c�:F�h���臦@ x��~��������P&��_���S\\ܿ���5J ����۷���o�ڵlQW/�G�����AGG�s��B����-H����������Z�H4dȐΝ;����E8��4h�o����F//�������5�������ѣ���v��ͱ��A���m��:���n߾���.**���Q}�޽{�������|p�…aÆ]�pa�С�ҹsgB�L&Ӹt:�
��h�b��R_!666S�N���ܼy�P(����w:S*�Ҷy��:�u�����tooo:���"�HD"�����ՙ�j�����t(i\�
+��ӧO�>=--m���C�Y�nݻﾻjժ+V���v�þ���aaa�s~���999�c._�L;%++�����ȕc����OIIaH$�N��n�^���w��=R�&�~
�6?
8*þK��A/��W(%%%���EEE����Eff���ׯ_�|�i�� �u5j����ӧO�B�X,޳g���~��Y�f���O�<�ȑ#}����u��066f����ɱ 'N����z��I����jkkU6_�P(|���Il	!YYY����������5�W;�{i|�޽���>������w��
m�e͞=���}Μ9/^\�n݅t)�~{j,�~[0@}RJJ�����ڵk„	�3h�b��ҸBBCC���O�:�������)�b7�s�߹s�s����"E��kӅ�}ڰ%��Se...;v���111k׮���uqq��R]mu�511�ׯ���޴��8���3g&L�пz0U��FKo�����z��m��}�srr"�mB��8U#�O�z7$��I�#f˖-��~�fZZ���nhwA�u����̌>u"''G.������6t�д��
6������ܽ{���^#
��066�X���K�>|�pŊ��?�����c��t���6Bh�����8!�����Ĥi��{{{��۶m�={�ٳg�������z{��ٯ_�˗/���w�޽�B�����훟�_VV�^gz(�^Y����J9A��'���yu!������&<<�C�^^^��E����P(*++�L��<�o�u��;ߡ�}�JKK۵kWLL�����?�<{�l��7o^�xQ��������z��Vſ������s��u���ĉ����LII���P���&h�kt_󶶶ܛИ1cti��iPoe� 
ߟ_6l���8s���j����}�vEE���WQQQee�޽{�������G��\����&::z���{�������򊍍]�t�@ �v�Ð!C�-H}fzd�>s��׷a��m$��9�����~�޻wO.��=�.����
� �0��m�-[�����?�_��׮]��Ȟ={~��GS�Nebiiigg���:��BD"��ݻ�̙��wߩ��Gvv���>a�777����j���.��Y��NA�_������_�Z_������΄��G��	����III|�̡��h|��F�)�0��Ǯ]�<<<~��w�0�����Ǐkl�P(�=A������kt<�?~�m۶��pz�Z�P�R8������Eʸ�@��5��y�P��?̘1C�&4{�lݟH��Ӏ�2
�.����'ᴖ6�Ix{{��ھz��nذ!00�a���jKKK�H���_gee;vl֬Y��d�1c�(
+�a
+E�^�N�<�0�ʕ+MLLrss>|�^a͢��x����.]�(
+����m��qԨQ			<��Q>>>���Θ1��ؘ�Ԅ�6R.�ҥ˓'O���={lmmkjj����!22R*�FFFZ[[��Ӈ>���{�왶K�gtttdǔ���dG���g�…l�i����y�~��nݺ��űc���G������_i�!m]��Y�V����;v�|�r��*��m�`8;]Y]]ݰa�!!!!/^��o|}}���9��0̵k�!�~���A�tG�t(ÿO�=���dbb2o޼��t�����yyy��.]��|�|�ᇄ��7�A�(77��/_&%%����^{M"�TTTpl�r�������,11�a���"�XlffF��J�^�w�����t颾	���)?f��UW~@����ܻ�w
4!C�ŹE��R�Ο??l�0ww�͛7���|��gr��N���b�swrrJKK��e2�X,�={vLL̮]�؛
+�Ba��ݿ��;��\�|��^�tiqqqTT��{���r�\ギ_�N�}4hЙ3gh9'O��������i���К5k***�9ңGB�ڵkkjj8�H����t�����oo���|:I"���bccgΜ�������BH@@@JJ��Z=q�=I$BCC�]��Q"����h�����~�����θq�V�Z�lٲ=z�\������0���dkk;cƌ�۷����3f�����V��u����{�,^�855Uy�J�ro�:]�څ���@ �����@Ѷ%���xzzB�
v��Y�A��u쎦�P�g��5j͚5��}7F��a���؛��ΝK�O�D���_��ݛҷo߭[��o�ŋ��
�ݻ����"�hҤI�����a�Ǐ��b�������7~��dM`��5���̙3�����݄���>��3�'�INN�OY���<t�Pyy��m��v+����b"
���~k�?L�2��ٳgʗ찞<y"�#�Xuuu�-��/_�422j��9h\��.�7�������������������8�Hk���ieeE������ޟQ]]ݡC�����b��炂�gϞ���6�gEd2���ϥK�������Ǐߘ�i�bJ��bUUU5�Gq�vzyy�B��
��un�&�P§O���
^P��V"��kʿT����N�:u��Y*��l	M �{
�-Y"�dgg����
��9>
�U�1���k�_�ϯJ��p�>���������+�`yyytt��cbڳ���U�V�߿����ĉ'N�w���z�}��m�D��i>���}���(..���pww�����˻q�FFF�ƍ�]5Cajj�o�>oo��S�����sg*�+iE�魷O�w�>��sn� G.[;�a���N�>���,
+������-Z��'�Z�DRPP�����������JÄNWֺ�}mX�?��0m6Ar@�l]���~`����Z)�D��c��p	�V!&6!$H]!\>�Ė��.
Zb��!A6/�K��AL4dH�z�p	���J!A"�KhK�$�V�bb���v \@sCL
+	�]@��!&B�� �;�K��	1	�B�h��� ABC \�DhyH���.
�b"$Hh9����@���p	�b"�
H�`�.
�5BL��
	Z1�K�/�Dh�� �mB������	��KP���$�!\�m��M	@'��b"@@�h,�K�����_H����1
$�~ \P���$��A���1��A�hM.��!&�H�m�%��D H��
�%���ܐ 
�5���1	4C�l
�9 Ao��1Z$4%��惘�	Z¥.
�U@��ko�1Z;$H0h�7\"&@�	��!�K�Dh�� 
�
j�p���	��BQRR���_TTTXX���������ҩS'kkk�nݺљ�'YXX��077�w�Z$!j���ŋgΜٴib"�:$H
����		����+�$��	� A?H��$��	� A?H��$��	� A?H��$��	� A?H��$��	� A?H��$��	� A?H��$��	� A?H��$��	��]
C���q��u��֭[��}���S�������S3#`F�u0����=266&���F�@@'���-[�lڴI��08	�'������j�:f̘����1H��]�|y�ĉ'��ի����׎�;iX�Ǐ�ݻ��x�H����"�ߌ���͛'�T����Ι3G/U0L8�
�_�n�>|��Hkk뼼<}T�@�$����[���S#��ϟ���&$H�X�`�����ڹs��>g�
�!''��ޞttt����c}�A�������3}����ɂ�]#��	�j����i��ꂂ��]���������|�MB����͛7�]��c�����ƌ�0Lpp���`�p�!���7mڤ�Z@3*..~�䉋���ơ��ѣ�����t���>H�
���<z�h}W.&&�رc


��@�#�wZ�ѣGGGG��p�{h\	� A?H��$��	� A?H��$��	� A?H��$��	� A?B}W��JNN����6���t�̙��=z�m۶�[�����X9-����������;99I��ӧO+�`ll��eI�҄���W�~��W�,��k�Uq�ʕ������Ϛ5��ϯIʬ���t�Rrr����5��w�������?�A{{�aÆB^�|y��Yv�H$����V���o�Νum��c��%,,l�ڵiii%%%���AAA���+--���	[�d��w���8p��ݻ-\[j���������������;��ߟbff���}������{����[��������>���_~i|Q�]�����ԝ;w�_�~������UUUMR�s�V�Zu��am3�ݪ�����n����t|׮]����o���_ZZZ����ׯ_
+
+Z�vmMMͫW�^�z%�Hnݺ����&hh��f͚5k�<���YYY���3g!�W��������XZZ�T�l���B�������?���s��&\V@@���M�z�̪�����/�Q(EEE�,�СC�������3�ݪ�m��|��;v젯oݺE?~��<k׮�w�^�K!�;v�W���1H��2n�8��LMM/^��={�l�Jկk׮�_e]�ta�6#####|
+�R�"33�?}��mLQ���7nd�=,�w�ֶB�w�޽{w�Z��z�j�\�~�:H��n�:��k׮%����EEE�\��?����X�f���Qbb��������R�����������#F�pppP������Ӹ����±c�N�<��T_�P��ρ\�~=##c�ر3f̠#
+
+bccW�Z�����o�YYY͝;��G/^�8~�x^^�[o��0�@ P.P"��={6;;���rʔ)��������7nBz��t�RB��˗SRRz������4����ԩS��^bb�s�,,,�,YұcGm��X=�#~��ל�gggOO�nݺ���UO�8}�tnn����ҥK%��?�,���bq`` G��-�������YPPp�ƍ��p�X���m�׻����Axxx߾}}||�x�anܸq�ܹ������P(��j�a��Ӎ�����=<<8�1uFFF*������#F(w
4=�h�t9��L�,6u���N�:	����~Ȑ!�����w�}���O?�y^�x1p����$�TJ#�����r8����/[�,---::���l�ʕ�x�����|���~����?'��ݻ����P(?~��o���Ü:u�W�^���������ӧB�o�N�r����Ç_�vM.�������8�-0==����ĉ��׮]������4�$''�A�Bѯ_���Bm-ե�����knnޱc�+V,^�xڴit���j|/G�����M�v���\>gΜ=z����IڪDZ*����3�]�v=z4G��-B��Ǐ!!!!7o�����X����۷o�;�W�^			�o�ffѢEb�844tɒ%~~~�`۶mt���L����O>ٿ?�07o�1b�zm��!�0{��a�Ü��ϳ�r���������X�
+���
�	�M� ��;w.!$66�a�������]�q�Fkkk�:55�&3��ڦJ$�TJ'ѻvh�R_�
+��mff��Ovvv*	r��
���������i���
6B.^�H]\\\]]��#G�[���V(666ll������ߴi[~PP�H$���d&77�����O?�����-[��R];o�<�@�^0����m��{9�WWW7t��}���!�N�>�]=�U���*_S����&H��q�
e�g�nݪ�
+�w����[ZZ���-255��ɡ����l�3�ܪ
+EϞ=�$6hj���	�{��&M�4i҄	z��MA�hn8�
�O�Z4�Pzé�������������"�hȐ!�;w�wpO�����d�ׯ�������Ç�F�R_�F���zXX��o���~[�._�L�����UPPPQQA�ӳ�lᎎ��Ν#���ǧ���c���@0|����t:w���Q�F��{zz=z�?����ݻmll�N��y�f�P�|�r�j\�*:w�,
+������
v�ؑ�����S�Ni����[zz���7���"�HD"G����8V7���߿�c
p�^�l'*��;v�8p�@�zРA���;Iy�vvv���������s4����/]�D_WWW���5�L��	�O��@�[(&N�}���I�&������*_4�mjff�X,޳gO�H������Oy�����<�ϟ?s�̄	���O��366f�r��BȠA��I�$++�bffƎy���	!���t044����ԩS���w��ٲewKuo,�S�No��Fii��{9�gnn޹sgz�z4�k[�T*ƽ8p�p]VG��B�W��M��f͚���?y��#G����G}�@���\ީS'm�w���O>���@��]�m�ҥk֬Y�bELL̦M�v��1u��z�������f�ۿ���m۶}��W��.O��)SRR�G�)��^#�$''�����MLL�����ecc���EG6mKkjjJJJlll�'qTO�PTVVҫUh�����k��^��U�2t�д���+W^�|����ŋ��t������ɓ'uuu*��?���������ٳ��\���T� 
Z=�B�P,8p`���aaak֬�e�!C*++�����Y^^��?6��t<?~�m۶y��у=
+��ޒ���	!�����9����Ď�w�\.=z4��ޅv��DG6���_�^]]M��ѽz�]G�e'=���ɓ��^B����Z�:7x
Ի¹i;@X����Çw��eϞ=���{qqqll�����<x�@e|JJ
+�����k�~�B�h	���zs����JB�����1555��gϞ���~�����r����6??_"�(�]����@KK˵k��ܹ3;;;::z������׸D�U-,,T�����4J�RBHTTTEEŕ+W�����ʤR�D"��؟�{��YMM
�0�����������ӧ������uuuC�Y�paRRR~~>}�իWmmm�����ŋ;t�0`��)�-ե�����:�D����'L�@��{9����;lذC��X��ҥKaaa��ڪǽ*�L���ٳTVV8p����=*++��(�5���^eIII��EQ�IDAT-�eՉ�⒒�G����VVV>�\*�ҭ���ŋ��*6+o����`!S�L�ٳ��GE�'+����d2v�W_}5t�Pz�!�ɓ'��6Z�L&�裏������@c��&�VL�{�kkk���{GGGBH�nݶm��>�%""��‚����0�����sO
t���aN�<��۾�����Ŵ��YYY�m
NNNiii��"..��#d�ܹ����H$�����~g���w�֭uuu�,^�X(0`�޽Ǐ�D�&M����g��.]Z\\E
+�y�f�\���cz����&((���gܸq?���L&cF&����:99<x0""���[���ŋ�Z�4�T��2bll����[�n���>>>���Q���B�@ ����c���DZ*$	�����!66v�̙�����7+�mʒ����,--:T^^��"]V]BB�P(�޽�w�}Eω�Y�����ȑ#=z� ��T٪e2�X,�={vLL̮]��oW���doo�������;���u�ȑ#FІ���N�4���mȐ!�Ɲo����d��^l��08��_@@!$::��t�…���q�ƕ��TUUUVV?~��ٙ>1�{*!�ɓ'���ʪ��'�H�Á555*7�kSZZکS�Ν;K�R�;9��/_fffZYYi�M���*�wQ4��+V�������-((�֭��_@ѽz���
+��f)�DZ*JKK��~���:t��b
�k���F##��LQ]]�B�())ѱ�R�4++���R,�]7�@p��1�;/H�
�2	255���7??_�>���rz��{j�V��`��+��	�`x������(..���pww�����˻q�FFF�=b������:��B
��
0\�-ڵk�/�����Խ{����K�ҭ[����
+�:r�������׿���Ӽ
��Yl��h�� )�\�qW)�T���˗����)�A��,6@��,6@+�k
g�
�$H�	�A�~� 
�$H�	�A�~� 
�$H�	�A�~���@k�������Z�
$@C����
+�X�-���
#`F�u���A?H��$���
�:z�+&[IEND�B`�
\ No newline at end of file
diff -Naur ns-3.17/src/lte/doc/source/figures/lte-subframe-structure.dia ns-3.18/src/lte/doc/source/figures/lte-subframe-structure.dia
--- ns-3.17/src/lte/doc/source/figures/lte-subframe-structure.dia	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/lte/doc/source/figures/lte-subframe-structure.dia	2013-10-26 07:07:30.159364396 -0700
@@ -1,7 +1,831 @@
-��]�n�8}�W.��\Z��dS���(Z����9�m��V�I��e�}IJ�oR�H�Rme�m�����p�e޾{X֝'~�����������������ۙﾑ汻��'�D}7ܤ���ht�U�Q�$��_7ܑ4
�N,k���M]�^�����?�M=+t�x0q���qt��Un7��(���`<xu�_�Q�f����Kw�Mb��^�ږ/!��^z���2J|i���&%~��[6�U"���٫�^�z�Y��E�-Jn<��C,9>A6P,�ˁ�b1����Mڅڅ�ۅ�e��맇��(
-<7�P��֫��L�@R�n��ޯ�4��h��$�t {�nj{������ɻcQ��ޟ�7W��+�2���O�I�����ܯ�q��t��o>^�
���%b�=���/�[�%O�lצ��Mn6zj����쭽[C�ʋs�n�j+���X�4����m�I4�Ǜ�yg/R7����zm�=6q��B��x������IgRFk��x`������!L&����o
��Bq=e@�!�
�����j��a��`�4������*v^N
�ϟߤ�`�la��`�MtU@>�2��ц��9�r�
�5��0�b	�iN�S�
�<���dr���e(�#�F����+������`$�1Ĵc���C�TX��jV�k��(�ʅn���D�Dd\�ȒV�&+�
������];�� ��[/�E*S�E*�C��ˤ��X-���br*��W��p�(��p�;��n���TkKx��.��P��}̩�,�L�����'֍d��Qɇ�Fz7dm~:��mݞ�f�Fk��0�T�ʦ�zq�( [�������ʹ&^a�lL�n�N�wȚf���n1�t�2��zu�9��kD�(JF:6����x"�gS���2���^U����O�O~s�ӓ����?�TI˕�x�0-�V�[���V��n��$]�\�>���ԟ����-8�
-bp{�E����XJVA��U>RԲ�z@n��ÅW�8=�I�P�R��|���Mڟ$���fC�qb��G������c��v�rW��p4&�@���5ɼ&2�����tFC
�ل3r�(9B���P�
5�&���ђ��[-��L�t�e���$j�J��$	�y���UPJ���A	�;�L_�Zd<J*�`�F?��$6a�Kt^	�yt!8"���Lg6m)`�l>�~����ffW5��HZ�P3�8�r�8�/�B��_^8��eZ��Ze�Sc�õ��@��f����ݬ�h��*��g���$���X�Z�C���5���H�?�����_V�ZL� �����s
�#�pŦ���qPwe��/hf˻J�I��`ݨ���1㻱���Žn昴�c&�4a(?f��qEB�7�+�d���-ˆv��I[�� i&
��x6�"�1��	�WG����w���iK"[�'��@7U����J�ݖ����ڳ��Ք $21�a~hS����"�ia7ˎw���^�z1뢘�m�YYr���_�5!"�h\��`)���1�}����}�������}���r�� �F�ע�^�J��kQ����Y�L%����Y:��R�F
-�.�o������ثRU��)_�*�t)�ɕ	@hw�	�^���B����J3��s�al�t���;4l����|����%WiT���\��Li��\B����`�F-�)��GM�����v�Z���N�����j�B�
-�!t}�f��K\�ch�Ͱ�i�)�ڢn`�U�Zl�L	C��`B��=(a ����[��b�s�#
e۪�l�ף�zt����.]=�>���-������?�JȐ�B!�Vad;Z
-�������gs���1g��^E9�/s<�f��cu�ك�*�9�긟��YҼ}
��4o!�$okP�i���@��f���\
-����2����R7�r����{���Nv~_���kQH�Wq
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<dia:diagram xmlns:dia="http://www.lysator.liu.se/~alla/dia/">
+  <dia:diagramdata>
+    <dia:attribute name="background">
+      <dia:color val="#ffffff"/>
+    </dia:attribute>
+    <dia:attribute name="pagebreak">
+      <dia:color val="#000099"/>
+    </dia:attribute>
+    <dia:attribute name="paper">
+      <dia:composite type="paper">
+        <dia:attribute name="name">
+          <dia:string>#Letter#</dia:string>
+        </dia:attribute>
+        <dia:attribute name="tmargin">
+          <dia:real val="2.5399999618530273"/>
+        </dia:attribute>
+        <dia:attribute name="bmargin">
+          <dia:real val="2.5399999618530273"/>
+        </dia:attribute>
+        <dia:attribute name="lmargin">
+          <dia:real val="2.5399999618530273"/>
+        </dia:attribute>
+        <dia:attribute name="rmargin">
+          <dia:real val="2.5399999618530273"/>
+        </dia:attribute>
+        <dia:attribute name="is_portrait">
+          <dia:boolean val="true"/>
+        </dia:attribute>
+        <dia:attribute name="scaling">
+          <dia:real val="1"/>
+        </dia:attribute>
+        <dia:attribute name="fitto">
+          <dia:boolean val="false"/>
+        </dia:attribute>
+      </dia:composite>
+    </dia:attribute>
+    <dia:attribute name="grid">
+      <dia:composite type="grid">
+        <dia:attribute name="width_x">
+          <dia:real val="1"/>
+        </dia:attribute>
+        <dia:attribute name="width_y">
+          <dia:real val="1"/>
+        </dia:attribute>
+        <dia:attribute name="visible_x">
+          <dia:int val="1"/>
+        </dia:attribute>
+        <dia:attribute name="visible_y">
+          <dia:int val="1"/>
+        </dia:attribute>
+        <dia:composite type="color"/>
+      </dia:composite>
+    </dia:attribute>
+    <dia:attribute name="color">
+      <dia:color val="#d8e5e5"/>
+    </dia:attribute>
+    <dia:attribute name="guides">
+      <dia:composite type="guides">
+        <dia:attribute name="hguides"/>
+        <dia:attribute name="vguides"/>
+      </dia:composite>
+    </dia:attribute>
+  </dia:diagramdata>
+  <dia:layer name="Background" visible="true" active="true">
+    <dia:object type="Standard - Box" version="0" id="O0">
+      <dia:attribute name="obj_pos">
+        <dia:point val="3.3,12.745"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="3.25,12.695;7.95,20.2"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="3.3,12.745"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="4.5999999999999996"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="7.4049999999999976"/>
+      </dia:attribute>
+      <dia:attribute name="show_background">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+    </dia:object>
+    <dia:object type="Standard - Box" version="0" id="O1">
+      <dia:attribute name="obj_pos">
+        <dia:point val="7.885,12.795"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="7.835,12.745;18.15,20.195"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="7.885,12.795"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="10.215"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="7.3499999999999979"/>
+      </dia:attribute>
+      <dia:attribute name="show_background">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+    </dia:object>
+    <dia:object type="Standard - Box" version="0" id="O2">
+      <dia:attribute name="obj_pos">
+        <dia:point val="3.285,5.445"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="3.235,5.395;15.95,12.845"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="3.285,5.445"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="12.614999999999998"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="7.3499999999999979"/>
+      </dia:attribute>
+      <dia:attribute name="show_background">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+    </dia:object>
+    <dia:object type="Standard - Box" version="0" id="O3">
+      <dia:attribute name="obj_pos">
+        <dia:point val="15.785,5.445"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="15.735,5.395;18.1,12.845"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="15.785,5.445"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="2.2650000000000006"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="7.3499999999999952"/>
+      </dia:attribute>
+      <dia:attribute name="show_background">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+    </dia:object>
+    <dia:object type="Standard - Line" version="0" id="O4">
+      <dia:attribute name="obj_pos">
+        <dia:point val="3.3,20.15"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="3.25,20.1;3.35,25.85"/>
+      </dia:attribute>
+      <dia:attribute name="conn_endpoints">
+        <dia:point val="3.3,20.15"/>
+        <dia:point val="3.3,25.8"/>
+      </dia:attribute>
+      <dia:attribute name="numcp">
+        <dia:int val="1"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O0" connection="5"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="Standard - Line" version="0" id="O5">
+      <dia:attribute name="obj_pos">
+        <dia:point val="18.1,20.145"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="17.9845,20.0944;18.1506,25.9962"/>
+      </dia:attribute>
+      <dia:attribute name="conn_endpoints">
+        <dia:point val="18.1,20.145"/>
+        <dia:point val="18.0351,25.9456"/>
+      </dia:attribute>
+      <dia:attribute name="numcp">
+        <dia:int val="1"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O1" connection="7"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="Standard - Text" version="1" id="O6">
+      <dia:attribute name="obj_pos">
+        <dia:point val="4.25,15.85"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="4.25,15.255;6.57,17.6"/>
+      </dia:attribute>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            <dia:string>#PCFICH
+&amp;
+PDCCH#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="font">
+            <dia:font family="sans" style="0" name="Helvetica"/>
+          </dia:attribute>
+          <dia:attribute name="height">
+            <dia:real val="0.80000000000000004"/>
+          </dia:attribute>
+          <dia:attribute name="pos">
+            <dia:point val="4.25,15.85"/>
+          </dia:attribute>
+          <dia:attribute name="color">
+            <dia:color val="#000000"/>
+          </dia:attribute>
+          <dia:attribute name="alignment">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="valign">
+        <dia:enum val="3"/>
+      </dia:attribute>
+    </dia:object>
+    <dia:object type="Standard - Text" version="1" id="O7">
+      <dia:attribute name="obj_pos">
+        <dia:point val="11.75,16.55"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="11.75,15.955;13.965,16.7"/>
+      </dia:attribute>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            <dia:string>#PDSCH#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="font">
+            <dia:font family="sans" style="0" name="Helvetica"/>
+          </dia:attribute>
+          <dia:attribute name="height">
+            <dia:real val="0.80000000000000004"/>
+          </dia:attribute>
+          <dia:attribute name="pos">
+            <dia:point val="11.75,16.55"/>
+          </dia:attribute>
+          <dia:attribute name="color">
+            <dia:color val="#000000"/>
+          </dia:attribute>
+          <dia:attribute name="alignment">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="valign">
+        <dia:enum val="3"/>
+      </dia:attribute>
+    </dia:object>
+    <dia:object type="Standard - Text" version="1" id="O8">
+      <dia:attribute name="obj_pos">
+        <dia:point val="7.2,9.25"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="7.2,8.655;12.525,9.4"/>
+      </dia:attribute>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            <dia:string>#PUSCH &amp; PUCCH#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="font">
+            <dia:font family="sans" style="0" name="Helvetica"/>
+          </dia:attribute>
+          <dia:attribute name="height">
+            <dia:real val="0.80000000000000004"/>
+          </dia:attribute>
+          <dia:attribute name="pos">
+            <dia:point val="7.2,9.25"/>
+          </dia:attribute>
+          <dia:attribute name="color">
+            <dia:color val="#000000"/>
+          </dia:attribute>
+          <dia:attribute name="alignment">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="valign">
+        <dia:enum val="3"/>
+      </dia:attribute>
+    </dia:object>
+    <dia:object type="Standard - Text" version="1" id="O9">
+      <dia:attribute name="obj_pos">
+        <dia:point val="16.35,9.15"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="16.35,8.555;17.61,9.3"/>
+      </dia:attribute>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            <dia:string>#SRS#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="font">
+            <dia:font family="sans" style="0" name="Helvetica"/>
+          </dia:attribute>
+          <dia:attribute name="height">
+            <dia:real val="0.80000000000000004"/>
+          </dia:attribute>
+          <dia:attribute name="pos">
+            <dia:point val="16.35,9.15"/>
+          </dia:attribute>
+          <dia:attribute name="color">
+            <dia:color val="#000000"/>
+          </dia:attribute>
+          <dia:attribute name="alignment">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="valign">
+        <dia:enum val="3"/>
+      </dia:attribute>
+    </dia:object>
+    <dia:object type="Standard - Line" version="0" id="O10">
+      <dia:attribute name="obj_pos">
+        <dia:point val="3.35,25.295"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="3.29983,24.8857;18.1002,25.6543"/>
+      </dia:attribute>
+      <dia:attribute name="conn_endpoints">
+        <dia:point val="3.35,25.295"/>
+        <dia:point val="18.05,25.245"/>
+      </dia:attribute>
+      <dia:attribute name="numcp">
+        <dia:int val="1"/>
+      </dia:attribute>
+      <dia:attribute name="start_arrow">
+        <dia:enum val="22"/>
+      </dia:attribute>
+      <dia:attribute name="start_arrow_length">
+        <dia:real val="0.5"/>
+      </dia:attribute>
+      <dia:attribute name="start_arrow_width">
+        <dia:real val="0.5"/>
+      </dia:attribute>
+      <dia:attribute name="end_arrow">
+        <dia:enum val="22"/>
+      </dia:attribute>
+      <dia:attribute name="end_arrow_length">
+        <dia:real val="0.5"/>
+      </dia:attribute>
+      <dia:attribute name="end_arrow_width">
+        <dia:real val="0.5"/>
+      </dia:attribute>
+    </dia:object>
+    <dia:object type="Standard - Text" version="1" id="O11">
+      <dia:attribute name="obj_pos">
+        <dia:point val="3.7,24.85"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="3.7,24.265;18.01,24.9975"/>
+      </dia:attribute>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            <dia:string>#subframe (1 TTI = 1 ms = 14 OFDM symbols)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="font">
+            <dia:font family="sans" style="0" name="Helvetica"/>
+          </dia:attribute>
+          <dia:attribute name="height">
+            <dia:real val="0.78598891769296753"/>
+          </dia:attribute>
+          <dia:attribute name="pos">
+            <dia:point val="3.7,24.85"/>
+          </dia:attribute>
+          <dia:attribute name="color">
+            <dia:color val="#000000"/>
+          </dia:attribute>
+          <dia:attribute name="alignment">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="valign">
+        <dia:enum val="3"/>
+      </dia:attribute>
+    </dia:object>
+    <dia:object type="Standard - Text" version="1" id="O12">
+      <dia:attribute name="obj_pos">
+        <dia:point val="10,22.45"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="10,21.855;10,22.6"/>
+      </dia:attribute>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="font">
+            <dia:font family="sans" style="0" name="Helvetica"/>
+          </dia:attribute>
+          <dia:attribute name="height">
+            <dia:real val="0.80000000000000004"/>
+          </dia:attribute>
+          <dia:attribute name="pos">
+            <dia:point val="10,22.45"/>
+          </dia:attribute>
+          <dia:attribute name="color">
+            <dia:color val="#000000"/>
+          </dia:attribute>
+          <dia:attribute name="alignment">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="valign">
+        <dia:enum val="3"/>
+      </dia:attribute>
+    </dia:object>
+    <dia:object type="Standard - Line" version="0" id="O13">
+      <dia:attribute name="obj_pos">
+        <dia:point val="7.885,20.145"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="7.83472,20.0947;7.95028,22.8828"/>
+      </dia:attribute>
+      <dia:attribute name="conn_endpoints">
+        <dia:point val="7.885,20.145"/>
+        <dia:point val="7.9,22.8325"/>
+      </dia:attribute>
+      <dia:attribute name="numcp">
+        <dia:int val="1"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O1" connection="5"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="Standard - Line" version="0" id="O14">
+      <dia:attribute name="obj_pos">
+        <dia:point val="3.35,21.5325"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="3.29952,21.1339;7.94298,21.8873"/>
+      </dia:attribute>
+      <dia:attribute name="conn_endpoints">
+        <dia:point val="3.35,21.5325"/>
+        <dia:point val="7.8925,21.4887"/>
+      </dia:attribute>
+      <dia:attribute name="numcp">
+        <dia:int val="1"/>
+      </dia:attribute>
+      <dia:attribute name="start_arrow">
+        <dia:enum val="22"/>
+      </dia:attribute>
+      <dia:attribute name="start_arrow_length">
+        <dia:real val="0.5"/>
+      </dia:attribute>
+      <dia:attribute name="start_arrow_width">
+        <dia:real val="0.5"/>
+      </dia:attribute>
+      <dia:attribute name="end_arrow">
+        <dia:enum val="22"/>
+      </dia:attribute>
+      <dia:attribute name="end_arrow_length">
+        <dia:real val="0.5"/>
+      </dia:attribute>
+      <dia:attribute name="end_arrow_width">
+        <dia:real val="0.5"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="1" to="O13" connection="0"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="Standard - Line" version="0" id="O15">
+      <dia:attribute name="obj_pos">
+        <dia:point val="7.8925,21.4887"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="7.84229,21.13;18.1502,21.8912"/>
+      </dia:attribute>
+      <dia:attribute name="conn_endpoints">
+        <dia:point val="7.8925,21.4887"/>
+        <dia:point val="18.1,21.5325"/>
+      </dia:attribute>
+      <dia:attribute name="numcp">
+        <dia:int val="1"/>
+      </dia:attribute>
+      <dia:attribute name="start_arrow">
+        <dia:enum val="22"/>
+      </dia:attribute>
+      <dia:attribute name="start_arrow_length">
+        <dia:real val="0.5"/>
+      </dia:attribute>
+      <dia:attribute name="start_arrow_width">
+        <dia:real val="0.5"/>
+      </dia:attribute>
+      <dia:attribute name="end_arrow">
+        <dia:enum val="22"/>
+      </dia:attribute>
+      <dia:attribute name="end_arrow_length">
+        <dia:real val="0.5"/>
+      </dia:attribute>
+      <dia:attribute name="end_arrow_width">
+        <dia:real val="0.5"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O13" connection="0"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="Standard - Text" version="1" id="O16">
+      <dia:attribute name="obj_pos">
+        <dia:point val="8.75,24.1325"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="8.75,23.5375;8.75,24.2825"/>
+      </dia:attribute>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="font">
+            <dia:font family="sans" style="0" name="Helvetica"/>
+          </dia:attribute>
+          <dia:attribute name="height">
+            <dia:real val="0.80000000000000004"/>
+          </dia:attribute>
+          <dia:attribute name="pos">
+            <dia:point val="8.75,24.1325"/>
+          </dia:attribute>
+          <dia:attribute name="color">
+            <dia:color val="#000000"/>
+          </dia:attribute>
+          <dia:attribute name="alignment">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="valign">
+        <dia:enum val="3"/>
+      </dia:attribute>
+    </dia:object>
+    <dia:object type="Standard - Text" version="1" id="O17">
+      <dia:attribute name="obj_pos">
+        <dia:point val="2.2,21.8325"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="2.2,21.2375;2.2,21.9825"/>
+      </dia:attribute>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="font">
+            <dia:font family="sans" style="0" name="Helvetica"/>
+          </dia:attribute>
+          <dia:attribute name="height">
+            <dia:real val="0.80000000000000004"/>
+          </dia:attribute>
+          <dia:attribute name="pos">
+            <dia:point val="2.2,21.8325"/>
+          </dia:attribute>
+          <dia:attribute name="color">
+            <dia:color val="#000000"/>
+          </dia:attribute>
+          <dia:attribute name="alignment">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="valign">
+        <dia:enum val="3"/>
+      </dia:attribute>
+    </dia:object>
+    <dia:object type="Standard - Text" version="1" id="O18">
+      <dia:attribute name="obj_pos">
+        <dia:point val="3.9,21.2325"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="3.9,20.6475;7.1,21.38"/>
+      </dia:attribute>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            <dia:string>#3 symbols#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="font">
+            <dia:font family="sans" style="0" name="Helvetica"/>
+          </dia:attribute>
+          <dia:attribute name="height">
+            <dia:real val="0.78598891769296753"/>
+          </dia:attribute>
+          <dia:attribute name="pos">
+            <dia:point val="3.9,21.2325"/>
+          </dia:attribute>
+          <dia:attribute name="color">
+            <dia:color val="#000000"/>
+          </dia:attribute>
+          <dia:attribute name="alignment">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="valign">
+        <dia:enum val="3"/>
+      </dia:attribute>
+    </dia:object>
+    <dia:object type="Standard - Text" version="1" id="O19">
+      <dia:attribute name="obj_pos">
+        <dia:point val="10.85,21.2325"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="10.85,20.6475;14.45,21.38"/>
+      </dia:attribute>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            <dia:string>#11 symbols#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="font">
+            <dia:font family="sans" style="0" name="Helvetica"/>
+          </dia:attribute>
+          <dia:attribute name="height">
+            <dia:real val="0.78598891769296753"/>
+          </dia:attribute>
+          <dia:attribute name="pos">
+            <dia:point val="10.85,21.2325"/>
+          </dia:attribute>
+          <dia:attribute name="color">
+            <dia:color val="#000000"/>
+          </dia:attribute>
+          <dia:attribute name="alignment">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="valign">
+        <dia:enum val="3"/>
+      </dia:attribute>
+    </dia:object>
+    <dia:object type="Standard - Line" version="0" id="O20">
+      <dia:attribute name="obj_pos">
+        <dia:point val="3.285,5.445"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="3.23477,2.09477;3.35023,5.49523"/>
+      </dia:attribute>
+      <dia:attribute name="conn_endpoints">
+        <dia:point val="3.285,5.445"/>
+        <dia:point val="3.3,2.145"/>
+      </dia:attribute>
+      <dia:attribute name="numcp">
+        <dia:int val="1"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O2" connection="0"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="Standard - Line" version="0" id="O21">
+      <dia:attribute name="obj_pos">
+        <dia:point val="15.785,5.445"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="15.6997,2.1397;15.8355,5.49553"/>
+      </dia:attribute>
+      <dia:attribute name="conn_endpoints">
+        <dia:point val="15.785,5.445"/>
+        <dia:point val="15.7502,2.19023"/>
+      </dia:attribute>
+      <dia:attribute name="numcp">
+        <dia:int val="1"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O3" connection="0"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="Standard - Line" version="0" id="O22">
+      <dia:attribute name="obj_pos">
+        <dia:point val="18.05,5.445"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="18,3.595;18.1,5.495"/>
+      </dia:attribute>
+      <dia:attribute name="conn_endpoints">
+        <dia:point val="18.05,5.445"/>
+        <dia:point val="18.05,3.645"/>
+      </dia:attribute>
+      <dia:attribute name="numcp">
+        <dia:int val="1"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O3" connection="2"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="Standard - Line" version="0" id="O23">
+      <dia:attribute name="obj_pos">
+        <dia:point val="3.2925,3.795"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="3.24241,3.43451;15.8177,4.1781"/>
+      </dia:attribute>
+      <dia:attribute name="conn_endpoints">
+        <dia:point val="3.2925,3.795"/>
+        <dia:point val="15.7676,3.81761"/>
+      </dia:attribute>
+      <dia:attribute name="numcp">
+        <dia:int val="1"/>
+      </dia:attribute>
+      <dia:attribute name="start_arrow">
+        <dia:enum val="22"/>
+      </dia:attribute>
+      <dia:attribute name="start_arrow_length">
+        <dia:real val="0.5"/>
+      </dia:attribute>
+      <dia:attribute name="start_arrow_width">
+        <dia:real val="0.5"/>
+      </dia:attribute>
+      <dia:attribute name="end_arrow">
+        <dia:enum val="22"/>
+      </dia:attribute>
+      <dia:attribute name="end_arrow_length">
+        <dia:real val="0.5"/>
+      </dia:attribute>
+      <dia:attribute name="end_arrow_width">
+        <dia:real val="0.5"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O20" connection="0"/>
+        <dia:connection handle="1" to="O21" connection="0"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="Standard - Line" version="0" id="O24">
+      <dia:attribute name="obj_pos">
+        <dia:point val="15.7676,3.81761"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="15.7172,3.46222;18.2066,4.19414"/>
+      </dia:attribute>
+      <dia:attribute name="conn_endpoints">
+        <dia:point val="15.7676,3.81761"/>
+        <dia:point val="18.1562,3.83875"/>
+      </dia:attribute>
+      <dia:attribute name="numcp">
+        <dia:int val="1"/>
+      </dia:attribute>
+      <dia:attribute name="start_arrow">
+        <dia:enum val="22"/>
+      </dia:attribute>
+      <dia:attribute name="start_arrow_length">
+        <dia:real val="0.5"/>
+      </dia:attribute>
+      <dia:attribute name="start_arrow_width">
+        <dia:real val="0.5"/>
+      </dia:attribute>
+      <dia:attribute name="end_arrow">
+        <dia:enum val="22"/>
+      </dia:attribute>
+      <dia:attribute name="end_arrow_length">
+        <dia:real val="0.5"/>
+      </dia:attribute>
+      <dia:attribute name="end_arrow_width">
+        <dia:real val="0.5"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O21" connection="0"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="Standard - Text" version="1" id="O25">
+      <dia:attribute name="obj_pos">
+        <dia:point val="7.885,3.525"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="7.885,2.94;11.485,3.6725"/>
+      </dia:attribute>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            <dia:string>#13 symbols#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="font">
+            <dia:font family="sans" style="0" name="Helvetica"/>
+          </dia:attribute>
+          <dia:attribute name="height">
+            <dia:real val="0.78598891769296753"/>
+          </dia:attribute>
+          <dia:attribute name="pos">
+            <dia:point val="7.885,3.525"/>
+          </dia:attribute>
+          <dia:attribute name="color">
+            <dia:color val="#000000"/>
+          </dia:attribute>
+          <dia:attribute name="alignment">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="valign">
+        <dia:enum val="3"/>
+      </dia:attribute>
+    </dia:object>
+    <dia:object type="Standard - Text" version="1" id="O26">
+      <dia:attribute name="obj_pos">
+        <dia:point val="16.335,3.425"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="16.335,2.84;19.2075,3.5725"/>
+      </dia:attribute>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            <dia:string>#1 symbol#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="font">
+            <dia:font family="sans" style="0" name="Helvetica"/>
+          </dia:attribute>
+          <dia:attribute name="height">
+            <dia:real val="0.78598891769296753"/>
+          </dia:attribute>
+          <dia:attribute name="pos">
+            <dia:point val="16.335,3.425"/>
+          </dia:attribute>
+          <dia:attribute name="color">
+            <dia:color val="#000000"/>
+          </dia:attribute>
+          <dia:attribute name="alignment">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="valign">
+        <dia:enum val="3"/>
+      </dia:attribute>
+    </dia:object>
+  </dia:layer>
+</dia:diagram>
diff -Naur ns-3.17/src/lte/doc/source/figures/MCS_13_16.pdf ns-3.18/src/lte/doc/source/figures/MCS_13_16.pdf
--- ns-3.17/src/lte/doc/source/figures/MCS_13_16.pdf	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/lte/doc/source/figures/MCS_13_16.pdf	2013-10-26 07:07:30.115364395 -0700
@@ -3,111 +3,140 @@
 5 0 obj
 <</Length 6 0 R/Filter /FlateDecode>>
 stream
-x��K�e�m/:�O��v�����'�b7���������@��%��Ck���������4��WIqKZ$E���8��q�����w����������~:����Oo�����/�>���>�ǿ}_��m��)9�[��a�9�_����9��B�O��O�i�1���@�?���~�O��6"�
-��<�������:
z?����=^�Bt��%4:�δ^�����O��1IJ�Y"��?}��#����g�-S�ަd|I��L�I�ez��59>]�2�&%��]J9�IO�II��%���DЛ�X�7)y�Z�)
�I�ez�R�)�:�!�[tN��wW��%�MJ{���xwt{�H��`(IQЦL�)]�?�o���׆?�?��?ͼ�-����盫?�L�
0|#����W�t�����L5��_�����߀����;^�������F[�G2OKy�`�Ř�7�}����7���7�|�gzl
�C�C
��A�X�A>��0?�f����1s�%<���t���<��G���A��rԃ��-?�������u{��O{�a��A~d�m
�C�� ��<R҃��-��*�������=�d5��
~l�m�CK�� Є�����x��t���ɋKaGzZ��yXS��o˖�M��1d���D����!�
-��)��b�.�L��b�k�@C���[�����Z7OX
>�Yϫ��(�R���+�abzC�KJ��*���
[�C��%֣�t_����􆬗�����|Ю7L�H���m=J��^R�ף��
�J�ڕ�(���z&�7d����G���$�ء]و�QQ��G�abzC�KJ�z��EH�C��%֣�t_����􆬗����?N�C��%֣�t_����􆬗����t�RcCv%tX���}2}��}9����bͬ��Q�BE���=�l��(��G�����G̾?�0����6�M}0%�W���y%9LLo�zIi{^%�S�Ȁve#J�GE����
Y/)��1Bw��c�ve#J�GE����
Y/)��1�n�=�]و�QQ��G�abzC�KJ�z,`����ء]و�QQ��G�abzC�KJ�z�~n��2�ݸ1Q"=jJ��(9LLo�zIi_�~����
��F�X���}=
-��^R�ף:j{�Ȯd�+Qҹ�C��9�/��}�q)�~��PᔱrW�?}v�;z��}ن?2Q���7ٴ�����x��H#��c��٣)8�!5�;�th��O�G
K'=}�OKL��>Q>4
-���\�3:]:���Ԋ��n-.{L�ƃ]�L(�+)aX���=�ޘ��h���1rL�1'�B�ح�l��o����&�#�6b�Z�D�=�����ȘlUV
��zp��jQ���>+fC�0�`w-�R�jF���
Cȋ�h�:��?��������׳
���X���[%���SGbe�A�Er,��$_��t^Cs�U�ҡ8cʳI�>?�F�~��5m�0Cl��<#�����2G�,+�fN�#t�%M��̎��_p��0��a�&=���2���S3��m8=�P�3M����w�a>J��z­7jh��v�n[���f�9
��VZ���#�g�w���u��^CS�e��|H�݌!�?ECS�e��I�����1z@6���14w\��}�_���{��ϑՈ�����j,Ny��X�����q�#�y��X��z���0�	�ݖ�q.'�����]
�ZCS�U��0�~��#
�����S�e��
G+I2��>�5��ל:.s�	�Bt8�Z��
:M�9�
�q���ƹrL�ͩ�2GΎ>5>+��6 ���Z�6?�F�~��z����r�k��jP��^C��q�#��e��e����5��GU`��jDw[fǖ/|�s�Sa�׽����dֺ�h�ʑ
�#��:2r��
-��ݖٱ�nz���\�! ��Õ��.E
M�9�S�I�#�6՜b��y��n44��"璶vɄ�6\2^�h�M���'4�2%O3.?��ē�uQ�Z20��,�-�=e���.聺ЃCU��Ak?�.�ܗ�����
�Szt>�y��bi;y���툲�	��H�h����`�$��q�%�8�#J���$����hw1�!��D��Nb8�[�G&3$?������~hw1�!���px��o���������1�;.s$�9�#�����~��p1�!9�̐�N�8w\�H>&s�(3$�������bCvD�{����q�.&s$G�9��9�8w\�H.&s$G�9�����h�1�!9��p���o�����#����d�s�uG���̐Qf8�N�7u[wD�����e~|���9��I�%R�u2ùߺ#:\LfH�(s$��8�:�;���d��2G6���q�#��̑Q���q�;�;��Ŵ`����)S�×)Kה-�#Ӣy���!ih�7d�R�U?����)�vH���N���P�0a��VD��$��c�-�h�`��Yz�
�w�GSݩۺ���tD����B����ct��v3ڶ���r0�2Kǔ[�_慚�^��g����\�E\�5S�B<d�j���(�/�`�x�ރ7����x4���wony�����gR��(��sli(�u0��X0Lo'�g�T�0�*8�Ц���+!Y�����p��WB�w_�^
U� d�5gM���K@��s��:.z�?E
-QlG9KZG�x
m
-a��z�a��
�N�!��/�]!��A���8.2�G�3�+���i`q�O�� fH/�]!<�&�d��$�@���uFv�G0����@����+DDZ%D*�+ �����+B�qO

-��Q�1G�x
m
-a;KC{$;�&;-��#w��v����Y��`�9�y�� �H/�]!0���&��@� �H/�]!�Q)·H�� �H/�]!B
-z��~Y�c�ٍ^gd�2n�%m�v�%b����"�5�vI[�C0�����/`�jwp�K�.�3��Ц΀ŧwIg�� �=W�x
�
-��.V����jԄd�9R�hWVm��R;ut>c�L�D�!��k��x
Q�ՠ�+co;0��P�c���K@h����u\�$��QڗH�_61�S�"�댌^�q3R8@{�*!ï��
����u\�6ԇ��}��iR�6������`�����V��ᶖp���ɲz	(EX{M������1	[�m&Wj$	!P��KB��P�d�ht\
S�T���e�����ߗ���,��l�/ �(�>�NC<\=�G~Y+�C��ݠ���_]����;��p����SND^�TD�MnI�"�#H*€K�O��9���a(�L�	���R�!��)Q|!Y��R�`H�y�-��QK<�և�?_ ��Ug�ߑ�~3F�~�?�M��;H�枼O������-�k&�j��������Ő�V�s=�%T�ۣ2B�0�<�/}O��c�&�@OGb�9S�D�!d��:��Uk��'��Ҭ��.�d����B�W?�k��	-E�_
��+�Hx2������3g)��y�vE)C$���%�)u��"��5���s�����[2�}��p��Kr?Li$V�H��%�ɞ�IՅ�}+J�^�H|`K���E��S�;G��%g�HtI`K��m�LH��q�k��7H$�F�%SN�^�T��D���7
vd�����������) C&qaK&�H���l��9"$_V�	��C-:��k~_M�EB2�u�-��;��zs{�<��.<l	�!D�$��i�8�D!��JĖL�~��	�!��oNV!���ĖD�9���F`|c�)���*�d��J+�[�d?��n����@����lW_�pƎ�@�
-��.�َކm�w�ÁYۢ5|7c��.&�$<\'K�F��S��{W<���YVyy#=�%�N�ؑ��Գ'�o�w���N�pR�N9V�&r��i2;2a��tm����5��N��yY$L��ww�jҍ�IQ÷ڼF����3x�aY t$�������cZ�&�v{�L�m�Ҳ�4R��<��5�V��M���Ec�c��U��Zl-��u?���j��pm�n������:��4Tܺ�]�|ݺٳ޺̒2̛C=ʟ켫���<Uܹ�_����(��o�vI
�pu0S���n_��q��x>̡��xE$`�::����%�"p���0�V�6�QD$�g�3~y6U/�q ��*�)��($�&�Q�Q�X���ya��-�a�Ș\�~�EO���_{J�1��G��s�<�{*&r�kb�G�]e��<��-���=}�yV�ޱu9�z��Q!9��O�L>�~�l��	����E/Z���k�~�v�+-�*X���&Eޖ?K��~<[�o�JE@�h�0�x97e�/��E�x��>���n��+�1��9�?���R��*~<���
-�i��R}y��p�~����Psoů׳Gů.u���_��y�A6�\q*߮#����գ%��ȷ�m�e���g�$�1Y�^��*@�#t+ܷ]V���q+�L��s���V,=C�V*Ls��Ͷ�LG�����k!�A��(�C�u+��S�#��1{�V4 ���9��rq+��!�4D��N�Ƹ���z�n(��M���A�rF�ԋ���1�SO9hU���'nD�aR:�Y,�j/ <,Sٻ�!n�M\�R7�-���7B���[�.�4��/j��V<�%�S`���F$��wħ�6�n�s:�r�j���i3E���'z��z"9����Ԉ�C�4��Y(�h�. p��4�7�LM?�"�x�KQ�0�~�'M�}��
~h�'
���-���$�h4d>ϥ�y�����9Г&��ڜ$�O\nm3v��Hq+��|��R�FCv

�g�<��ZH�&a"��k��0���ң���#%�V<�AJ �c�J��h���i����j����>���h�GO��V-oBA�[g=m��h	�t��rq+�^@=8��!n$1�Y����B9!j�y�
-6�#i�}P��[�x���N�P,�h5��Vs�Ƹq��� ?)ft��q>�B~ �6�Ѿb5�7g���V< �%�Ӊ�%Z
��Lݔ�1n$}�~�@�q�ui���B�]<���ol������;J�x<DK@��9����1�
-�1�n���~�A���M&�|���<ک����1�J�"�F<"%���������q2�O�ȏw��4�	WJ>%b���'���'��
(��
bn��!Z�O*I,�h�.��'��4�}3��܂�6�<�
-ɘ���!j�_�nS��=L���! �ٜZșI	��K�1�$
�����f8�o�:�/�ZL-�js����<Yu-)��G�ģ~_�ALᇶ*��[����-
��m?�d�D�!���0+��<ƍ�q؋a�u���-�0�:���/-B��wӨ�?�IL�-�$�=j��(-��h	���$�b��B���4č+v����_��0�MO��f��`��F7Œ��!��QNjE/i
J���'��L�h�H?e�̦�m\
-�*�!L뷴��{�c��A�Vk54�8�K��n7�ň1����C.�jH/�T���1n\V9�EYl���<&2��u�Ԯ8�$6�[���,]�F���U4�芠�E�}��,�"�2�`��7.ѤnQ��0���¸O���&����ػÏ"e�U9���P>2��M��O\0!�����q�P܊Dg�;�9Nܸ��
��y*��?�eЯ��f�r+����P�(�J�p+zŎi148����$5b��� ��7.�nQ�R,-�
�B=���CI�&��L_���Q���Եl
-Q#���5���H�����������
n܄2�T4�]�ޯ0������M<� ։K�<~[��+:�+0�P�[�z[G�b�8���$����P��&���_�ʥ�G���G�������ۙ->;t#X���P;b����ʛv�.h14�Vs��7H*jIJs���
�o��ͱT-�T0��n��Î�!u���g��'�F`]��!���>$�V�?6ˤ!~#;GHŭHv�\nY&��4�l5���}{��z�I;
R���"�ww��خ�Q+N
-F�%t�v�O���u��"�Esϳ�!�"��W��y���l�UK�p5WЇ�TfG��w2�����A�Y5�
�Vtc�g��9���6�		���Cl���L��\@x��C=�e��k�h&�`M�m�ch��
�D['�5����j����
j�1��*Z��l{�K��(4@r�Ƹ�|Q�f�9��nf����x:��f�n@ѭ`�=���,T�B���Z���t�"������.���e�x�B��'�$sBb�{h�n�����^�L���>��C��5�D�F$8C�Y��4�U�l�Fb��R͑G2�᳎������1����h�֔uG���Ψ�VXQ�hZMjS���F$;C�:z�p�j~j�vp�l-i����B�'K�j�׍0��is4ef�ht��<F���\��PԈE�~G��y|�����f���W�#&/���
F���-��ooU_�HR��Ā��V_���~?ʯL|
�;>��-`����6��|�
F����
��~��a��xf	F$�|`�`�5��\�$�w{P}7L��Wz�{3Lm|����[�p�h����?�ݧQ�o�hN�\�}��`�	ݺ�������r��n�3���vl���w��p��r!��S��'�Y�?��>�@�?ػ;NI��bbf�3�R��7�~��#����/����?���}M���>�-���>�E����3ԭQ�b�|'��BK��l�#��6����I�hޔ�v������w���o��#�x�]�T���ܢT�!ViƇ��*�
�f}n��{^��W�����{�኿0F���&+:��Ҽ,t�����}��>ML�8�$�_�L�&���ҡ/���9+�+X�wZ�G[U����]F.������j�R/B�^���b6�q0^��.yWOO����=9�$6įoF���=9a:�W :`��ݯ`	�z�Ri�.!$�;‹�>���"d��E���*-(���^0��	�����-k�����O���1��_����a(9�:�eW&f��ß���L��?�ױC�J����Æ��Y��$W&!w�p�ţ��`"4F����֮ˮ��b�R�⳩�~�	8|uKՂW⼚W����j��ܯ`��'��h�.Vj�aʅ��N�َͩ!�A�345�����Ǣ&�08 i�b��f�4�sQ�0����B��hm;f�"��E=�rQ+�� �i�+��<F�e�o9@C���<戹��˷��S��6�3���%�V�&�&#�祠����1eÔ���ab;���M_@���Lk�DbY�FC�I00v����s��mA���ަ�7�H&�ޤ�2�I���I���G�z��H7�&%�MJt��2�&%��MJ����ժۢ�2�I�b�],���ۣD2���
-Ai@�2ݦD2��K+�M��)�mJ�܏>�ƛ#����i��m��~�>���1dbm�����G_d��.n4�k�cbG,�
T����,�;����~���#}g��n���s}��o;���m��c�����������G���A:0��5ʍ�#go�8�lj�Bɨa��A~hSl
�/��Ab

-�|�(7~̫}v�*|�/ۑ�{K>���+<���l_q��E�!�V�\Szc���!�GNO�y_8_�12��Jd���$*�v�����r����k�7M����уM*E����5��弢�=���r�j]hW2��*T���Pp��ސ��Ҿ=^��J�ڕ�(���z&�7d����ǀ�ֵ;�+Qb=*J��(8LLo�zIi_���Z�ڕ�(���z&�7d�����dr;�g=vhW6��zT���Qp��ސ���zě�N�A۲
JB���g�#s��ސ��Ҿ11�ޒd=vh;r8(���z&�7d���G�T��v��()}=�d��;z��}ن?2Q���Mv�?b��[��9��E'J4�4���Jr��ސ��������z��jlȮd�+Qҹ�C��9�/��}�[�<JvhW2��*T���Pp��ސ��Ҿ#^��z�ЮlD���(�ף�01�!�%�}=b�����
��F�X���}=
-��^RzC�����-۠$�()}=2���
Y/)��1��Z�ڕ�(���z&�7d�������ԑz,㙝ͬ�A���(�ף�01�!�%�7�8r&�og_�%�Ϡǟ,S��?r_��L�n�#��mR��G̾?�l��&�Հ6���h^iJ���01�!�%��y�0���ؐ]�V��s_�L_s|_�+:����XeGhW2��*T���Pp��ސ��Ҿ#����ء]و�QQ��G�abzC�KJ�z�0���
��F�X���}=
-��^R��c����2�]و�QQ��G�abzC�KJ�z,�
8����F�X���}=
-��^RzC���x��ؠm�%�GI�3�9LLo�zIi[�"�u��3d^w=Ι�7��������G��6����
Ļ�4���#Ǿ;�7�*�O��m}~�>�?*��k��s��ݏU�V$=�oY�U�Y��kߜ+}���竏'׊�_��P6�=��Ҭ>E1�
�П�c�r�k���E����3�9[���c���� �����by��)dp�'��bA���j�S/�jm�U�V�ǷR]+q�kぼ�<��������V�g,�
�k��c<,���S��ʜG-�!8�j�$_"V�VЩ�F�K�tj�����h��u�54u\/#�������$���k!��8.*��kP��Ț��q���!��/Aך�Þ;.s,��d�����y\�^1w�(��kq?��D2��5��G���q����G��7���&�s���Wm{�~�u!3���)p�
�n����N�I����;�(`���Ft��BD���Z*
-!�<Ri�3�.T�ߴ(d�Qݧ6R2Xl�P��FM�#��<�;.s��p�9|u�v����t�W9CS��r+㛗�����,_�~�S��:��<*h�̑?�XѩrLh�"G��Zy$�䂂���A�k��+`U�)�+���R�OdPr���Q>��،c�&���³��lU��\�0�rԋ�0���r�g'3��V��ͪ�{�%�)1��(��:����#�_�4F����)m�^G����x�
^AԦ�q�>�|�qǴ4�6KӒ��MK2��Բ�i9���>�[u���Vk˖�F�H�%�";�9�:����h�i)8;�9�:����h�i)8;Rp�;����h�i)8;Rp�;����h�i)8�Mf�8w\7-���ɴ�)8��M�n4
-�ôdZb#O�M�n5B�Z��Mˁ�m.�M��oݴ�f�÷	�-�mˁ�M4���S�u۲��`$VR¶�t�m�p�^
�[�9���+[�
Q_@�W�45G�E���X,>�%���/~7��4��j=�a1�7�e�]�!mD����;�9$�_�4ڰl��.ƞ�|�^o���j%eXvH}vs�Z�;���d4��_�aXH~��ẕ4w�0,{%���
Ұ,��3�;�drn�sw^M�\{+�ܒC��9�o}tm��X�
k;�bS�'d�i�?{S|fHQBw#�)tg�A
-��n���M�"�X�5�]߭�Uw�z��:_�:���9���i%���������J}~`���1J��# �mU�j%�}�+*��{��gghgD�^�7Ѵ���⎋�,|��Rs�Z:K�"�9R�hWcb�Q&�dE� �H/�m!Я�����BHp/�m!�r\����M����8:^@�B`��I�T�-C2tD��.�m��q9�߹LE�0 ���;#�X��u��ՏC�Q�b�2�
r#����!

'b��8E�	���x
q�U������U=�!��E�T˧���w\�����
-��D
zI���\��4:��x��w���m�U+���r�
I�x
Q�U��N����]�.+���0��b������6{��U9E��v�K@��nAS��:����T͊Z�����K X-�"�댌^�E��x�!XڳXXK��!uR�۽��^�&~j�����l��j��^������u\�T�+V 46��2:|"m���L�������E�C+�h,�0q:z,iY�w�% �.u���D�6�GDȆY/����4��k)��~q�G�,��Q왌��uMI�)��H�qϷ�����|l�R�����-v>��&��Y,:�<'�J�X<��Z!K,O��~`��=�f��-���o%�r���B�◡#��햹V?Q�2}2�_&�#���0�2��mު�e�ֿLiI>��8tq�������ˀ�ݼ>�ˀf���_���i��9�q6�S����oK�!��_�D�Z;S����戁ɘ�2�J����&��&�z�����2��!�Ȕّ	�4Wk2�,.��'�Ł�Ĺ4[29|QT?W���ߐ��DH&ζْ)��:�M�3�)o<$��lɔ��q˱_�#L��[�V^�1l�R}F���J2�
���i���Э�������ӓ�sup��jІ]O]���=|+5Hz����=�Ew|`�`�c��Ǥ���;��Qk����zC�}K���,D��m�o�Nr�H6��FX�d���`V?��*��
��?j�K"��\�ٷ�̟�z�c�@�����j����!Ѣj�4̅zD�������G�e$c�=��x�T�v"c�z��������D7�dvd�)7���TϘ�&P[iP.�F��ƹ�GS���\��P��c���(�<̅�{�Xt�oKg,#��\D3��� �2�j<�&�	���Ysi��e{�����„]�D�/�º-I7�-z�G]��`F�T/m�5J�UG����[~,��z�l��N„_�4\2,�XuD�@�R���j���B�X#D~�%)=d
-8��C�0�p�w!��4;0?Lh�=��CB
�YT�+�R��N�0[���L��c��PV�mXG�L�o9��cY(�17�N8��ݝS+|��w�����6{J�aN�O�.b�e`D�
-��F&�UF��9�s���ޣ�<q���4K8��bq,n ��^�@^�w����oߊ���\����=b%�B7�e��.�s!�W�\���X�מ�	
����-����2"�b2�~�IL�X�d�M*9|��dH���<`�i(<�3�B%<��j�/��_���@���Q�����'C��FM���0�9v+"3��I2Cȍ�u�Q��x�94�,C�s� ��RЭ�҂YLVW�D+`Tw)A��sG�5Z	�	*���Oc\?�I�TNA{�-�A��A�����M�A��{�J�Vc@�C�P��k���vTr��i��	��c�~pj�s�	�0J+�ڣ�<3{@Q�$nDz`J�#ZB*nE�3NH���<��۷�-2^ғ���ҁ}7�
Z�֨V6�������ѿo�CX�5T/��F$:Cx�%*~�7�6\O����V"5�������\?$
�	�Qě�E�ÃR���jԦ@��B(��?g$�l�e�P���d8�p#�$���1��H[��Ε�>p��Q��:
-�OcQ1>j�j��R�(c��H(٨�.���f��4��<��Ch����1�Lo��뭻�[�>�5C,H�ZU�IKB|��<[�y�J��KL��5�i��7�����G;Q�Ɨ�;4H�ttS��v�[5/KA�q���&IJ r�	�C(ѦK.�ƎE̦�m$��m����kvOH�f1]�Xqc�A��M������U�h%Nz-	q�7�C\�K���K���N
-s�Ƹ��dr'��1�\�8ykSQ�v�;[7J�e���Q�
�jTE�!
-Bۮ����پ�3�i��S����1P��������C�1�l��F�K�13�����č�8
-I�bh�st9���F$:C��-�N�H��=o=�:g�5]��Bs�m� �t+�5c5��Z�S�L�fR�z�|@!�"� I��!nd��A����ES<C*������Z
og4�v�g�Vs���% r�㸬Hrq+�^t�*�9�cܸ�R�H	��gKxJp��CtH
R���ަF�S�����p+w���b�����$��V,;w<����n��Y4TZ��x�7L������P[�?L��V�Ub&��0i/�(
-��K^�b��/>��mB.j��3T\ۻ��<ƍ���;–U-K�?;"�B	��
�l��[���I�4�N���U�G�r���(��vD�T܆DP�:����sOE���aZ�gD�85��#�V�W�13�W��qY��q����h1��8����%
������n$X���x�����o��A€ߌ�Ć�[�2E
A{tzEt�[���!��dzŬI(j3' ��yM��H������>&��4h��8i(-��-�`$�
-7�:^ѱ��s��[aD�hZ
��BEH,nD�3��p�n<K�Ƃ�S�E��}��cِ����j����/��fn�C��Ť���oCH(nD�3�^��
.k&�<{��
-B�m��s���b鰯�[���Pn����s���-h1D�z|��A$�"�
-m3��1.+o�a��M@+�v��"bRG�֕�;[p���aW��كh�FpҴ"���?:4��V$=C����4�U������.�|��
H��J�b��V�S��8��܉Sj�Kn�.����hx	�D�!���P��1.+ǚ�o2�G�rm�:Vœ��GWT�T�u�QW��q5Ak�IPb���zRq+��!WS�i�˪�ƶ+טgk�2̏�@Ҁ��Z�NM�=$[���P�G��\�[�/l4-��#�X��ōHx���:�A�<�e��#���ǮL�ʆ!u�����[\ЍBn�P��)�'E+���C)M',NoA�?��u�c��=r<|&�;�	1'C���̋��[����z��f�By$�l����~<Ԋ��/�v|��2
S
�J������Хv��?��z~?K\��:��|�=ح������U��^�50�Ԃ;xM����0s����_�����4��y'�)�E��Ō+�q���J�୬~�`�x
���3�v�}lH���\��2�ii8�.:����F����K���������-�p�_��o~���G<����_��?��w�%m5_�m_�q5y���y��|��ʴk��|�-�;v�|;<'�7]�S�ٖy}�]�4�j�Y����_������ջr/�#u�<d }vH�/���˜lMK�����������^���]dȀÑ�!�N�0C�)�~�kr
-�MFAs�/��ik����*���Q3�C_t	�y���r��5�Ҋ��6�b
�e[o���k�X���z0F�y{
��r�'���\p�����V_t
z���<���o:�{�2���Ё3��I�_�"�ηG�Y��X���<i^r
��]��^���Npy�M�z���,���&u�.T�x
��_t]�6�
e뿾ui|jwoxu苮K{p8+�kX���z[�5ڡ�u�
B��eGĺ�8�Q뒐;��q8)1>�U0=QK�l�Ŵ�"
����L5�EL���׶PK���ͪ�|I�́~��W�J�Y���*��*=��G���U��r� MXF��zba��h��o` `ƧaH���`Nw}G1ffR��P��d���Q�O]C�DJ@�aF�Փ_K�����z�q������>����hN�z�����GU,�Ⅶ�^�qA�c\��S�(L��ܞ��L+���"%�O���̘@��X�D�\Z^��GM���F�י�(X�RY|E�羥`
-D����9�|[N��W(�n�S�M,+�:�!�[trj_0!AoRb�ޤTbs��L�I�ez�|Rm��2�&%��]J�tRz"�MJB�7)�K����`����=J���Ntwt{�H&���T��ȦD7�\�p?��6nA����e����|��ǐ���	���c|>u��;�~9�n�c҃* ��~ЕX���o��O��;#Lx]�x=���?2�F���pw��0
��ˣ����dž��Qb%�%j���G���8?6n�k�X5ʴ>����1~h,��9�A�+3����({���C~{���5μ��^}MR���Ϸ?�L��%�yX��o˖�)L��ai��w�ǵJ��<9�in�P�0�d	�_��YUO���cV
dSL�f��twV)��Q�(m�*�_8_�;�+b-*J��(h�wD�����Z�\i�#��!֢�t[����yG�+J�Z����ؑ]шkQQ��E�@�#��m-Z,~���@v�D���)�բb�y���Ҿ�Q_�Z�ȮhD���(�֢d�y���Ҿ^۔��@vE#B�EE�%��W���"�M�J�
�mZ���kQ0�<�zEi_�#�JJ���*�tnk�	5���p>���\M��w�b��<̾�a��u#����*��dR�n�&�@�#����,���9�MјiQS��E�@�#��}-zoZ�]�bGvE#B�EE�%��W����W#k�8i�#��!֢�t[����yG�+J�Z�gYj>/i�#��!֢�t[����yG�+J�Z̮'��;�+b-*J��(h�wD������
--�Q�xO4"�ZT�nkQ2�<�zEi[��Y'�ŁlOB�EM���W���"��-���Z��w���'�����|ٚ2Q���
S�r�;!��5�#���Z��h����'�E�xVj���mB�����ǛS㓱�25~�*X
-9�����Q���9l�mIc���d�ۂ"!����k��hՇ��>����g��7��@E�s�
--f6O�$���W�4��)����I*1>��;�<>�^��㫕D��J+���_��p�Rl�\�a &�.���e��y��`���B�[-8t��t֛�:����z��#���j9G��EE�u�;.s������J|2W����<(���2��|Tc}:�iG,Ma44�Zf�yJ�)v�bʊ|�0�;.s�T��0@�����q�Y�N�V�e��{Ւ�I��"S�x�Rԯz���hm�@�#���*�6�j���-3��y]������<nKv��������%�k�%I>�v����2G��78f[ߡ��n���;.s,@+��-���ψ{�����*�b����ߊ���4)G6��Cs�e�>/F�Ƃ{eR+���B�����q��jq|�R͒�Oh~s�e~"�q��׾�J�ͥ�
��q�#��q�Lj�+	7�	������B�|+��Ա������*Ga�����9���%��׀�΍L,7,����s�U�j��n0A��:�n����6@|���؍���n����:G2�;Bh�՘Q�Yt�
-&@w[�7�OW��
-
��n�kK
�{���ɸ
i<��o��>��^ 
s���:.sd�٧6X�fF�=��,l'@w��$�����Hw�|3vgZAa�bb{iR��x�eL��:{Գ"ւb�g�[ŵ�i�B���gs�~`��O�ݿ�
�����H#��e�ouo�K��Cs	ԥJ���>��t���
Ǭ�g[���!髙Qg��q��'nj9����Wc�s�u�m8f̑�7�H�s�;��o�7c��}cv�1���2;r̘�ȏ|5�8w\w߆gF�c��Yc�s�e3�<3fH��bg�8�:.s�3$������~���p̘!�o̐|5f8w\�H�s$��9�������p̘#�ȏ|5�8w\w߆c��}c��1ǹ�!N�qd��h��FO�ݷ�1Grߘ#�j�q��uό�������n���/c~�1Cr՘��q�{�s$��9{����ݷ�����[��9cZ��׹�)�<�f�I獭�a)�QўHҝ6|��?�uk����>�N9s��*��5��t���G���q�q�.Yj��ϖ�d*��^�6�����"YykR'
-G�UR����@��6Jz���t�N7����C7�+_�CҜ.X�9	���|�����y�v��"<��|�ѥ^@^���Q
-?B%|@��1�pN� o?8~֤OF��<�F�=lx~���*k%�݄�Bg����ҽ*v�߇5LB��b�6/�b�iR�鋓�b�o�~�	�Z�Rz�
���6�ы������~U�I���QZ���t`������x
Q�U��B�u%Ȃ:^@�B`��~X9����Ӱ!Ȃ:^@�BD{���!DL�8!B����+D‡B���0s�U��#u��v��J��(!��sR2��Q�hS����C�"d|��)"����¦Z�W
-�%�S��#u��v����h�9��!Ȃ:^@�B��>��Ȱ֒mB����wFv%H1�S�!B��2�C̐:^@�B�e�Z�K��c�!Ȃ:^@�B��m��Y���"E��nЮ6�V��E�W5b�����cip5)a�9Ɓ�� �H/�]!�0CtJ���8B����+D=��j�JDJ+8����a��~g���:�Xʴ�(3^���x�^Bo����D��k<����Γ��U�^²p��ؽ�D�=o�C.@���p�P�a�%!4ֻ;>:^@���A�Q��=�@�Y<
z1�`�
��v;
�i�9�
�_<~�ʹ�2`����`���#�����cM��ػ�Vg�����3ṃ��n��|-�m�P{׸`�AB^�m�N'��Y��C��l�9�׏`$5�С��Xͩ�>��u\���y�}��v&����:���9F~)u��Fǯ/� Ұ�+-�C���LH��ݽ>x?U>x�v���c/)+|p;�d����ݔ:�6��8Ac>8ʧS�9S��p�a����j*������	���X�^�����)�`(�ȋ��b�W���);9��a<s�
-ƨh:)8�I�~HY���'��ha�z�d�/,��Z��HH���4���K	!d����-�8b��4_p�o�}����Q���~��xr��5��|��-��t�d���-���S0����������-�"��)�ԃ[2�	=��	�[2��z��d��_"�3|��S��d*�8��`>߃o=�"Q���D�FD�v#�Ϲ�l=�iC$�ƽ%�
��M�9�
-�d�L
��3��d«"�����=�-�8��D�T�-��O��Ys�:�d�l����-�����9æ^¶L��@2���%S鵘�LX"nUD���	�;24/���������=�4�DJ��L�6k=J�%'=�Hl}m���	�B��ԃ&�h��}7﹪�?0^��E}��k*�kVD���f�K��_��`i�Ջ�%
/LԚ6�{
-ưZ���1�SK׈��"�~�Ἂ��L�B����s4�Ѽ�`o��s�s>B\�Sz`rH&��^�Z�F�f~���l2A���ڕ0QOߩ.BKC��e�L�oǩr�ͥ�GAA����oJ��y!�e3�(ڞ2 ���)�=Y�<����j(����4���j/�)Θ����dk`}�h-���϶w3Tz�+���Ŵ��"Z�=l�"G�ՆøuK��z��!�����683��-����Ǻu��y��b�
¾/��cy�����Hc��[*K�y���ag4�fA�/O#�RMX�9B��P��%r���Z�CB�r�O
p�M{ɮ����~
-,�a\�u*1�I಄.��5���Rn�:��Q�M?��ה��mƶ�y�����
-`D��
-�,Ό���F�W
�����R{��C]?*/���T����j���nX�l$�o��7_ox��
X�+b�:���o`y`��B��z]EH��	�X�}61!�v�)�^[m���{�(�_�T�����&��X�R.��;}>q.T��
볋��s�]Y&c��?<g��d��B�c͛t���w�!/B���P�7x����W�PL��Ǫ�
5�89��`.IG��NJF[ޟ��}�:?��W�i\�V��C"T����D��J38GXr�#/Fjv}}d�"d-i�J������"�ݵ0>�v�6��.VHh�8W��B3��!f��J����b�&O�~K�ij����iaW��uۡ������˅��01a��+�ya�%g�jT�CjGcx��3Y�S�"����ʅi"��QM��,&�X�Y�_��<���I�C�Q|�K,̎��Y{��I��3Րӯ02��o(-ƐC/
a��Ҳ�G��:�,�ꁗ��$2���[�xM5��~k��aS'5k��Vn�����Z�S�Z��Ռ	��k��{�v:'%v�tNK�j*矱-�
eLx3�'�~�ԛ���{���r*�9���^>�o�̬�>�-�_�<C���L��Gg߬���[�D������d�Lz����=J���"e"�MJ,ӻ��A���
-;GI�����P$5�z���.%��댒i@oR2�G��X&.+�%��mJx�?h�:�&%)�{��$j�[T�4oQ����6�-JB��(]��_���ۣD2E�noJڔ�6%�)9p)�݀6e�M����ϧ�#N�O'�O3Uo�t���|��ǐ�!�5�W��?6�ƽ�[�?
�1�G�����Fu�L�͑~h2ʑ�3�t���ӣܨ`���7Ώ�����Z\R�t�����准��Q��T��u��G���8?6�o�3�g��!���G����9��ﻣ,G��95ʍ_�#�~o����ljϤ�Q���]��1~�"���{�G֣��-���������?"�I�/���#So���Gi�WL�+7~�K��U��g����y�Ƴ�o�F��>�l��D��W�
-xu"-֣œ�Z�v�:a}`:O�����"ijJQ�=�$��W��gU2����;�+b-*J��(h�wD����Ō/
-�Zw�����Z�4�;�^Q��"^�1H������Z�4�;�^Q��b<�C?��8�ݨ"-jJw��h�wD����E���:�]шkQQ��E�@�#��7����?�m�!�EI���W���m���Ŏl��!֢�t[����yG�+Johqb�-JJ���������B>�l��(��B"^,n�وx�>`�lw�iVudWD�g��t{VI��Q�(��*,O�+�v-vdW4"�ZT�nkQ2�<�zEi_���?7�ؑ]шkQQ��E�@�#��m-&4������ C*Tt�jP�Wo�yAg_{����R}������4�;�^Q��"f�jvdW4"�ZT�nkQ2�<�zE�
-��Yd-6d[�AHhQR��E�@�#��}-:{�{:C�����X���m-J��Q�(��ő��Z���4�()���O��uG�����5�c�t����n̦�a���K�F�IՑ]m!�T���I%h�wD���?�2��%�@�+b-*J��(h�wD����Ep]|{!lhq �g�D���)�բb�y���Ҿ�L�G �����Z�4�;�^Q�ע��ʰ�@vE#B�EE�%��W���bN�F0i�!ۢ
BB���}-
-��Q�(�kх��.EZ�ȮhD���(�֢d�y���Ҿ�da��@�3�!֢�t[����yG�+Joh��LJ�_tZ��j�'�����9dkN�D�R0{Ϧ=/��wB��o�����Q���i�V�c \�c�t~��>�XU=d�/>寖��lƲ	����s&wn�_��r���WQ
"a
��������kϑQF1�8�ܢ&DUk�cRm�;6{�W`���p�?
�Cc�_%�õ-�+�����C�4��-���$�Y�/���GX�2�"�w�Ӻ�?�(�I�÷�ۉn��I���dL�$$4u\��[����q��cQ�c��~�>T�C|m�ZEoi�	�:���U)ǀψ:E��^CS�e�
3Ű>�u�y�„�t����t�bU����?�O
-�;.s,nj��&?Y���q��(�dV/
|=?�u��:G
��k5�9�4�
*,z!�Ͳ�N�k����#>|XM��Z�B@s���t��8����Bȸ�4u\���GS���U!��6���W?��1��ީ����c'h��1$��o�{�r���M��q��*�dGP�~�Z��h����K��]A�A�I/���
-�:��M=����ciO[J�~��W��q�H*�dN��r�P�J�X6GA���G�
�ф��$��k{�;�Wa�-��Q���4y��5SO�9��K���!m�e�j�L��q��k/�!8�\+'�h�8�L��빆�:�䇅�Z
o54u\���q��z�B$L��q�\l��!�g=�ݥ�'H�[�ǷY�!~ճ^h��	�:���-��>��9�A-�3AS��B�������ñ
-����m���pʘ_/D��c�
M�9��g\/4�`w3�W�D��jH�ۨ`K7�=����-|,?�<C4>����Ek�Q��crhUr�D�����$��s#g���Łt�e�k7�Bl�"HHwܨ�;|m��+C���l���~.4<��~�o�#�Q�
-}T	�5��ߢ�5����Q,���.0�4�?Ze�t���#q���_i�ђiq
-��u��"�?�pׇ!!�ˍ����<mv����Of��f9ݲ�*�VM�\Ҩ��L��������sԒ*ח�~İ�Y�qS*��IW��Ъu	�y�ʤ�.��
-|�-MC���^��T`pƫ�/e������D�
SCv�#7�es��������o����e	#�.#�#�s��pˆ!�ˈ#�ƈ��q=\F�0���2�ȱ1�8w\�Q$�8r��8Rp����r$�r��rp�8��#t	#�/#�#�s��Eˆ#�ˈ#Lj��q=BG���Q��-#�s��Eˆ#�ˈ#��S��xEˆ#�ˈ#Lj��q=^־u�#̈#ELj��o=`F�0b�
3b��1�8w\�Q(�8r��8rt�8��f#F)^F�8:F��n��2��?��C�ù�2G��G��G�ǹ�z��"a����
Z"8F��:��G��G�
����:��G��G�ǹ�z��"ađ�eđ�c�q�/�0bH�2���1�7u[�Q ��q��rl����e#�.#�#�s��pEˆ#�ˈ#Lj��o=^F�0b��2b��1�8w\��Q,lp�x���񛻭��=��(Z6(����7uۈ΍8�h�#���M7�s#�,�3*\� �0��vL��j9>7"a���V�2�+J4�b�׹�F���>��RȀYC��b�D5w���@���y.��S����q#\�"a��2\��c}Y�h�h9Z�a��GTѲ�0@q�����q#^�ba�׳�[�l:��mkb�/�54�B�cD�$t�x��
m��F��,xcmn/�4HEGri�T�:���òp�n`G���e�G)ܜ
-��r��&���6��::�)B"��|��^����VE�>TKRA;�"�MZ+n�ܬ;e��^0v#��Y��?Ok�F������1=[u��#�F��$���V5��J�KB�h�]t��F������X%Cđ;^@�B`m�?#!�
A�q���Z��=*EB0D���)D�~�h�S@1����
"~�b���i
+����Ц)��#!��=�EB0D���)
-���(�ڄ^�G�x
�	��a�#Q!D>�œ	AK@���x
m
-
�g���&��"!"����Of�Z��8z@��`�8r�hS�k6J��_����.�M<�E-P����f$Cđ;^@�B�{䖄�ƕB0D���)D�'D�X4�(Z"����"���$��p#!"�����x�h
����q�Ц6Z�k�6h�����!�;#{�0� E0�=�|`d��.�M���6����#w��6�p��f�:��4=�GB0D���)��=��/W�9'��
-�8r�hS�$�:KH��H��#w��6�����3	a{.j�	�8r�hS�����	�C�N��!�;#��z��D�:V-3
C�x
m
-Q`�
J����$ ��/�=!�<�Qa�����Qt��v�0�˶L��#U�Ţ��$���!����C�ŵ�@����w-�Р����s����"��+��s"�?3C/	a�چ�^�G�倯������
-a�x�^rXߢ�z��:.��i!W���CCG��c^`y�o�t
�n�qa�Ш>LBjA��[
-QC^
I��D�v
�~ˡb�Y�5���V(��.N�^J��*�/ �=���=y_z6i)��j�K"x�٣ǣ���-ǓC��2Hӂ��%�^���s/ �f����y\0/���aG��$�-�:^@���y�c�t��<:z�(18<"U�}0�t {j?��h-o��mա���9��q:6�2,������|��^��`m.���"Z�6a�t�N�Gg�M&<��/tz�$2x��i�Vz;�k5�8�
?~;��.�p'��o�op�߄b�A���<�p�o�����o�ߤ�z>R
���K����DAI�G�s[�<.�W��#���*]���O1>�Ƨ�T,��{_�=O�z���h���k~~v4�_P��L;V�um�.�
�2YЇ;��q��dbhK&��&��n��.�,�tI&��d��
-fmK N�%��(��4�@h�����
'��H�lIc=�%g�_���$C["%L+P����T��A�Ta���-�Ј�z(A{]����$C[2X�!K��g�l�"�x�$��2|�z �d28ö�HH&�ڒ�ª����lq�m?}$R�I&��dr襪� ;�b�뎓�I$B�$�T�CY4ٗI����I"��D��/Fm9�cl��i�$C[2EX�V}zs���e��i���-�`��z�)������j���-�`,�Bk.��#�-�8��DbhK$��{�l�g��> ��Lڑ����C�$��v~L�Ӯ)��dbhK&4���ml(��ϊ��&�����/��[N��ϯ�'�ڒ	/j'(g��N 2�I&��d
-�Z�
.!�~��%'��Lm�a��q�m�"ۜDbhK����Z���-[2��O"�%Q�E���o�辟����%
-:䚉��q�~1]�<[&x�U�t����5J�ȡ��d["�jF���[c%-�}̯�3�N;F�S��Ne�kN���&���n�[�`2~�x�1�>�����0-���8V���~l��G���#��Hȕ�.W�f��~a{�}h=|�x63�^|�`@.��{��Y�;�#��x��鴠L����6��DӢp=T�N\ڸ(z�Hi��B�!O`lˋh��v�8\�2r��{E cjO�����SV��)�\.R�
O��om�(&@-?v|����hq�z^r�w<F�t�҈���F`<-���WҨQږ�_�p�v����4����`y��T�Ү2�0q�#��G�x��8�z�� T��Nk,)F�
�f���P����5�
a��zaI�R�"z�!�fG��(�1�az1%����Qoà	�8R�Ph���k�z�SZ�D�=g�
-���1
B�M.}r�ÔƁC�������Pjy_ݩ �t�2A�9U7��9U�U����0��+�N�Htz�JS9| C����
- ?�b1��n}e?.��]�i��dF+Ш��|�8N��.��֖LC�4��
����Y
-��ћ�9�h�����5R�[;�4`-=k�R���+��e<���ӳ�K}�:��,����j�c�n$��<�{�|^y�ϐ�~�K�nr"�qQ�&ߍ�����i"���y�D8�hE!z=
�#�4
���y�Ҡ�A��Nݘ�q<���m<�0����Zcʋ8��Hĭ�^m��OB��DJ(%:$fTу�ߦ[�^�sM��	��U6�qg��ls*\"Z�2�0-�NǦB.nE�3{o��4ƍR�_�"�X�+�1���k5Q�*��(�]蓢r+�b�t~+��V$=C>����y�7��x�r(�f��1�'���:S+p8�����rE+�b�t�,��V$=C��S��1n�(�����SS��Sg�`���G�p�m�����C�R#Sb�t�-��V$;C��e�>�p㞛����+O�և�)����(b��F���܊�ô4������P
-�E3�-�n\��;1�s��|_�2�F�V�̚��o�rr+
��|�/�V]t�3�tFo�jt�-&J�d����i�|j�I�����ƶ:c�h4L��S�����G�3�z�CLcܸ�hzj)��xz�s>B�F���|�N�0R1��܊Ĵ:�;�X�$=w<�Jy�Ǹq���%�r�]�
-z�#�紒n�O�M�w}�CT�jH�b�w!��V$=C����8�q�~'>,�r����8gh �VX֭�|+j��RTnEbZ�@�\܊�g_�͚�4��{�x���޹�Iz�s�Bh�iM��5�ϪjI�
�)1t�CRq+��!;�aq��e�4�͸�"�������ft#�E����H�r+
�bhN�a��
I��
-�h~��6��Fi�!�o:�1�y3�oZ
h�e�!�tN�hE�aZ��r�\�j�>r�4C={á�A�j�@*z�s�B�<�׭�n��7�r����V4���);H�ŭHz�BRiT��7�3�QQf('�K(z�sBh�iMT�Mo5�*ZTnEbZ�Ҕ�\܊�g(ƞKD�1nܳ����PN����&�ό��ޓ����
"�
�V4 �E�9_J�ŭHz��W�z'�Ǹq��)s
!�����Ԫ
-�q+���g��;UZTnEbZ�3��\�U����{z��7��QT�+�TKI��ㅐ�O��8#�2X���Fc4L��S�����G�3T�~~�4�����TAIM�S�B6��-�
-��!�u�hDZ`R�r�X*�ސ�����m�ix7���6HzA)��͹n�˔N�§j���EW_oъ�ô:��	��I�x
-�i��7�^-�PC���Þ��BLk��nz�9�tB�hEbZ�r��\܊�g�=�9Nc\��@���T;I�q��C���[���4M#�ʭh@L��Sr���[��٢�0_�1��Ā�Az���������aZՀ�wA��V4 ���)�Q�ŭHz�\�#��q����BGSk9UC)3��"�iV�vXѭ� ����w;�F0�z�*(1$�-�񧐊[����N#�x�"[�>���I�!y����I�
o�e	��ȹ�CQj��eE�J�lɌB$nC�3�]�m���m���FS���h 5�
R'�ٵZ����n��%��b:�F���C�zڏ��X�j��x
-^3����Xm�����Ԩ7Ht�G?�����OБ�\|B��=BL�$ˠ��/)7"�J��
-��!�<<2��ZJ�B�Nj�:�����-�a��Vh�L����S�=�I�2q
F#^R*jD�3�=ݚ�ܦ��<�҃n�h�FRbH�=`BZ/��_&���� ;I�F���%�C'�
-��	/���b8
q獖~A�-ך�b	H%�zWٵG�U+N�
;��V�ڜ�%������
bq#^�]�p���1���Ğ|w�  �	��x�Ʒ�U+4E&����ShF+�G�*�%��#�X�C.٪K/�v_Y��#�y�樤#5V�f8H<gP��Au�$�N��6��o�t*hIG�4[�-����?y�|�p6^�i�q��m����wH�A��!��w�%T�?�<Em���iJ��8�?�>����r�s����OK����An3$��
��`�]��hk͍��&�dN/l�Vя�h	h���F$�h5��k�>$G=ĝLj����5GOY��P�TZ���aq���Ԫ�����>�ӍV���%��J�ը��咭����~��Ǹ�HR�20�Է��C*A����	L�
-
�S��.?��������:�P�xʎ%�D�!��B����<Ɲ���%n�t�S�^@�C*US���Yt#Ӌ<�~���2�r�2v�$Z�w	�v��Y,�j/���$�q�γR�e��m���U+w1 �3�'���s95������Ԇȹ��..�-

���j�B�X�U^B)�J��q�n�����oa�J�(�K&�bBj�P9���3$d��HY��wY�	I��o�gԒP܊DP�F��F�������V���
�
�D1~[Mӭ-ժ����m��H>�pO*uZY�q�&�D�!���P�F�����Xs
t��q0��<jO�c��Z�8
��p"�����6)
-*�|�<M��[4Ye���I��Ϻ�R�0{���M�
�D�m���Z5�CA��,�G|�fP���X�3�~��K%[u�%d��Z�Q�p]5�T3#b5;��ZD���̤7��bhpͭ�塠�yN��V��Ջ����_�r�VCz
�j$)�z���
���v<����^�NA/<���ܤ�i
-��G�7F�Xh4����U����QJ��K�UIq�\�L��]�'�_�CsH@/u�&
�[[�U3��ڏ�w2�&��u7hI�sty��Hr�V]z	�j")�z��ʱxc�R2��B!J�%.�`=��E�FŶ�M��j
-����)JwZbhafJ��KȗF^p���u�>G0�u���x�ն�4���wa��o�
-樚�����������}~�'�+�o��	�C�Q�{3�*�����Ϗo���?������?jG|�‚��� ��
�vsBA�d�6���������<������
t|`�`��P|�l��7��o�
�`�`f���/|�3�2��q~��ӟ��|�����t1��^�☴����^2�P�{�������p
���3�v��ؐb����i-
�B�B�^�Q���C���-�j��=xo"���}�m������x�㏿�������K�
�%¾D|9�8�����/�Q7I�k�m��W��QrT.:��=��_
-��n�fo��������߿���~��Q�+��~�ۀ%S�z�u@�ić@�P����Șf�w�ŀ��v!�!d�z���#��P|���k���@�G4|�,Y��2w��
�<�=�l�_�����=O��L�uh �Z��dF_�h�6�bM�{�՞�5��*MK�����We_p!e4�yMv@.@��/V)����H�����bC�
-d�0xҤ^��g��s��J��clGR�q�*�֣񵀞X���_X��G�#�����1��V�k���%�õ���x
��?����n�_���V*f�:�T;��X�
AR�װV1I�V�g�v�V�ck�"^�
kS=k��"�ĩ�lc�	���/���Be�����/~&�
-���V���[�X��E5�:�3�2�[ɞ��5�]����ކ\�܄���
b��I���(#7���n�JnՖ� i��k�����L�%([�P�PJox1l���M�����5�NbQ+���.2�y���?�Ji����z%�����_��Y��@Huv�T|�?��qFb�\�1>���/���;��&~����;Z����2���lDž�O��P�\{endstream
+x��K�%�q6��_�.%}��\x��x|R^H��X���,`��0Hƍ'�-2��Je���z���a��`�ގ�y;�������w������>X����)<L��-�a��mL�ÿ��Ƿ}�?��?/���K��}s��G�����L���͇���yD����J�?��������b���|���3s�B�zk����l��þ	���9�=?��b�	2z=_�<?�����[�Ǹ�a���Uy���xdA��s	��	a�˔R��+B$B.b�.R����0
+��H�E�Jɗ��J$D."]��C~�,EB�"!!�5J֚�HR$B.b��R
+u��F���EBB����r��Ɋ�CF�s����������a�`:��s���B���\����}_L�_zܕ��N��&��G ><��D�&@�����Ze���4��m���~���j��7��G0�퇟���K�
ߪ�r�K�;��(�퇟?��������>�2,���a!ze��&�)F=�GX�;���0�7V��ǣԩ!����q�gs��?���#����[~ܤ��&��aF�(%�a��A�c��
�}#�� Kxd���[�c�m�]���0�-�#��rc�7�����mr{��ԅG��a�w<�/]��ܷK�{�8�9u��4IxU(���|A(s�$��\�/���l��s�Ān���ts��W!k�Q)��ï�[7Dا8R�(g�@6]
+$C3H��7�q����'T�g��&?ꐤ��)b�)B7�'�k���<���@W���:�)�a�I27�����"�P�W\]�(�
hS."ĺS�n*O����yF�cyL�kȮ\��О sWyD\q�,�	�}�[��47�M���N��<A^3�.��
+L����kȮ\��О sWyD\q�,�	�}�E�O�47���'b�)B7�'�k���<�sA��
+�<&JBw�eb�w8\���
�a"t�k�m1Ta��s�k(Gx=���
"ijI�9�y��gt�g�?�I*���"jB�(�k���<���@"$PHhS2"�
+T�n*P����yFg_���eL�"mJF�X���M
+��u1���+��Q�ЦdD���T� �^�����Z
ٕk��d�*��+n�E<���8���3o@��m$ĺS�n*O����yF�=�;�+
+���*��k���<�sA�t��
+���A
+ԩ��eT�(px���D�7
��%,z�7o��w&�N�t���__�����4��<h9�N+T�pC���g\��ڰ�}*�FG�<a�w���=��X}
��k�򨦀mg��×�$�'��	T���(�������]���;gK��'֧�ű��j�Ƣ�?5�PEK���Öit�~@zt�L&9����\L)��-�i�ݑ��XB��Զ���{1ҧ��W���7�~*��Z����4w�>���p�c0u}1N�O��a4w\�b�ߎ�Xd���!�Kq|��1V�:�c�~�q�c4�Fq|��1��H�ɦG�4���V�YB/�9��3�X�#{�1���Z�q�ʱ�:uN(�9�:'�\?:�Ǘ��K]lsP�w�M�娿�W_�-3,�N	��&<��8�.��K�U��K���xI��pEC��2?�ɇ
�EJ��X�����2G[���*������7ux8=��:��UF�k�4h��b����]��5Ǻ�N*t��Þ;.s�vNɰ�q֠?�/�G=�[��ɑ�0�tR����Ճ�;.s�)��M���P��G=w\���b������uu�z�s�e���GJ�cr3��������#��y�Ѥj>�չ�2G�o��mrJ�Zm�Lve����2G6&���(ٔ��}b�n
�b���44u\�ȶ���i�w�ҬP��~�^W��=#4�[�G�0�M���(�g��T�!�=��₆����ж�m!��)���u�N�#����2G�㫑m�RmuA�umY���[U��q�#�	G)��EA��etw_��x�iH�C~ߊ��k	9h�g�����!�����j:{��q�ov'5!B����r�ҋR��:ps��/�V�&w��^;��*���z��}���x=a��
+f�E4�U���%�?ʞfj���G;$���K�.*�Z�G��D��%��|2ǹ�?ʞ&qdi��I_:.���i"G�"-v>��K�e��i"G�"-v>���q�eO�8�?J��$�/��Q�4���G�;����{Ȯ&rdI��I_�-3dO
+�8������(��̑R�E�'1|��I�!%��}2ǹ�:Gr5�#;�đ�O�q��I�!e��}2ǹ�CJ�&s$��8�����"��đ=R��'3���3$_��G������)��̑<R�H�'s�;�{��kG�H�#���q�Α|M��)q$�Qp�:�{��kG�H�#Zm�q��	�a��H;$��p�f޾�[wH�լ�s��!�29K�V�K�u��kV��j��C��>\�>*6Z�H�׬HO:c��C���I;��j�#e_��6H��ud�MN�h��}�\��G: e�Â[��J�V=Rt6��N�%�r'�4�o��?�'�#�"��!����#�K�Oz=$�������q�]R*:f���.�`�������~�/?f����I��B�>&�0Ң��J&�O9���C���Oy��B����@�oqT�Oz��\�fa���
z�3�m�z
+��u�xQ�E�Z%D)D����E�b�9R�hS0@��BT���� �8r�hS�IbRB�f��!��O�]!���"Y���1G�xm
+��}*I	Q���BD��	�)D��
���V:5 ��#w<�6�(�=%D�v@<�'�q�'Ю"�N
+a���К`�9R�hS��^'��m�e�
U�x�
+
��W?G��m7�Y��#u<������Jk��@!��	�+���Èq��{�N�s��'Ю��Y	�Oz�`��9�N���b�Y�G�;=	bv����<z7�z>$8b�hW�P-�������#Ȃ:�@�B�j�M�!�a��1G�x�
+�
+��W�� �9R�h[��Y`6M���I������rQ�;��<&n���S�n#��P��S�Zp�;.�F2G�t�8�v����SB�Y�O���n�q�}� 1���[/�����]�����Ž���8"n��;�C�<
+#
�)!�$��Ž��
7�p����@;&��:�p���	�W��Um�ppJ0��8dE�Ɉ�T���`���-G,bO:�^����=�o�������B8�}b���@�K-������6G��	D��H
+gCQ�ӕ`G�T�58hѱ����2Zq�!�q��J�g=���耋3nd�P�
b0]ym�޷,m(f��[��
+�2�������_����g˼VI�:��V��i�U|�<r��J�xUq2Z�n�*Ns�M/y6�؎�+���!k
۱'J
۾}
�O�0@8����`+BQBt�>���O����
R�\޾�#s��~ϓb���7���!8�(i�r�H�@�89C���(E�T?��v%��C"���!Q�J�X'}ܾ�&�)�D"�G��ଔ(��D2�bH$��7$J�.IKTJw%�(_ؐ(;p���(GڮD2YcH$.lHT����������_�s�������R�ub=��ܖ�(�?��@9�C�nG��e�*��	!C"���#P�U�@"��^"e�
+��$*a$�Hu�|l/�2�%�;��%Q-��U�l�H2�D�;"9WF�
�T
�c{I�)(_���3R�p�6Yޟڜ����-��f��ۡZ�i&����l��B���&��VYIÐݻ�׳хE�L���]�,w����H[BKz�.�t���M�Ǣ�1u/a��%�\6�%�w٣��������#`^�o~CK��c����m���d�ӣ�����x�Hg�����#E�V)����g���(#��qj�1�R�7J
+8�
+�r���)�a��uk
�<VO�����c\� �h;�*�[���Or&7o�7b?����=�)
캶���O�f�~�@B���I�H��N=�=|�\�}
%wz�f�K"v!S�z�Q�\�qw߽��B_@ћߺ���6* rX �[���V��b-�`��h�!
+B@h���#?#�e��7mi��@p%�p�%��@L�M!u+�˥N}��{��I�B�|a���OR�(L�J$mzs`�9T��o \��E���������a�8��$Bp�%BpG���v*���
�}��f
+����'����|Z}0Ɋ>tW��T�J��=��:u,z"�J��P釆\���� \�ծA�����
+6�q �^��������׃���K���R�y���n��F#���B���K������($"~������*�zp
q���8|�/����?̍��kf�~�8�����Ş,��D^!�7��k�2�Z&�\ζ��^�Ølg���+���k< ժN�⭆ �H�,�� ���RQ#�� �C����/�խ/�8�*z�s\�:��� =�{�A�VőD+�bh��OP��r�_����h��PMS1(ռ�!Y���I�����VM��V
���Z�į�XԈdg��J3���%����2/�b^���U*�U����!��Vj�
+�#h�FbQ#����R�����	���I��*ͼ��+T?��*�1J1�@,])F���0)B^��B(���� 7L+f�z^)�Z3`��
+@8�9�F9�E�8���%X���)F�C!5b�	���q�����/�֝?)�d�J3/�a��E�'��`�J3���I12n���N��t:���
�g�����m�@=�4�r}���f�l{"NH*Z�x�#������
�4�2���ຮ���9K5&���4�e
+c�[���А�ƨlenE.Ӣ1������i��C��V�9EډO�&��� 	3����x
���G�b�-��C'������1��2�ix	�/�^��O?O5�n�8��'ш�ä4~	����P�~���4����J3����l����9�ܪ:�9L����hE�aZ�N�X����h
�f�7R�,ND�Ix~��N����ܪ�G�TZp��j��!Z��X܈��>3}�q#ި��`�UC��
[^<&�s�X�x C8D�[р�C����ҧ���!nd�;\2��h3
+:���n��f�s�*�(rH�����V0
4)B��hO_c��
�͈8@̦�m\��W;ŝ�J}�CT7��ӏ��U��Ģ��Y��F)��a�A���X܊�)4��!n�dH�`8Ȕ(F\0\O���f�C
+	���d���#�F��)@ҤD�J�h	��	�P� !2�F�Qj��za �֮\�����$]4�~���V�Jx2D�"�3�ը�%H1B����g���N�xBMܦ�m��8 FJ+V;�~�k96Kkk�Q�
n^2έ9��mpae:�б���D�HnF^6�yp�P�����Q�!e�fͨ� �{K�g*
8Q��2\s��c��skS��Q� �1�sˎ�TE�Z�����Ʒq/�úյ���1�C*H�Dž��S֍��C2�H�	��VuG��
ĭ~_}��LԈ�n��3�it7uZ��a���C��H3�_��~�*[U!��":��	�h���)
Q��gB,nE�3dq�'��7�Aȣ�0NzM)���!U|��9iC���l�n�p�|�C��3-

�P��ߑ"�������[?2|��Ŧc\;�yK����!yt�,�(L8��V���	�C�#/j��Aw7)	�Y8���@�D+^Bc��!nܷ��D
�:�/�B%�v�1 u�W�FׯE�q#J�
+�;,��x�ǭ�1NR�C��`�=�X܈���0�i���\�o��T�j�NMbHfb�M[���˒��������le�]T4-
Q�fް\�J/�q�*8Ncܸ��=@�GsOv	}E�:֍�W@��~��l�[��u�Et,8F>�V�7v-��c�����ŭHz�ѴEf8q�����Λ��ǞtƎ; u�
��~�/�}�
+�zũ�0��\�[�=�r��K/_�rq+��0N�C=�e��߂�Gj�@vl�R��u!y� E��#���#��U�Sb�RB��~Y$jDrb�e\�lܺV
+\��(�;ҏ�����t���)�>�l�N�9�.U���3!MK@�c�ߞR,j��h$`0�y�˺	т����Ii%�B�9����No?����٪n��ꒀ�o����V����i1D�H,�"�4RQ�i��ʉ��&��m?@�'S"��_��>\�Y��
+�ECuu�*i��<�#&�1�fI_0X,nE‹�#'Gp����pSSK�k�e
1=�!�d͸
+���c�ܪ���Ա�D���ƒN������P*n4$g��{ނ���N}��܊�o��$��'Z���S���?_zk�@x5?`_������~����kk�;o��.�
���o���}�u59��=����P�w�w�D�:
����z�A7[��P���[V��?��F��:Dy���s���7m�@X��������_���)[�$#	��R�˛|U��i��N��)����zBڱ!������G�4�A�����(�K��K����]]{��]��5)�j��:���o����x����_����5}�-����j
+�}��?�<1UܶD�U�?Ģ���}������ml�{��
��_|U'���\
+/�����?��_��/��O�+xW���V��볽9X�������54!OF��=r@�YI�=I�<�#X�pƀ��)G��Rt@���$�����y��\�<G�����4^W��2�����Pm+��o��}&u6���g�������͐(�=B�}{�U�;�1�oo@�Cke����W����T}#�!Ջ�����qz5Y�����_4�-|{ԑ,Z�:��<��^~}__j[��r�냗�[�RW��"8��=%�0��u<���W� � �Qxژ�~$��i��-;9���d]��p��f���¥B��>;t�ABTC}�����?1A}�!m� ��•�䡥]�j��z	I
��;���pg�����	�PX=�:�k��$ϊ��͖Т׺
�|���K$>΁���T'��zA��j��
{�!e�E���aȁ!a��V+��[̇U�Lui�G. H�Krآ��hR�;o{�J!�h$$G��3Jf�2:UԴS.��p�['nKӲP���o��
���l����������*z�hq3%��'G���,�U�&q������/��*y��漢�
+bG�1�I��D\9Ny�v������"��HHT��H)��w�"!r���"�G�J$D."]�T�����H$B.R5</Q��(N���EBB�����4*��HH�t�R�+�Q���EBB�k��5-��"r��(uz�Ҵ*�|�to"]���z�n7��E��qPϦ�"BmJt��T��EŘҀve�K�d������>�F̗���һ�5z>�w���-nKtj�A::AW�C LX[�T���CK��
#qo���r��	D;�������9�w
ϻ��p4�Q��1~ܒ�㻖��1�J3N���)߱�����u|{�ힻU�������9�w��ۃL��+R���-?n�o�]��0[�`�07�q�`s��z�i{	.5ȍ��Oco��{��	�3��������5�w��ۃ�/<k� n��g�Oq���mK3�KB���
�Ó�W��O2σ�"W,�ڒ�sŞ�="��{]?�3g�a��`���Tˆ�v!���u��uQr�g$gҀv�A�x.)J7'� ?q�!�)��	�R6�]R"B��7Q"%jJ��(�OozJi_��(J�ڕ�(���J�'�7=�����f��ڕ�(���J�'�7=�tA����Pb��eCJB���]%2���
AO)]Pb9zv�Pb��eCJB���]%2���
AO)�+�Y�bX��2:�AI���fw]�3:������^��%CJB��]2���
AO)]P"O%�>� %JJw���Ndn(�<�� ��9&Jw��d!�j��Xi�:�w��<�]u%�S���9%�OozJiNEo�N�T�ve#J�DE����
AO)�+�}M�ހve#J�DE����
AO)]Pb���<�mِ�P��tW�L~�xC�SJ�J��e���
��F�X���M%
+����R��Dx��j%vh[6�$�()�U"��8����%���	%vh[6�$�()�U"��8���Ҿ�{�4+q@۹8H���(�T� ?q�!�)�J�4$���	M�DI��X��
%��q_6�=4���GpGZt>|�o��w>�Q�d7#�{BH�hRiJ�&�$?q�!�)��I�
���+Qb%*J7�(�OozJi_��vQ&B��%V��tS����񆠧����ڦ�y@��%V��tS����񆠧�.(1��ZAh[6�$�()�U"��8���Ҿ���_�J�v�	Rb%*J7�(�OozJ��`�Vb��eCJB���]%2���
AO)]Pb�P�O)�C۲!%�DI����񆠧�.(���I��o.��ͅ{J��W,.�F��g�m8�;�G	U���||��ߛ&����Lx{g(���'xK��ro�s�~�x�4�)̮�]
+P��?RM������,������.k��C�{Y���e�<a��g�5�*��e�g����Ǜ9<:9�8������{@��y��x�ʧ�[��{�x�ABՄ1��C\���x���[I*���ŗ��>��-�_�u'\���xG�����χ���Ad؊r����ja%|�� �o�_i��%Cc>Gԓ�w��:.s����_�1&|��[�^������ǻZ��Z�i�C�YAs�uv|���%�g4yxM�y��^.�@GeB��l+�,���:Cx�FOSx�c� T�7z�s�e�p9)�Y��'
�Y9�(bh��1���1vҠ�c֣��-3�ՈaȳC����q�c5{��7P�s� �y�d��-3��ˌ�7�s��p�9��9�#�7z�#�$�4�a=��:Ǻd=o��j=��=>�F��o���
�3���9»_���q�#�y��M&��׍KoRs�e�����rM�����q�c��d����4X����玫����	�c�����9a��~��J%24&N���K��q�c{b�h����P�~B�~�ṟ��M���� _�x�����:Lj/j2��g
Z|�E@S�e�Κ��q�ʨ���;Wң���3�[���j�tu�z�s�e��@�����
a� �Z42�[g��x{�B�I���ӣ�;.sdnj9F7k���֣�;.sd��v4���zP�h�xUV��o�!_�5��[�)��#�u�i<����q�#{��B:b�7��B<���1x&��9�S\wߔ��[ݏAJ��B�{�x
+����2Gv��1b*P���{%ޚ
+sݻ��r�:�sD�~�6Ss�����E�GC��Hѐ�̏#u37��}	�?���ڟ�T��
M�9R@"�w�~�����l�q�'iB�>�1
+���b~�@��S��c��^�PF�2��r>�w���pP^:�pX����N���%M��Z�az<?����_4B��;b���Q3VB���ƫ��A5oK��0䑵�*pUQ�X�I�������
�����6bf�\��Q4,���Y�d�^]kiv/�cXC�"h��(BF_��3�p1�3���8u\�Q8�9RЌ8R��9��9RD�8�����`7�Z�Q8��QЌ9b��9��9b8�řR�L0���cf
c�3c� c�s��EÈ#�̈#Ș��q�#�È#�̘!�é�z��a̐bfđd�q���aĐCf�d���2�`3��1��3�;�s�`q�q����8u\�Q4�9bȌb|����X#�2#�c�s�u�c�1c�u����ˆ!G̈!�ǘ��q�#����1G�	�S��Ø#F̐�Lj�K�u�#�1c����3��1C
+�C
+�1é�:?
+�C�C��	�S����˜#̘#Fǘ��q=~E�0�H
3bH�1f8�[gH�0fH
3��1�q���P1�x1��3����H1�x3���`8u\��Q$�9R��8�3���)���w2^��Sx�*V���q^����(6a��IOު6S
[�r�HX%j���uݞ~�{]�����2����~�������������q=z��07W���
H���2᫩�:�
+��Q��a�!
+�CS�����J�'BP
�
͑��8��9b,,V�-0��b�u㗎��Qw��%�1�#�r�
+�@mS۠���� ��o�����Οm�����ˉ�s�i��
+Û�:Hg�
���q�Ep�U�*����T�k�[1:>e!(��ݻjq�Y+i^m\�/Q��@Gi��
k�S�*�LS2�.��]}���"�w��́,̑�<<���u���L�~�u[��UüD)�?<��CĐ;�@�BT[~3!�9ȝG!��	�+��0K��\|!�HO�m!J�ДBXC^?
+A���O�]!,|�Z�D��
!f��^�]	`%�zV:K�
� fHO�m!Bu���t��$B�#v<�v����Y�=EP��#u<���Htr@B
+*�	�������d�Ԍ��1C���lK��t
E�P�C�x�
+8���$B̑:�@�B:�@!��
+A���O�]!R��	"Q̂�@�9R�hW�|�i
+��1P��#u<����t�ABd
+m�	����<��'f��@!b����"i�	�B!!�1�F��� �6�
+�"����"k�N)R�B$8���z����ڀ(R�����" G�xmQ�
��#��B$8���z��s
ڂ(
�G�s��'ЮP?�	�Vm�1G�xm�
�B��v^��lg�PZ��ZmA
���0���	�-D�T���waHpL���Bk=���^�T�a
!
w�CO	%tϹ�	��üh1U��"�e�zJ(�n��'v\
�z��r��@�t�#O���
+��va��X0e@�>��Yz�s��O��Ž����ґ0�3����!��?�x��'u\�ߚa/��4���w��S 6��j��N �A���J硶�m:��Put�aw<���j��vc�A,�����#1���=u���@�o9��M%���h�ڎ�7�e O�Dx��ǝ��	��V�ή�I�=�=�|�!"O���Sv;�F�o+ͷ(��r��V��O�8v롹�ݚqK�c����,p\�D��4S�%d�N!�j䶧����ʐԵ亃8MG�֛�������C����#�L���0W���g��$
+�G���u����~�8�2���_{?��s~��/S��4�2
lg��DX��/S�q�'~?V:�e���fV/1��_� Q�2�q;��_�=Xo�O#�������� #�qp��~}���#��-�D����IR;D����89V�	R�	��#���}@^v�I����^��@`�*y���.n!SxI ���#�
s4j��aخ�"s|Q$��%�V�d��؅W�9E���;"�j��E�?�ߞ�2Q�D���["���v]�G���H"�E���;"90d�D��4��[��Dt?G"v���a�g"�<|{K�q��nn����2W�D���;"�j�=��';�ͷD��(�)���I"Ec��J�ӝI$*�#R�XK���T��(�ؒ�#��DJ�����D�4J�%v$J>�P����fr��j��숔;RD�Y�j���[�\�H\�`K��G)�Tʼ?�ER6�DuvD*�?��V|T��*!��F�����D�Y���r�)�g���&��†D�a���D����"ɼ�!����%Ru}������L'��.�d\��,R:���J�S�Q$.��%�)���j{Y$$r�Q".ư#��޷ӓ�֟r�▹�$kؑ�U������/��'��NG����)����������N���]��,bx�~1u=�d��h�!���cY&���@	A�GZ}&"���ӛ{d����_F�d�����T2c̏�,S��#
��fZ��֬�OI0�T��jQ���	�#2�NN^s�����1�-����	
+O��菞C=BS-�ގ-�Uk�8u/0T���X�I����J{��֎G(��d�V)A�R��=8�Z��d0^�F�Ｗ���J�������Fp�%�m��p�!�2�/��߮���nT����v�&C��5J#���h����_����cH#6�2�m�d(\�F����g��HQX^��E"��l;���:ƈ׮Q��q��Б�~��xlcZ	����Ƶ}��k����ME@����{D�0:]!cJ/�B
�%J�Ӻ�DPm���D�]�#a|���
+��Q�#��7�Ա��B���P�
�����b	E�(q�*"���L����s�6�V�
���2|��4�>�^��B�&ӷr(Ȇ:�<���'O�x��<��)Ln�S�[E�|�by*2T�y��t��~WC���~��~�%�6�+M+�{��:���=S�锍	�M�N�=�������������l$u:�z�h��8K��lO>p	��v�Xׂ��P{l�L�0��?����#��0¸!�&B?/����'����h<���<�s]k�~�����h"�Q�H�3�=�LEu�L8b�E(g����b&�L�y&8�g��Jz&�Z�b"��]�	u��i&�Q�O��y�9���x���\�����H��N�?@�d����
+# έ�G&w��V�R�*��)	Z��I�X܈�gRn�f8
q㮔'5��!�$5����Sf��Q88�m@�k�%�E+����t\�2q\@��)v��6�o�qb�z�i�N�����q>@�L+�����6<"$���X�čHr� a�i�L�۸R�ǹ)콞�����

+nSp�hG�Cum
Q��Zр�C������1����4č�n�Z/T���圻Ay��p+�G���l��r+��t�.�bE���㬛u3
q�^T+@!�+�|�� ?n�U5�ʤԺ�ڬuC�XDK@�y�����
�0��4č��V��L�Lk�|��.��[�M4O��HRnE�aZ�y,�!��ƚ���
n�W�X,�4S��iј3�>3��;p��C��-x,DF@Sn�����E7V\�7�n��{�5�[7/s@uuzv��𽂪	��D+�bhN�bq#�] e���Op�r\��㤙���bN�hP~L�G9g�L��I	d��Bq#���6#��q�4`�t�Lp~^+���w�	��k�JCuHtʇhEbZ�I'B,nD‹~h52�i��`�Z,Z��1-svJ�
+V�V����O��rOD+���Rq]@h8�f�
n��Mj���y���d��9��a�Ut���0
M�7BnDR3��bdn��6n
+�����a�bN�
���N�ꮛ�2�	S�hE�aZ�y@B,��.�Y3z��Z*څ�</s�P��CO�T7�4i4�)H�b- )�L�HB(nD�3�Xd~�7�T{�R��$?�s�@�%�'H�o�*�6N9I�
�i14gE	��	/�*{��:č�އZ*Zfԡ�7%O5���
+
+�M�vJ��x4DK@Sn��-Hl
E���|�����l��9��A
�Z�Vu�uS���
��		h�2q#��!kU��u|���C��p�6�s&@u�,�a8����Oib���h14'�	���.�����4���Y��4�/�l
���n"����1媉V8&%�)YNōHt��W9���
n�
�j�h	snZ*^���f��^����@{�ڂН���
�i��=!7"�TTv��u���Z4����%��Ay�xp���A4��!��Z�j�����A��ې�
+*���:��A��<*L��K�!@�֩���;��
P�7��0%��$F!��D����|�p��F�+6�i֡�Jwl�|�.^����r|�u#��D�!�L�F�_�+�h��$Q�iTMP��J	W���5 �e
y��K7���6���}�Yݫ��8�FI���@(�s�)
+���͐q��:��m��p�P���$P��#N��i��=\��-Ԫ|�� 8V�/�r��ǬL�!~E�uY.nE��E�8�q��r��Žw���YG�*
��x��'.��'�%2d��μ��fZ��2,�O!7"��h12�i��D���s[�Z�+�fe�i�~I=#"��_�h�Z���-u�\���?�ª�L�β
�&3KE�Ht��"q�ǷQ��<�$bH?t�Dx�#e�jp����6���gD+L,�D��xy���V(�@�b$~z|W���
*h���+�������_=<���/��(
�Z�{rLJ �p�FA��Z�����<:0v|��)�
-�=UjrK�(,�B�ҁ�=�j}�#�����"�'>�Q���V$���`$��7����;*A��z�Z�4A'�
+��
+tL�ݢ��c�dZB�u�ErH.j��s�mF�8�q�n��]K<hI�h�u�ʪS��d����v,�Սc�S����wۘC\"cYj��[���#���q�F=�c\)?�J� ��\\8��j#
,��
n��Xvda�Q�b��e\���0ˌj�\�J/�n?
+��7*
�~������4�
=E�[*X/
+�ݨn`m���'� ʚ�V��^��`5�:)�����a>
+��7��������g�;m@O��=1n-$ݪ��mᕐτr� �2�'�
+Z�Ï����V$����(8Ncܨ�4�ҳ��1ْ��6��̇�5{����jP[ze�2^4�DJjO�L����J?$�"��Â$�/c�(5^��$ΣW���\������E�;�h�N��_�ĔRje�C����#�5����Pz	
3Rp�Ƹ����A�2
i��0��rd����{�hR���J��;r"��Z���&�23�_�"a#����mHf6�mY)k��Z�J�?1l�
�,�؟	�PR����6ՓiK����jes�����K-����dt���߰ �i�˚���dd��~���j�l�jp�ҡҲd���e��x��Ӭ�UmN�r�]{�E�ŭHz
uRr�Ƹ��Ъ�}�r8z}<��6�5p)�u/��Ѩn��r��V��0�l΍����%
!�j>w��L܈g(v�Q2��[V��wpͲ_���.1�r��/�{:=\5*�U��펖��l�J��Ff�k,H1��6\/�(��V$����(N#\W
�n���o A=B���"�jU�Բd�����b:�c;|��Z�u�CӒ^[HXh���Pz
�n<J�����F�wfL�r��i[�.�8xķ"��Q����5�����{���P� E����1@��
	ν��(�M�[WK��6�݋pI��%���������V�FDJd��LxE�j竊#�^"�TԨ��mW'50U�Ӥ�fs����L��xԙ,����}���ϵ�9���������~�ߪyy�����Ӈ����j���1����4p�R'�?�����_��cU�Q����n��.�#7�S9�RUv��Vm�����
u�8�V���	��y�A7(�3j�)�����jL���W��L��|��,���Ʒ�����P���������͟Q���ݢX���T�i���h�@���J��n:6�@�?��|�f��s"���^�Q�ɡ}~�����kd��j���\w[X~������y���W������?����~Ep|�v]&8���<�:���Uc �&�]
��W�r�eA�?z~�������ެ����������?��:�t����ZM�h�R;$o�ֽ��Y%Ϡ"��#���#�d�=���cb/BV�z� ��i�ܚ3�m�ꜷ���?MICSǯg�D��4�D���wh��0�)3���zxϼ����l��ӆ�|��z��ȯp �+��!�r�+�����4�H~r&؞����o�+���5�4���־£���3��*�_Y�*��~_���)�v��;���u�!��lQ@�E���uGh���;�=�2���l�w<���W�4!�q�;樟˷�i���b!��?ͺ	�h_����iZ8=�I+�C'�f�-�����d�arG������z��]�y-�3������D����c����D�zFu�kׄ��y��7�B�n���
�|�p�֊x�WiFZ!�:����h�4��:�7z�!a�Z��֑���Q��|	՟.��E+���IB��ٖB(jD�s��"�MÓ{z����a�9�Y�mv�����:�8�J۟>@]�P�w�k���p���fc,D�Ok�@�Ҟ�U�P�Q2 �	�p4k���|��EѺH�m:���Z��}Lm*}.�*�L�.S*p���L]��2]�d�`+J��F��H�N:��t���%y�����H�e�Ji��~>��v��.�9��^?�{ۣCA�Zj/j"!D��K�2�P}�#CdO��tN�_v��V��|1
���-����}/��HEH��,[�
ł�j�u��n�)����#��l�;���@����@�2�%�S�|���&�� �1n�@�[� ����ͱ9��l����Gg�������7�w͘�ôp
%x9̴>ȏ�{C���v�ՙ,F-:i�w<[_�g.�c;��7�t��v�Y�˂���/þ"�9ƽqE���d���zqf�spV�?�w��=J	���;�-e�;�?�Z��Q�	�=m0!�M�н�$�k���<��=����R��IƄH���=J��u1���+B�-�8�MɈ+P��@A^3�.��mB��7J��IƄH���=J��u1���+0��xR��6%#B�@E�y��gt�X�
�Zڌ�!R�&tO���fx]�3:�
+l�7�R��6%#B�@E�y��gt���#��X�ڔ����
+�5��b���W �9Y����@E��P\���Wq_��UL��{
++qѫ��"�wv߫0p�U��mF���&M��l��5��b��ٞMnf��q �r!֞$sSyL\q�,�	�}��Шgހ6�"B�;E��y��gt.(�Fh���|۞\��О sWyD\q�,�	�}����A)�#�R!V�$sSqL\q�,�	���q䮳�:�+����*��k���<�sA����T
+,�Z�dHH(P��@&�^�ξ�M�d�h~�a�I27�����"�P��8LF����@����*��$_�Q���6����
�!A�ճ�����ڐ�	�ol���T�dn�$&��]���,��*��47�M���N��<A^3�.��
+�id��;�+
+���*��k���<��������vdS.$�ړdn*��+n�E<�rAqP�[+.��}��	2wG���"�P�V���k����� B�;M��$y��gt.(�2X���J���%��
+d��u1��\P`W����'
+���*��k���<���@��$�NAFN9ȷ��3��(px���D��`]u���d:�����l�v}o\����j��m�K�<�Kaϗkb��s��.�Bmw��U���S�7.��]��n�mO�UN�v���UȭH��^�d���&C�H�]g %$	��)�*d��~��P�EЫ��N����l�U��`��Z6�i��9�2(�h��kw�і�[	<Z(��
+u��
��:Y��x��
+:Oȓ���Gi�AG/FV.~b�J�xs��P�x#��1qu�z��_i�ڄr��1�Q��g��SB�t\��څM�1V�)dI>œvIAs�U�	^�
+J��ۺ;�
���+��t\�؊�5F�9[�P�%�+E�t\�(�K��I�O�y��~��*ڃ6̰~�����QY�����2G�}����M��#kh�̐�.fh}/�+�CM�9��9���ȱ?�`�dTBv��q�l
�^˼�����(�:��8�>t�g%��-�5.��qc]�[��
+���p��҂�t�e~�cxa����䍖滋h�n�32�[f��F�L��P�iw�c۵�����q�#ow�c)}�ʭ�q��M��U���Ⳅ���y7���:@��1p4���L�R�NCS�U��YCC��~���=���Ѳ5��g�s&�:��A߀�H�N–J�fh�-���,�uVk�ж<����ӳh[*�����g������"�|��~�p����$�������P
+�2+�@�Nْ	�3�8ˆ-�B�>v"�%I6�Qڋ�Ғ�4Mlqʸ�V��碍Hْ$Zl6Ǘ��y��Hْ$Zl6Ǘ�˖$وđ-I��f#q|�lI��Hْ$Zl6Ǘ�˖$�đ,I"%n�"×~�$ڈĐ-I��f#q|�nI���ђd���ùߺ%�6"t��&Y�R�[�ط͹�%�f"<��2&ī'<	�qIMV�I����=��䀤�oL�?^��[�d(B=Ǩ��ɵ?�^��ߺ9�
ź��n$Y���%�����oݚD;�;��&�MG�#�/׭I�AkF[�R�"������V�I���Yš�2;���~�nM;1�;{1Ik!����Э����lk��'�^+o��L=1�K�'e��싚5�v<�m����7<i��t�����@��eb��ǐ���z�R�-�)�z3��%��84�z��������\��T�OZmq�V]����T��>R[�f��%c_U{�!fi�"#<�����eS���ɶ}���O�,G��S@��Y�5��	DW�תiX�X�1��h1D��	�)lp�#��.��P-��#w<�6�����
+
oT�%-��#w<�6��%)C�K)�CĐ��"�˃���Տ�P�"������������BB�!~�����Yq�GG��"�1��c�j���:�@�q�~6�!����\ʰ+Bl�R��:���`b���	5�\_�z
+耝�-���������u�
��$���˰
Ju�
�~�v[5�
�c��ݷ ���u�'v\6�c?�'��n��M�'C������;�@�q�F�@�G=�1�F7=�x@O
�\F�:�@�q�lO`!$�&7?����=�=��k�;vY6���c�ӎhp/���SB!�;�{E�۲A��v٫��\���SBG�5�{E�ۢ�SW�Lp�<	)�����@�oQx"^��zʹ�vYv6!OF�i��;���~ߔ�#ah���r��;?
E�����|�G��8h��2�����0��p�8q����K?�
��_ߟ�eK?CIie�]��0�����o|��|��<��<�MG�dS�2s߿x\�H�������ů�
~�����,f�M�������Y�=���~���"�,n8�����5�.�)����ߥڌݧ�ߥW�V�K�=�ϒ�.�zr��o��Ԫ�~�@ ���J�#���O}�J�;�cÓ�.o��ɣ�թl�b�������d)S�gLMڕIV�D�ˎL"�J�X�Dg�3=�i�I��숔�w���R����=y�1d�3;2eXrPkG5#a�ؔI���Dn͎L���+���66��k/Gd������wX<2)Sx�lG&���ͫ�^O��`}R�=u�[��g��FK�ku;T���;��D�rr�p��Fv�f��]�c��~��Ӕ(�g �UgɊ���"��;���̸���6��F�('%���׍p�+�;����}���K"�<�Ʉ*Pq�U7��?�����^����&
<�Yt4�ltC�9�a�����T��H������ْ�Ri~gh�;/{9Kx)I �,�)�~$���#�S�l<�%5��-˅�'}$6՚{�(l���=Ab�ozb^_$Tg�o�h*65����z�ʋ2	%{�H,�R�쳙L��&���x]��&o���;!�N�Ϣ;z�d��͝Ͱ�	�y�;C�fd�G�B>��,�e[�*S
+�|_�DVn	�
+�_��L�w�� ��K��>��!�#��+  ��<)�v���Y
�����|��=!a�F� �*�7���#�pG;V��hFJO9uS@z�c,�Sv�9|a�;n�Q��_D�,�2�*a"�4޵�t׎�=��]�E;�q����`}�aO�����
�Iu�og����:�<��n����ZZ)�ıɵ8��|��zy��b��W��
+��4G�z4�@O�� ��=σ<L�CM3]6��6r�)^�1d���`$FL�0B(b��/.�A�A����~N#�A]A�4
���GbD��Ӡ_H�Y/L����4��
Ӭc�"l]ۋå�#a���ϊ��@�1*������������b�u�
���C��p
+@P=1�V��:���O��8�'*H1��bQ+� 8K����O�s]ْ�
�H��F�%�p�P��b�ZZY�GD+����K�H�E�Xz��lq�y��1��˖�5E*'p����`�.Ai"�8n�2�/NJʍp8�C/�+!�b�	��)F�_F���[0�߁(���zNq�~A�N�hT�j��l5T>���!�V�*R�p�t�@��XrD��LV��᭧aԭ��L��8�Mq\Z}՗�6�vL�-�S�\5zl����2�9nᙠi	�Cycc��I/����'r�Ǹ�!b�EM��ŋ��q]J�Zt��3�Qu�d�>�����m+%R��0�X*nE�(�����<������FJ�m�A:�ی�x0
��[���rm�P#0v�&% �zX0y��Px	�&�!n$Դ�:63�E7[� Aʐ�k~��WlE�:�h'����ԪY���@8��)�$�h��K���+��7�|츲z?�Z�ON����l�?��3��U�:��HT�p��F|�K�đ^3�aK�B�%��b8�p#��ፈ2�ݝ�|T�.�j���I���!0J�.
���&�C�����%�&$��2&�it�Pb��\��%Z
+C��!O�C5�U�;
A�e��Bψ[%�WΈC�0�q玥�F$��p=g��7Ҵ�����z�
���q]�ش	�G��1��P��H�[U=kR���t�2Q��{�J�̦�m�y�"Po�b���0<H��F�T��Vp��5)�
"/�[U��L�"���T����1N���4l�0.��4΂���C��������{X�
+.�%
U�m?5�p
��;FҤ!~�H�RQ#���j�Fz]h��Z����8�����G�o<�۸�[��t�Z���1�V)��قCj�yd�\܊��:.9Nc�����
+T���-���cH��B�ѻ
+�f"�V�Ο�{�"ŎD�f*R� ?��:%����ؾ�Kn��6��N����
+�S��:$a�������o���،BA�V���DK@z�{θuCrq+��!��r�q�F�d���m�}�X���
+B�Ÿ�!㍛�r�e��c~?�&��8ME@��X$�íHb���\G9��������Ha���!0����gO謣IQ��c.y����0*��f������#lW-��rq+������j�����bl���<�s����+�T\8
��B�DžE+��j'����P�Vh	9���"��Iϐ+��8�qY9`-ږ4];��?;̎��xUM��p��T�8k5b�i'Gչ�l3!� 7?,!�"��ji�`�G���{~����%@v,�R�1�=�B��Ӎ����Z�8\�F��%� ;ح:%�[��ٱ�3�i|ˊ
[��h80��ax�2�t�
���:�2�Or7D+�8`'��{�|�­�(�,h	9���N���V$���r.8Nc\VN�{�H��{J��Ċ&׀ĩ��SV�z�9����~Cz7q����τ4Ψ"~�,7"�4s37A���LE�x�#\���.�#$�����b!i�ݨ�h��K�|�ƭ�z�Q��2���SJōHv
����.�����ٜk[\+j��8B���H���DߊK(�%���Gn�#�͟(	h��s+��I4B�%�<"�P�N�9ެ#��7t�����oo���;�ie�?~�?TM��o�eS�as����c�����Q�w��|�>�������N�����.X�S�=ߠ�M�4��ڣ��-Tf}�ʬ�L
+u������7�;��lhq����?��z�]�%��zONz���Y�4���.��pZ%�8�G>����V?�>6�@�?��|�f��s"���^�Q�ɡ}~������O�X�!J7�B���o����x����_����5--)d,��������y�D[`��e��9h'Z�ܩ�A��τvw%����z~�E��
+,M~������������~Q�~���{ڄs�v���k�%�W߮���[�Ct���<	��f�H���J��YL� <
+G�.��S7���yM���R5	z���}�!P�fh��o��K��mI�4W�Z_^�s�:�f�~_�b��6�����>8��!�_^ʱד�N\���J��ͭ�-}w��,�`���"��Z�]jEhv������;�B#���:�_�j��z������W���W�#�!�;D���p�({��1r��ˏ�	�.����p	N�z
+�C�W�:�@��k}���
�H�@Ʒ�1F(�Ӯ9������D�{��o�c��uQ��~�u�y�^�?����2��12rC^x#kyMz��'yW-ِ�DpK�&�*Ŕ�gI��g,O#�����3X�/0�t��WS�i;���o������R��~�p�UZ�\��_��3>�鍽��M��]+���'Ԟk+P��2$�Su�K/gX}V0bE+��Eٱڮp����V1׽�(ZB�j�5���V,=C�����e��|��<E����A��8~��.I��ˏo����d˟>��^�PW ����ѯ|ON�$��+��5_�c�j�?��B�����>�6�>��+�(/�.S��9�7�r���gs�<呂����H�(���Y$D���u�щu�JG]�$D�F)B2sT��t����y���q�|�lQ2]�t���AwG�G�d2��'I	�M�nS:Y�~�����������ef�m���V�o��21���g/V%��Z�.���Ւ�d���M?���
�
^�q�2�rT�Ԫ
>6���Ͱ9��l��������f\�Ǎ��!�c��`�S���;�g�l�=���0��%xJ3-�=Cio��J�	5
sQ���-ߵN�����}���T�f^��&R\K���6o�%?�oþ��,�?�~��3����nlR>��4 �͌����wvRE�^��iR!���D�JS�7�$���
AO)mO*��P� ��ЦlL���)�S�$?q�!�)�m%�B��h���ЦlL���)�S�$?q�!�)�m%����
4R"B��5Q"%jJ��(�OozJ�sK�WJ�#�S6�$�()�U"��8���Ҿ�_;�`%hW6��JT�n*Q��8����%�}�D�&�)RJ���*��OozJi_�����aG�Í�kPҹ�@&��]���a�Uh�v���')�U�+�P"9�A��tL�n8pM�l�f��0pk2�)5�]m%�R���)%�OozJiJA�P҆ހve#J�DE����
AO)�+1��c��+Qb%*J7�(�OozJi_��tVJЮlD���(�T� ?q�!�)�}%|���X�=و+QQ��DA~�xC�SJ����kky@۲!%�DI����񆠧������H�\�i/�N�H���=%J����R���t@�F��mˆ��%��Jd����R�W�8�F%�O�@%NI����G.�F��g�m����3���9Ǿ��w�D�2mGnl{}�=�R�b�<��Yӟ����3?�q��x�Ъ���s���9�Rh��m�8O���B�J���p���o`���Tg���Z
Wb/�
+܄��7/?��?�Q\���*�r|�o�r|����3���_W�N���"PrЋG�����xD
(B�C�$�#Q��M�qע���]�:��
+h�Z0�C)�^U9z8�w���2��jh�����I�c�f�Gӽ�:����q��媺�цcԣ&�����o�!��th���y<�x+d�ΐrŐ�7��RԳ���	H�[��>z5wb�R�G��ɚ��o�!\�rz�!�a��5������#��J�c���4�������Ө*8���
���V�ӹ�2G�|����4�|�;*h�̱�l!q,���p�HO���:G�*�����4 x�:��s���K5��������Ho44u\�h�4)j�	�n�z@��𘐩�2C�iD~����p��f)����9�+�	�P#S���)����~��Na��ц	Է��k��@��Aw���@>���4u\�H&<0.�V�h���z1��} ���2G����\��G����!�+�^C��2/6
�^u7�C�U��n�K��8�Lݖ���Y�����f�N[JF��J����q�#��U�}��+-_�N��~�-���q�#Z��`�-�m@ٕ�o�݅Rm`��(������
�d������Ʉ3ީ�
+�OnZ���I���ȳ����g��AI���|s������MC��h��1�'��GG1�؋��!�~GZ��|2���=7o���؋�˞�d�G[O�s�t���i��K�u�
}2�Ȟ�b7�8�t\���'c��1GrӘ��q�s>3$Ǎ����~���K���oc~�	~�ߺ߆.3$�M0ĻA�o�O��qc~�1ùߺ�.�`��s$/�9��7tɘ#9n̑�4�8w\w��%c��1G�Ҙ��q�qC��9�����q�;�sD��9����K����dđ7��4�8w\w��%�q#Z�Ǘ���pɘ!�m̐�4f8�[���%c��1C��F��~��d�7���1���3D�l��G���',[P��׺�.�0���VJQW�5Z���#;఻(�m@*�E��Q�U����j�v����!e���/׽7r�l�i���!eDx�W{t�j�#�̶w3��f�S�Y������:G���/����:�L`��cv/���ᙕ%'����v{<�J��[}[������[��%Q�po�u��S�xHz9���\�e�Y�xz�g�y�YU,��Z�N^�����'�B5���$R���^
+�|R/}R
+�����������z��Z/�js~��@���<A�K����
}h߭�
b�P�5D�g�}�n��H�����1t��l���P�UO1@ek)����0�-��!w<�v��%f%��d��1G�x�
+a�!K�z2�Q��#u<�v�p��ϯ�Β��B���	�-�VA	�
�(A�#v<�v�+({-D!{��@�9R�hW0��SB�mM|� �HO�]!��!�����~� �HO�]!��@
+
+�<�("̏��@�"�b+(Bv��1G�xm
���zYL�}�	������0	Qȍ !b����"�[�N-�
^��J��#w<�v�0^oE,@BB���	�+�XԢ �1G�x�
+��&���t��d?���S@���������B�&ܚc�t�l O��{���B;Ɍ`�e�w��
6���=�y��)���u[u�#���鏘d�c�����h�~�u[��=nP��Օ�(�g�)�:��
��va�e7���XJO�y��W$�)����<��+��V�h��
�!������=%Ց����'v\�twȤ���@�'���z
+(�4\;�xQ�e���=�~U�8<?�خ�	�Ʊbq�;�	�h�����V"����耞����r��:~SA�GWZW?뮴
+Mt�]pt���Ǭ�?�i0g�tWR��i$8���c��oO���59���m/	�8�.�͸DMhK�������֏�F(���������0qX�xP�4�u��V�RD�M�<J
[�+���0���A���^
+�'U�����a�`�J�#$5<�~'�LEEBb\��[U
+��Z��<�G����Z��r�f��˱"�Zv�.�?|�U|i$S�p/��d��[2x=N�d���Ey"�2q.��L�O)�J�2�C{��ӭ�d�h�2�3�v��<�G�8#{K&'����@�Lt�O"a���D𞴼H�B-���M�Dv��i�[2��2T�EOj�ǖ�('~o����B�o��W~	(g�o���!v-Scf���LA@�8w|K�\w2��������UE���2qv��L=iT�T*�����4���Ϸd*�"9�"����D��D	�;"�#�-%-Rn�o�2�L�!�Haߒɸ�<Yi-�X���^*���ʎ��T\-n,�����q�Ij6���
�lA��A�d\ַ�Բ���?���Ζ�^>=xWI�|�fV��F�a;��[�{��^�=DcBT�!��X�2<X�
�!
+p�(l���|S��[�T��l�OG�z���1*#�}����<&
C�OX�w�^I�臣��:��E�e3�?c`��u Տ���Sj1�80�yں
`���&�8k��]�
����rC�G����%
HXiC	VCN-�]�q��;��!�)A$NAp�Z�#@>v쩶�SՀ�yݺe�n�>6�\�1ҵhTh��*TZʌ��(��]hP��`���
�ܱ�PJ�_��^�=�^\%cml_<�
+:q�|��Kfo
+
+��(QG=�p��/�Ue&����[��)����H�����;.�PM��;���Z��
��y(�1b�<�ی���o���oJ��/P���A7�C����AP�፪9�W��^
n�o1���
V-������N#%�az�#z� �;,>�a3�2���`��D���/�r}�� ��	����i�O�[����3I3)��s��w��\~&N��Jo�9/��~|���Į�	l�<	�$�l�I�X�|OlB}�'����~��p-�u _g�&���,_���x��*��S��Q89�R�d�=�����t1�|D����ڳDO���ŧ6!����rrrW'�������I
	~�v����+��,����%��-~�p��ln�/��� ��u휕�
|�1�4:���y#��
��!$��������/+��)� �?��c�p�e��"�����"�t���
����������2����E�� _���>��"��:E���������A��g9z1r�#��z
=x���Ϧ����S@�R�(�5:�@���~�s�F�O���>�����0��f0���}��7�a��&f�S�^?L�&��e�g8�0�!s�e�#w�u��h	y�@)�Y�EKח�����$BG����
Gm}[���C�'�@���,*o�V�u�1}|�R�U,���q���������x�0�9ߢcߵx��Ӈ_��hў���:�J��O�b�ls����։��-�-�m�pb>���?رu�endstream
 endobj
 6 0 obj
-28075
+27992
 endobj
 4 0 obj
-<</Type/Page/MediaBox [0 0 1168 944]
-/Parent 3 0 R
+<</Type/Page/MediaBox [0 0 612 792]
+/Rotate 0/Parent 3 0 R
 /Resources<</ProcSet[/PDF /Text]
-/ExtGState 12 0 R
-/Font 13 0 R
+/ExtGState 10 0 R
+/Font 11 0 R
 >>
 /Contents 5 0 R
 >>
@@ -120,108 +149,46 @@
 endobj
 1 0 obj
 <</Type /Catalog /Pages 3 0 R
-/Metadata 17 0 R
+/Metadata 13 0 R
 >>
 endobj
 7 0 obj
 <</Type/ExtGState
 /OPM 1>>endobj
-12 0 obj
+10 0 obj
 <</R7
 7 0 R>>
 endobj
-13 0 obj
-<</R8
-8 0 R/R10
-10 0 R>>
+11 0 obj
+<</R9
+9 0 R/R8
+8 0 R>>
+endobj
+9 0 obj
+<</BaseFont/Times-Roman/Type/Font
+/Subtype/Type1>>
 endobj
 8 0 obj
-<</BaseFont/VMCTKQ+Helvetica/FontDescriptor 9 0 R/Type/Font
-/FirstChar 32/LastChar 116/Widths[
-278 0 0 0 0 0 0 0 333 333 0 0 0 584 278 0
-556 556 556 556 556 556 556 556 556 0 0 0 0 584 0 0
-0 667 667 0 0 667 0 778 0 0 0 0 556 0 722 0
-0 0 722 667 611 0 0 944 0 0 0 0 0 0 0 0
-0 556 0 0 556 556 0 0 0 222 0 0 0 833 0 0
-0 0 0 500 278]
-/Encoding 16 0 R/Subtype/Type1>>
+<</BaseFont/Helvetica/Type/Font
+/Encoding 12 0 R/Subtype/Type1>>
 endobj
-16 0 obj
-<</Type/Encoding/BaseEncoding/WinAnsiEncoding/Differences[
+12 0 obj
+<</Type/Encoding/Differences[
 45/minus]>>
 endobj
-10 0 obj
-<</BaseFont/UBSOJO+Times-Roman/FontDescriptor 11 0 R/Type/Font
-/FirstChar 32/LastChar 100/Widths[
-250 0 0 0 0 0 0 0 0 333 0 0 0 0 0 0
-0 500 0 500 500 500 500 0 0 0 0 0 0 0 0 0
-0 0 0 667 0 0 0 0 0 0 0 0 0 889 0 0
-0 0 0 556 0 0 0 0 0 0 0 0 0 0 0 0
-0 444 500 444 500]
-/Encoding/WinAnsiEncoding/Subtype/Type1>>
-endobj
-9 0 obj
-<</Type/FontDescriptor/FontName/VMCTKQ+Helvetica/FontBBox[0 -212 929 741]/Flags 4
-/Ascent 741
-/CapHeight 741
-/Descent -212
-/ItalicAngle 0
-/StemV 139
-/MissingWidth 278
-/CharSet(/A/B/E/G/L/N/R/S/T/W/a/d/e/eight/equal/five/four/i/m/minus/one/parenleft/parenright/period/s/seven/six/space/t/three/two/zero)/FontFile3 14 0 R>>
-endobj
-14 0 obj
-<</Filter/FlateDecode
-/Subtype/Type1C/Length 2594>>stream
-x�UVT���Y-�5�+
-�Di�����iD��!5
��P�ڊ�2P[[+>j��h��E|T�U�
L���ժ���﹃��{Ξٙ�������
-�a�@ ���uiI�C+7�$����BDR���gT�D�BdoW>nįR��^��7�@�_�oAF�����T��eyD��ԩn�{����\���7ʅ�촔t�$:�Uk22��t��r
��hҒ�)��������du�ж�D�z�28M������tY�����F��4��ledbz�R��P��h���!�0�y�Ct���puDZd�6����w�r�@�i���3�qf&1Q�����Lc���L0�̈́1>�/��bd̿��80f3��3Ù#��uf#e&�,2,�\������
;;�[(L޴�����X�j�~�؍l�x�x�x��$�΅s۸���<|��88��$����C/����%�g,�ª{���Њ~g; C�xR��=�va�
-��NtZ�-�督���F����:�oB��9�ٽ����O^hwD�y��o�'c�!�4�r��7���_��۫EI(y�f]^V~za5
-%�x�	y��ؖCٜ��!ݞ�)�(���9��l�U�{��#l2J,��V��2�@�'m`�0��~[�-����g%x���u�M�I�ð�/z�I�����$�Z�!��M�H=6.���ԥ�r��m��Q5���$#[��x����O	��_+���O?��Ǟ�=�r�*=�D.��a���u(��~F���y�\���<���:���z��]���t� �
� 슘��?`ׁ��#��-�E��ZAD�8pD����Y�yG^>Et���q]��"��$��A�v�2�ޜE�\rǦd���7���O+��-�7mD\���@�%�Y�Ԇ=:�5&(����
��;>F!.}��
-�&��4~�*'9U����vG������Q���d�*r�(5�`�V2�`��k7�gi�Q'�w���ϛ����eg�?;�}��*-9��#� �G[7d騙&m��8�0���Օ��
-�vV�r2Z�zi-u����Y���;-m,-m��C�
QeXe�9z�a4��kw�m�[�Lf�
-6�9�r�
�y
�'A&"�	
-ن�Q㑳7��v1ـ���e2��\��==�$ ��}_!��Aeօz�/f,7��ԯ����Fa�h���Y<�f=��B[��Czkm�{�5�n�̣�m�
-N���or�@&M#v�m���	0�{Z�-S�du��)�(��Ȩ�;Vx���+i�w
^�ދ8���hGюWx��!NJ-������p�+���S��(
-C�>O(ՎQ9�ZQxx�`��W|Kye<���G��&�r��Bka�Ҏr/������sK�C	�oB��\Ye��,r�7{�0���,[Yk��͜��RF���Azμ���!T:����ٵ��x}\����ȇY
-X�B$��5�fM�#J�M���ܲ��Sk2O���,%[qhi�ѤƐ�"����j8}���"o�!�4��uxW�����~��p7�݊��T�Q{-B��Չ��F�m?(|�d�H�i$kڤ�sz!s�r�
��xdݶ�^0��x��Ǔ�P9y���ZU�%/�my�kPb��8��RbE�d�Ah�U*�],�k�&����TP�Y�h�'�q�h2Kf��x:ufa	U�?X��B���h��M��C����o�~�Éj�����~�|��J���S��b�
-E�(tm�,���83�ɹώ�)/���p3⺮F̍|o�*E1=���|7t+��5��w��C��2��%[],lL��=}j����T�"v�9��*�5u�Jݤ�L�8��8�B����o�8�dvq"�s���r3[\����C��ug�_�v�zm�FE�����p�vb�^]f!t���1Ü��abr�!rCS'O�XȂ�W�M�n`��Lk,o�F�F�����=@Ozp5l�[KO��+��޳lwFٺ3��tQ�Ώ��P�?$�b�6kW+*!N����5CO�=���j���hln�m @�NT%�� �#��WskT�"~�P���Ǡ�1�"�ʌQ+�aޥ�OЏ�6yoG�×�k^��$l������L
-��/S����t!>0K���$�l&.�d�{��!| �{��D;d��aPDک�	���*��-�>"%���pQE�ϫ䲧����:�я<A	�G��e��3��i�p�%�\B𢸄y���n�4Ե+H����j䬙K"=}�\��zɬ��n���*h��B|��m�A8�}���]���zA[��P-�LT$OD������+u���8@����
�0�r�*8����;��� \��3X�-��T�18\�0��T6�(�L���Z�8�M�3�C�L`z&��g��󳗅m���v��PIӼ-I_�r����sk��L1�6�<�����k�V�".��A�TAV��m� ��<PU�+�=�o���Vb��.k� �������]9.��b���5��{��}��#���qj
-endstream
-endobj
-11 0 obj
-<</Type/FontDescriptor/FontName/UBSOJO+Times-Roman/FontBBox[0 -161 863 688]/Flags 131104
-/Ascent 688
-/CapHeight 676
-/Descent -161
-/ItalicAngle 0
-/StemV 129
-/MissingWidth 500
-/XHeight 460
-/CharSet(/C/M/S/a/b/c/d/five/four/one/parenright/six/space/three)/FontFile3 15 0 R>>
-endobj
-15 0 obj
-<</Filter/FlateDecode
-/Subtype/Type1C/Length 1714>>stream
-x�eSkTSW��<�-��S��$c��cA���R���*��� `'	!���$0�"r�@��$<���jQ|Wk�Kal-P�i�ة�U�ǹ�Ï	]k���?g�s��������c����B���b���]*��Po�����o�-L�NA4D�XƜ���a�X�F��R[O�J]V,���W�f�Z�������������o�hdR%����N"W�e�F~�?Z.���K�e�B
_��/�_L��%E��dr�Z���W&���6�lH�)�������8��/�H�rq��#���y�S�w�[��}����K��mX4���ǖb�
,ñ@,[���c|^��
���}B{B���d3��v���[c�R/��>H�|�ɱ@C��TW^�`<fl�qd���8+O�HJ�D��7\~���_
d�_�n͑e�[��PĂp
����ɘ�?
�F�O�+�듺��܁�6�s'ɢ��ׅ7���k�ʹP�(��W��TYcdIu���0Ys�ح��Ld��A�K������5��xG����F�:�'����TE���I�z� �{^�-�H��-.�%��]71:N���!��!�k,�J�Ie�
�P5x�g%�͑!��3�5P�~��}�?�`�/�SS/6���V�+��D�Q+�
r��"�-8���0��o�%���.��s3��Ƈ&���X��������b���$��F-�1��$�FȘ�YH��:57�r��8�QkW��u���Ng׵��r��y�l��c��Do�DC�������t��$Y�N݉C�K����ާ�q�	[Y���,���DB��L�T
�ZZ�7�N�K������g��R��5-� �\�
V�Jc?��U:��VCxNR��.�3Z��M؇���
>3s`�$�A��
���V5��;DM}��Мl/'�G��g��y<CH���
��h�@���o�Àk�� /��8TWW����J@�f��%�1q���{3y,�iH�Ј�25M�C�˨]�X��y���!0��`'٧[
-�E���p@Y(/�,�ѻ�Ӧ%�y=���А۳?IxOp���%�~T��d�Σ'Z�"��g����JF�p�p$~�y�}�W(l�������W?����Tz�{����#��Y��4D��E���L����(��st��֞����;��������`3��o4�
-�k�=��獏��_�K���S���"'�~|w���7璯����\��xP���a#=�% �	�Fiq1O�P?�,�`�*�G��� �����r�;T����^Hg$�A��`?7�`��w8��	��/���R�gp�G�;�Y��tk�1���0�ͨ3��@8�0����ׁ#�5�Z��pu��S�Jru�x��֩�u����TY,�|�h�}�"ol��:�L��e_y�](�c�������O��	���pӜ^��a���7�z������m@����	�pi�"D�j��熫!bpm/���9���D�:
-�OMZ��g�撽����p�j:H<Ƃ�.���<(�s�B�ٱ����
�W\Z�l݋�;�*��f�¾-�ۛ?���Xu�J��&��.vu�u�_H6O�^�����8��l�ַ�>�dG�������J�-F��V\G��6b�����I=#Xz��.f��W��AA�ۃ�1�?_-�
-endstream
-endobj
-17 0 obj
+13 0 obj
 <</Type/Metadata
-/Subtype/XML/Length 1339>>stream
+/Subtype/XML/Length 1367>>stream
 <?xpacket begin='' id='W5M0MpCehiHzreSzNTczkc9d'?>
 <?adobe-xap-filters esc="CRLF"?>
 <x:xmpmeta xmlns:x='adobe:ns:meta/' x:xmptk='XMP toolkit 2.9.1-13, framework 1.6'>
 <rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:iX='http://ns.adobe.com/iX/1.0/'>
-<rdf:Description rdf:about='4a5eab94-d8e8-11ec-0000-450a1dc16322' xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 8.71'/>
-<rdf:Description rdf:about='4a5eab94-d8e8-11ec-0000-450a1dc16322' xmlns:xmp='http://ns.adobe.com/xap/1.0/'><xmp:ModifyDate>2012-05-18T11:27:52+02:00</xmp:ModifyDate>
-<xmp:CreateDate>2012-05-18T11:27:52+02:00</xmp:CreateDate>
-<xmp:CreatorTool>fig2dev Version 3.2 Patchlevel 5a</xmp:CreatorTool></rdf:Description>
-<rdf:Description rdf:about='4a5eab94-d8e8-11ec-0000-450a1dc16322' xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='4a5eab94-d8e8-11ec-0000-450a1dc16322'/>
-<rdf:Description rdf:about='4a5eab94-d8e8-11ec-0000-450a1dc16322' xmlns:dc='http://purl.org/dc/elements/1.1/' dc:format='application/pdf'><dc:title><rdf:Alt><rdf:li xml:lang='x-default'>MCS_13_16.fig</rdf:li></rdf:Alt></dc:title></rdf:Description>
+<rdf:Description rdf:about='uuid:9d97aacf-e0fd-11ed-0000-becd891ce4cb' xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 9.05'/>
+<rdf:Description rdf:about='uuid:9d97aacf-e0fd-11ed-0000-becd891ce4cb' xmlns:xmp='http://ns.adobe.com/xap/1.0/'><xmp:ModifyDate>2013-04-19T13:05:38+02:00</xmp:ModifyDate>
+<xmp:CreateDate>2013-04-19T13:05:38+02:00</xmp:CreateDate>
+<xmp:CreatorTool>fig2dev Version 3.2 Patchlevel 5d</xmp:CreatorTool></rdf:Description>
+<rdf:Description rdf:about='uuid:9d97aacf-e0fd-11ed-0000-becd891ce4cb' xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='uuid:9d97aacf-e0fd-11ed-0000-becd891ce4cb'/>
+<rdf:Description rdf:about='uuid:9d97aacf-e0fd-11ed-0000-becd891ce4cb' xmlns:dc='http://purl.org/dc/elements/1.1/' dc:format='application/pdf'><dc:title><rdf:Alt><rdf:li xml:lang='x-default'>blerMcs13_16.fig</rdf:li></rdf:Alt></dc:title></rdf:Description>
 </rdf:RDF>
 </x:xmpmeta>
                                                                         
@@ -230,35 +197,31 @@
 endstream
 endobj
 2 0 obj
-<</Producer(GPL Ghostscript 8.71)
-/CreationDate(D:20120518112752+02'00')
-/ModDate(D:20120518112752+02'00')
-/Title(MCS_13_16.fig)
-/Creator(fig2dev Version 3.2 Patchlevel 5a)>>endobj
+<</Producer(GPL Ghostscript 9.05)
+/CreationDate(D:20130419130538+02'00')
+/ModDate(D:20130419130538+02'00')
+/Title(blerMcs13_16.fig)
+/Creator(fig2dev Version 3.2 Patchlevel 5d)>>endobj
 xref
-0 18
+0 14
 0000000000 65535 f 
-0000028392 00000 n 
-0000035876 00000 n 
-0000028333 00000 n 
-0000028181 00000 n 
+0000028317 00000 n 
+0000030140 00000 n 
+0000028258 00000 n 
+0000028098 00000 n 
 0000000015 00000 n 
-0000028160 00000 n 
-0000028457 00000 n 
-0000028569 00000 n 
-0000029357 00000 n 
-0000029034 00000 n 
-0000032373 00000 n 
-0000028498 00000 n 
-0000028528 00000 n 
-0000029694 00000 n 
-0000032661 00000 n 
-0000028947 00000 n 
-0000034460 00000 n 
+0000028077 00000 n 
+0000028382 00000 n 
+0000028558 00000 n 
+0000028492 00000 n 
+0000028423 00000 n 
+0000028453 00000 n 
+0000028638 00000 n 
+0000028696 00000 n 
 trailer
-<< /Size 18 /Root 1 0 R /Info 2 0 R
-/ID [<BFD1A0994F6B6CFE7765A3DE8369649F><BFD1A0994F6B6CFE7765A3DE8369649F>]
+<< /Size 14 /Root 1 0 R /Info 2 0 R
+/ID [<FDC96BA2FB9D5759AC00F557B14F233C><FDC96BA2FB9D5759AC00F557B14F233C>]
 >>
 startxref
-36065
+30332
 %%EOF
diff -Naur ns-3.17/src/lte/doc/source/figures/MCS_13_16.png ns-3.18/src/lte/doc/source/figures/MCS_13_16.png
--- ns-3.17/src/lte/doc/source/figures/MCS_13_16.png	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/lte/doc/source/figures/MCS_13_16.png	2013-10-26 07:07:30.159364396 -0700
@@ -1,143 +1,272 @@
 �PNG
 
-
IHDR�/�7	pHYsMM
�έNtEXtSoftwareGPL Ghostscript 8.71?h4 IDATx���鲬��Q�8��������	���w�*��)E��q�����f3I4�
H��@�f�h6�D��$��$�l �f3I4�
H��@�f�h6�D��$��$�l �f3I4�
H��@�f�h6�D��$��$�l I]��Zcm�����f��3N���B
�Sh��Yz5w�uEi^zJ�,v���|+��>Qj(�vqkE�_\]���8(�0M4L
E�X�KoXT�H�6�m����[�g�Ώˢ؛��yK`��ֆi����f�
Kߦ"s�>�"�,�	�̞�fk�qіs��O6�v*�pAkE�_��b��`�9�<MW���,
�*��aQ/[�K���K�(���~s��8f����l>kW}�:�.��N�v�V�S�W�u���D;k��N��|&��

;�寯����6o6�a�����	�_�E�ֵv��J��y�����µN+��J%��O8�A;R<�����gҽ:z���V���Xڲ(�
-�!GC7R<�����R���u��wZX	(D~V�ov�1�Vf�=��<��<��>����Ҁ
ͮ���c��Т�}�f3�+;�����y>��G������X���1�B��0���g]�����ޜ��3������
��>]�7F.{.a�'����l>/]x08�`{�;9��\�m�������r� `�M���p���
J�[�v/��x0	j5O�^Z7�����~��M��d|~V}N�4T�Z#���rlⵥ�s�5�zn��t��hh�6A��9�.�ߔ�>^��@W��m�;����y<��9za�+�@�}�}~�)�7���|_ht�W]2+!_�k�p%��
���%,�n��%Zl���u	���G��|����0�{
�^_�c
-�v�(��b)K��"Q����|vooFl/���i"QN&�?�&���J2W��ۜ
�I�s���,B�^X���}\�THGع�^���Å_��JH����}��ë.|Lx=*�A~�5�����z_�FWI�[�-_�Z�>]h8c��C��5� �U<ʨZ�so���f��E�]�6������3(dZ7����|��QtcUoA��-a�h�������� -C����Y�9�-�����{Td��W��X��M�t5�K�O��{�����/.?{ɪ藉�7Կ�����
���g��?��[]�&�lѥ7,��Ft[ک����炼�M�xcջ�oH�@<�������d^<�U���4v�G�{���d0�V��x0�^�m6�m��$ټ�S�I��v�@�gGQc푴у�]Y`H����}J[��B�m2i��*0�6矆}<����F�J(��}
�V8�[f����܎9�6����HX{Sfq_C�h)�l(��
�ʪ����%z���%5{�,��%m��G��{�}�p/���}	�ת���{�v�5'�������/�w�@ZxM
-'[=��z���u�`o6�R��Xc��|�RXr^XG:�D���d�:~s�a�uO�J�6��C�9z�ع�N�O�e|JtM��/�9�G�y>i���c�4 ��%���;��U�@oP7��p_���Z���)i!I��F�1����ۭީ���;ZQ�ݣ4�}]��%cݾ
�c�5�hG�Es<�9N�j��Л��k*����r�x8��|�[���m�i�fΜ�Z]���6՞��:�b�dg*�����������U}��r^a9a��'�
�h�	7	ۺ�
Axd�Ё�f@�0�M�듒'�0��z�}�\�g@&����a���y/+��n�듮K)�ŋJB`^l���<A>�����z�]f4��۩mt����?ث#�		,�WW,�zUx3B�k�؋}�-�S�%d&�^����Wǰ��-/!�{�oA�kk�����êpi���+�z_�*;6�ys=��Z���7�O�g�Ō&�<��4�)N�j��֣$�����?J���I^��f`Q�_�x}R�����j���U�aë��<��ӡֿ�
h����W�?���Q�9��5�3 Q�������g8�)�w��@*�*�mS�����|9w4�������)G0���HNu.+���5y��l�O�����1�B�OȚ�K���N&~Ӯ����z�Ww�#p�IIZ<�6��A�~�y����Sݳ�������X����=/-#/����B����i�L<�ZM�d!i!I��F�1H�O�-��'��Ǥz����X	�f`[ޕ����]��x왬
�'�Ç���_E��*̶��RJZ��Nh6;�<�t�4rE:,��/
�~n_	�t9�����mEW�BB���6���m׽C|�Y��^1�*�b�Y��,�7���xn���P��̕\d�,K�o#g���P+���띭�WJ <��ו��9�U�q$K�>��BȄWr���疛��ޗ�z~_�}�oXao�&�[�B�O�������T������|��4�׮�Mv��@��^m�
u?�����Y~w�v����N��*���(�X����ƺ[pU_��6��i��\t�å$���ul��Zlz(�(���X����_�G[�7C>H���I^i'm��·\�!#����5��_j�Л���F���� ���l�Tr����%c�T�R�矆�1�2}���۷mﰨ[Ww�x��
�ف�h6k+o��'����>�L˙���2-_�]9�d�7����J�l�Oژr��1�B�O�q��>Zᛜo�И{3a�1�ST�܆���o������h������i�n⺧�2?���7���X	����=/-#/$i�<3�L-mI���IZ<�6��A��|��XU���V�E�Z'f�c-4���x��I�9�L���Z��j��6��}c�9�(��6ݯ���
-��f3�Nf��4��m������#� ��l�iߺ���R���^�6�6����C�ׇ���d���e�Y�g6��°5���i�[���*��B�
�W+�
-,�^
����D�Σ|����
-]�@�^���%�	�k�7%���M"�?	�;���e��͇k9'�q�6��Y֪�~�
-{�6�ܒ��x̓AANu��.u��e=[E�~���-9��/A�&3�B"�vӫ����ٺ{��ʏ�����^Q^���3�0�]�u�j�o�����G
NW�������o���p��Zlz��J��'��n���l�N��v��KV��܌N�z�U�6��$�;�y���´��d�&i=�����7;-��±��t�]��^au�ǦR%�P�K����l�g��L��6۪rӛݔ�N!����‘�.��寅�����x�+�Eh6�'mL9i�y!Ɍ�Q7��/�0�vu�UԪ���Mf�$-@�� u�{��ryr̼�"S���S�L§������u��L��>��E;\5�z�]�
-�'j���@�����O�]�_6�3�0e7�9�X�$��f@�m.kz=�¾^l��hط��3��ɰaO�|$�X	�,�J��Ѽ*^sU�\�wq���V�X�m�M��3saCp�/*'T ��f`]�M��S][��#R�OIq�������Yr�8���#���6��f�|Ҏi�y!�Oa���������+���m2#/$i��h>��{�a;�Sd������ߩ&:-s��3�o��$:p+3*��{gc�a�i��:���X'j���'�so��z�(֘�RK�Wbݓ�һ�����{�/s�/5�0K�,��
g9ݞ����u��K ��Y�O<7A6Yᩎg�>��r;�޳\�g��Ѧj��|�����NxJ�
-��W���wC��w�\��2�[w�^a	���U��o�e/r%�3Rt����q�|���ٍ5��~�U���Q�4N�j��Pu�+��%m�V�e�+�[İ_�bݓ�һ͢,}�E'ɛ�
-͍��Cs�؛$J^��<e~� �-s�]�@a���翉2��������P���K)4��x$I����U��yxa��b
�E�������ߖ����>�����������jջ�o��7(��ە�$pEW���އ��wʼnZ-6=�mC�利_V�!��Ru�|��uO��m���m�d�T���̻P�y�3׭
���hJp�����\4���T瘺'�����r��8�Ov
���+1�G<�M�4����HϢV�d�C�G�
d�^p데�^
�����+?Ӈ-��YBs��\�u�l��#y�c�����%ޫC׬V���%h��q[�̓����^ids�ov0����@��Gl�aD����f�|�)�{�R}��r]C73��8����Xw�
�h8�vᷝ�G)@�G٪����,�Iж
�Fʆ�m�xs�9��@s�o������a��V�b���:�x�m�O�#=�Zb�U?�|;ot��ȷ�NIr����Tn��6����t�V7��6�|�=|5�3�7o�r% 箈f3|ɚ�#�]�<}��_	�I��t�`׫+2�����N6�`4��6*��xZb��{�"��xP��{5l������Q����Ӻ��G'箈f3�T4�D�[?�z�i�V�G���˗0Ͻ^�9Љ�f�����vH���|�,��v���gy�?9U�7[y�N2��5߃.W�GKy4������N��<;�b�]�@x��~�Ov-���yx����ĐZ�_L����3b����Ȕ���G�U�0��Y�U�I�ZY�&���_E���;4e��aO�뮢��k�������m2w
\�Xa�L�^--æ�*u;����7e�gf�����#���E��Ot��]��fd,�+�O�n��%?w/�[�	ޕ1���b��X�4���(�e�冦�yFl��� ���h�.G�&k��Q�7P�M�o�S�W&*�;�N��"箈f3��Vs��
��6�V�q�J���HX�Ey)�o�|4���?�n���l�4�E*_~�ir���D9/�Z4��6���x�����SW��r�ewEO��i�L V�Y4���=|sd�k#�g�p���U)����/�5w�������|�B`H�\��K��I{@H���
��0K��h0��,ߣ�CD�yqƧ3b���9h����i���c��Wb�G�n:h��^
����o�;�纅 箈f3���3����,-�I��P]�����=-����x�$���`9Ɍ!F��XS�k{M���l�Oڨ��1�BR��~�nH����YFn�}��Հ6��A��J}K�y��*���`8���J�y�_C��'�q�!�R�~�
憔z)����*J���m��(��|R��f��I����uϿHR�>�^��<��l��=6�ہ�����f���a�w_�ů�9��%�
�f@�����Y�1o�(��Ȟt5`-��Wh�x����c�A&����‡xS�h�Ě��	��0��v�R{{�k�򝴁�h6�'mTi�y!������｜	�j���K�&3�B����c��W�}��`@�W�}�wah���e���Vc���{~�v�G�gx���GR��t�F/É�Zlz�\4�>ͭ�sq����
-�{��n3�ڞ���.���E	�N�w���+�l�a4�
#��:=Paz{5��h�f3���\}��\���5
 ��T5rԒ|�`����I@Z<F^H+��$�����I��뭢��K?���*Ж�c���+�p���݊+˝�
CZ�Y�>�.���I{,^Z<F^H��ӣ6�B�Gi���IZ<�6��A��b�ܷO�)5ذ�.j����}~]J�����2�{�ǻ��*�7�Ȝ�8�ϒ�����R���>����l�E=,?����ȝ�[��j^Q5\��Y�c�,^�P��
-���WMJ�\8�m^�p�+�����*-5Wy�l^a�nl��9b���]Ϊ#��a��x�=S�F�(?2*f�-*j��z�v���8Q�Ŧ����*�{�X�+��gݓ�һ��0��z=�����J
ۛ�=���fj�S��Nh6�'����x����'z:���G�h@vo���~�xZlѽ@'��A꾽D;VEݣ4�}]4���QAZ<F^H�㊞���כ���"�W��K��E\��A��ϣ$���Q%��T�L�rv4����h6�S�)[���%�wq�]�]���f���l�m����7�o�lPi̥R�I�Ll���e��k֭Vn��
���z��?o��e��W��'@����>��z�E������e�D�y>i�H���i�x�>W\R���v�5I�[�E�i>�{�ۖW�0����s��S�i��׵ꋳ�X�ua�{��2^�(�(�QK��D��*�-�;�D��x*�v�G�an��2��9����O�3׺'y�6J�RZ��&�M#oHOL��9=�<��A,���Z�s[��f��E]�{�!7�ns2�qx]�y������u��.=o$6ƽ�;0E�͆N��
-��3��l�Oڨ��1�B�5��
��70���
熛�
-����]�"u4��}'ѻ��W'9u����ܪ�d�����{�:3��C�n��B����b��XWÉZ-6=P.:��m�����Tx$5\�,ѕ3=*U�=�s�ХǙ�K?m�1$��d��f�4X����E�%h6J��nߊm?_�GX��D�ϳQ�붩4�hd��-I9#}�+-�9��(�5Z�)�]�uo8KNi\�3 �4�}M��h6�'mTi�y!O�K�mB�e���Jw_EO/�K�j.i��h>��D������=s�}�+$�nw��l�O�c���1�B�O����ҋf!5��=~���װ
(����Lo���LI͏>�G�>�.�̀:+��cW������
g���
+�rc4�����# ��+$���l W����z7���/��K	��@	��~Tw�?N����db@?c2o������]x�f�|�F����N�Dfm�m��Z5��m��wڋ������
-��L�����������l�Oڨ��1�BR��S��J��d�~���J�"�4���]	MT��O[�/�~4����7;�@�06�:��w�	��B�?/�,��zF�_����n3�ňd�z�&���ԩ1Ke�e
-��Z)&դ��
G�A�y>oX�����W���EV\ͩq�
P.�sb�/�S�WP�Q��e����	<��$J���7�E���g��&m�[��w��˿7}
PK���U���py+{�m�`+(�Q4��6*��x������KnyB:��a�&;�.M�:̓�W�C��gLݛ,�}2�̽`��5�������D�3��W�1o
��b
�J[�m+:R�.��>��=9>7r�]!Vx�@x�#j@mkM�= ��f��gf�����P��t"�Y���^�Y���aꎶV=�~@	������V��ٌG�C��*��"�݅�
���溇&����#q��� nTi�y!I�瑧9���9�^�/��7��"�h>�t�{E� uYB���GvF@����w��Kt������)\�UR�8
-O�p�6���|m�c`E7���l�Wn���״�����{���9p�V���Y�e��79�./��H�p��˸�?�iXxn��r6�d��ɟG}G��y�T���&��ɢ�D@\V�Q��3�ؘ��c�<�sW�p��p$�j䆵��~���\[�|��
/���%)�H|ۻU iua2��f�p?�&H}�v��B{ץ��r���8��۰�R�g������X'X�E�����ث��rn���I۫��? ��{u�,�a����~����!9���ޔ¯����0<O��
-:�>(�kݽ0*J�/<X	�����w��Y�]�s���:����|�n'��N_�.�uG���o����x�e�?��|!?�)8Q��.AN �M1�aT��o�9�׎��?3�ʺ'�}�6�W/���
�����R��mbE7� IDAT����6H��k6FDbU"�I���sv8�H�%!-�XE�>c�Ǜc�M}�&��*B'K'h��~��V_�pE�zsL��;���˯;Bk7���-Za�R�/�or�~o8˗�y��e`�$h@���оc�닮a�7;�L]�L������׆��R��%D'd
�*��{�d�%�~k��~6��A,Qwx־�\�ɭnx���̲�,ơa��4��
-�bL�mts��8��o9�I�E�P�е������J <�Y�':���٪���coi�1�6�����۱�y���Pfo�epzH䬟o3����ے/א�=ׄ�?A�d�:'j����n~i5�va�X+v��hCOZ�Y�$��n�(Ү�H���IZ<�YE�?�l����&���h����V��Ƒ���q�wnɮ!bh6�'�
-�������&��@��xfЏ攱n���D��T�����64��[�����~�ÿ{��"�^�"7�q�>T�*�#�r��w�ئ�Ůȹ+�� �a�m�F�R[.'��5��E^B�tJ��
-)m6;c	�Q*;Kj��YDՋY�̒㤅�KI����9�ε��"��y�ϲ�H�x/��Eu_�/��ZNx��o�G�E���	/����<S@�M������{΀�V��e���
܈疴�6�篫s������=owZmA��x��X�b����Ńa��
-i��=�����i7-���������eH�󳣨��n32��CE��I���"�mOr��ȕ��<0ѫ��4���p�!<���l�o��\�m2Q�4�r c���P"��J�o�����/��f�$��������8�d��h&��� ����82h�G�P�.4����q���۹��
-T G����u�z�a���
�����)'-#/$⹕tqd �Bů�ٗ��"@�� uﺀ.Ŗ
�w���Y;H�|�y�_����=� -#/�]�i���!�O�6�)iX�W���c���s��"����U�kحpe���7���#)m6_�
K���{�X��̲�,�/=�+3�7���K)��j)W���R��l��<�ݛ%�:�õT�E���کp�#�Y�y
-��
-_BE���u�����v_¬�w1�Z��Yo�e_tr�����k9��V>�,T�V8Q�Ŧ^�J�W7_�4?^��ŞV��!ĺ'y�w�
L0��]rH�T'4Y����5���7�Ajym�4���]AZ<F^H
-�y�
:�k����̘t+m��XH��.p
�h>�{[�[�\\N��8�D�ȣ_5���u�l�OZGi�y!�O�
-�������xm4��]�\�ů���^��}]4�
x����A2���]��\����
-!�d�zO��-P*;��7F��^�MYы2.�����v���
T���O��7)ɬ���J���o)�U�ǘlc4��6*��x������䐎�������U4�����PE�1H�G��ܽσ��i��y�_��f�����w�����{j��R��R�c)��ɢ���R�g9㑰��1d)&�yt�۽��~�����>v�r�W�Ưg����P+���띭�WmKȜ�%�׵�/�q3_��{j��W�%X獏]��D��=?c;?w�wE��ر�_���W}��vٷl�$k�i�=%�j"<9/v�[{u�[,��8Q�Ŧ����oC.7�ワk��3�QZ�Ҭ{�Wz��g�w$�Z��X���u�S�!���Uo�4�
<�D���oWj�s��}�@,���jʮyJ`��7Z���<��^���1�B�2��#m�C�T��ҭ6�&��j@�� u�i������:mSwUh6�'���x������m�
-C��5$l��6f(Qi{5���c��w(�G���UXw���6�M����h6����#FC�ޖ)i��	NN.^���f�
i����-u@�r�
-��P��8�ly�����K	���nZ
ۖ�t���.W��72�N��(��':�7��F�y>i�H����xnXҬu9}>�j��
/mK۫
m4��]��{�N�:+�ʚ����6�������ׇ���d���f�F躔�Y��Y����U48���g<�w�V�����R���o�ݫ]=6�wXK륰����Ky3�ӽ:��d�I٫��еT�E��z_B��3g��7,�}�YlVx=JVw����]���ئ
-	d?Y�I���f�ػ�IJ�s�8��K�cg»�eY�#�Y����=k�$�9>����c�aQ�����)f���D��h"�;��WN��oY��ߟRF`l2�{�Wz�@��'�a#u�yr�1k�z]y��ݗˑI`����+�[��f3�I�z)�\�z2?e֭`2R�(���@�y>i����c䅴m<�ڱ�V��CV���h��mXy��E�1H�8ȳ��~��{�|J0x�f�|���K����x�����MBj�g^�*T�|R��"ch�bl��Y^R�|ik�=��j���E��4��ƺI�|��
�9�_�?iYz;%�b�-�� �o����3HɈŘc��Z.`�[�u�ķ�K1�U�
%���T�j��%Z#��`�[�	0Ⱥ�'���<��Q
��c�D<���d��������U`�� uoZ`�+�����&Q<mپ���]������u�l�Oڨ��1�BR�����Ґƴc�x�'��[��i{5���c��o�01=��*����[n���l3���ӿǧ������>�
������� ?u�zC-�6�3��D(���+�!�%���,x�[~ȼ�bW���ڳ���������3�<�ś}�,��7���n��Į/��n��٧V7K�3?^���y�G�g/��}��%t-���W^�7]�������;�_ڦ9�������ث�w+�o���x�?�.E�%-���Nha��Wn��oo�g!Y{6���Կx�5Ǒ��0
�ڙ��W:^��^���$�
勥�↺w������Ğ�j����V]w	I�\4Z���Q�w�Y!i���x�����v��B��_<G��y�[�i5��Հ6��A�>F�e�e�S���j�+�Cxj���E��
�7O\bs<��*j��m�
i
��0�f�X�ŏd����(ֲE5H�4g$��lvY���B�6�2��XI���5�`
-4q�����sE���LG	>�/0$Q:�mj���|R�71f��ŹG"6��Fe�c�@?��?�ս<����a��G�
#�nsx�E��i�Ki�y!�O�<TR�n�~<�fH۫!���14�6����I�W9y�co��7&��|!��8�'~�V4����		���N��:Ƶa�5&vG�����y/Մ��O�坹m�+x�q|_j��sa��۬
-W�&+<�7o�vm7���\��^
H����e�Yzx��Y��W�f3|�zƥz_��-g�����Ǒ줽VE�%<et�eݷy��p�Z�k�I�:}ly��6*��x�~
P��V�h}��#�䳜�n��.\�d����{5�S��1�����u�g��u��3��l���
��6m��6��
-	�@>�-�
ݗ]�>�j.�a�"��@����-�w
-��V�����G�4(�r�_�l�������l���`긙�7��C������[�xϊ�7\sOk��^���g���G�XS��	�z[���k��Io6wb�=�U�����|�,��v���+fy�g��3N�봔�0����`�/��_�#1�G���������P�����Nx�72<��>�w�ûV^�3 ޑNF��g���A���m������uǾ�eY�O+Y�>�e�H�Т�9q���Z��cԫ�6'����N��u�Flz�%/�����y��Y�ګM�〾m|�<�DÖj?��>ۼ���]-zais��E����-ٕ�lz�,���ٰ���+��T���Qd5�GfJ����#I������������D�M��ՠ��49Z2R6��y��R��SGf��j6�&��u����os~�׫�m{/������A�^�7�=�:�{݋����
-���F�`�?5,'�h�3D�͌�,��a�QƘ#6<��8y�'4���vc~�
����t�~�
]+�l��Y;��83�vqt���{���s����W�	Xȳ�����M�q�v�~~:��i��j6_�xv �:?����W]p�"��
A;S�z�yc�Uy�R}�o��o��?��\�{�\%���G����a4t�F�z�a���$�
%:e���dm
-�r��h�lU��l�3B灯���_wx-~�E���]�/����nW����k�z�4A{�0�pJ7G�fi�yOZW�-�9���J�J��&!5\͹x���˝��oi{50���[ej���d�O�޷n���흲+L`���o����*�ӞW/��a�
E�5���ˆ#Qn��7�g��0̚�E��\���m�0��z����ΉEK�d�����G��m2D�.�%eS��M,�f.mg���+h>���{����nx��|��ڿ���>鰣)�}0��N�3ϛ���o&(��F�~YM�C[/�-kvNL}�a�7��1��w�.�0��W��릉,|�L^�iK�K�N�\D3׫���5�j6+�z�(:���V��r���;Hm���8&uX�>���q5��So2u�,Y]��S�߾f�����Z{��s��f�W�>��N	���#�U��æ��.^x�M��g��O�۰1yg����
�M�E��n�����s�M�T�^j'e#�{���u�#�]�Hp�Aܳ�0���.�W�?�T�M~�;q�o��"�JZv���r��t�v�!�#n��Q!�6Y���UHV��M�d�~R҄�tˏ���u�֘d��v�t_�m�,�{*u��(@��g8}��G��L^��w���ey��O�l�m��x��Z��
-k$m�
r��Է��a�vG���ԇ�h>�Pw�>�!�b
DŽ�d&%��tO"�ύe�$�}�9?A�Hp�7z�=�K� ���Ѯ1){{�О&~u�G�s������.[�������]��=��I[#Qט!��S�ph�N�-�>��y�7�5���-�w1�4�/���D�٬T����ʄ�9+]앦2�6s�K�OI����k���
-��X��k�{��$�4�II��38ǘ�(3�v�������?��>d��?��T�9:$�g�
-�@��v!�x�ş������Ƙ����bO�*���󏆺�������t랹�-�
-h6��uK���zҊ��V��
��ȣ��nD��H�1�����g-����
��NmN��Q��F�D��7�{M%�ݕ��>,��g��?��\�.���%�E�¾��Y��r���VV��N����[������;�e���Z{��c=�%�o�?��\y�.٧l���8��\|;�WZ�r�N\^`Xl�9�}�WB�¥��T4�?SUx�K�,W��m]�	�{�
�M	�N����7�
VX�[�����ڂ����_���v���?R��D[�v�s�̪hI?J�֜/4{�o��QH�^�K�,�"��o��g�EW���+٫!ߣmZ��+�hv���a.��S��Z>�ӹ�	����allL���$���vi7�[l��_W�Ŀ����JN&�
-��=���@����ߞ�WL���myz�����'&�z7N��&�pq�W���-�ZA<�ڄԮ�������*7g�]�4���I�^<%!M��L���4Y��V�Wf�깗�èR)�+?��Q�~J��g������A1���u����]­{���l4�?Jv��4��
-�������%�92�@�:?���-�d���8��'ao���l�0oT�i�H�6A��2lxm��Z�a9a����֮�k�J=�Qh6O�����g�Lv����#�rB��
-	��ͪ��&S�j9��<���v[>t"A�d�y��$�-׉f�G~��igzn�&Yh�GX#]�*���i���6
-���N�#�G�����>����������}�����"Z�l�5��v��w���I�H������������i�OB����KשYno\��Ή疴���3$��W ��4m�dj�"Y_�"Z�l���4�f��3��T]���۲Q�Njם+ٲq��F�k��̗i�^��j�f�N�*�-��
-�Kv����=�T_�m����K��q�
o;���̽�sp��p��Wo����2S����d�<���-������4���̗n�ݓ�?GC�UG��]�^t�5|ڪUBB���>��*�N/�H/�~�v��+�)�	jU�h�Q���9�纅D�r�GG��w��
��.��^}Rd��7�=��I�ޚ[ܘ�s����YqC߆�	+�[7M_�������n�'+��ƭ��vړ�_��3&m�9s�*?_���������&��/!�RH�@פ�j�/w	���J��l�D�Iڵv�%-��x��{�"@,��B4����=pz_)�Q�U�\ݷ�H���ϰO!�"7�D�8���䒀���1Br�=&������X�a����w-@���	��5؏���'`'��\�Uu�/ԁ
�Pu�������ÿ�[�{�tC��f�c�r���u���[�_�ρ���
�����7h6bއOK��3��W�5M���%F'������U�j8ZЩS�6/�uXN����I���o�U��g�0��A������~��
^�,�ʋ�?�	
-㌶��B�
{�4a����'����f��G3R�*�֋63�rt�Lm�%�|���u�u4�T9SL`"�u������u�:����Խ�A!��k��{���OL�=�a�<��mXr&��gCifO��"B����aҚ��R�1�x3�\]�6�̛����kdʮ0�|8єa�N66d���!���5
-�7*���2������E>&G��ovb����CGw��i+Q�;�֬gH��z;�y�;,���U��릉,|�L]�hR6�v�d�A�Au�C�y�+o�9,�@N�J]�OC@k���(z�����ƹ���.�3��b��(��^3�"��Ҟ�=G�4��nw��=��^��mރ�MT>+%�8�x�r�O���.�Z{��x�<U�ݶ 6�*�۳3u��j��T�>2M���z���X{�H˟�6�6Kd]�{���`�pT̒q2��N��[��^�cH���s�UHч�*Ojz��U9�څ��*�Ԧu�v?)iBK>ۜ�G؏ں[ۿ��!�afOIݭ9J�?�0�m�,�{�����3Ct��Kt!�����~W��u-#�[�B����-f	���\�޶�ěLm�&kwԱL�N}8����,��^�����uՑJ�>�.��CyI�1�ƙ)�v���b3�𮦻3���� 6R~<"�5��i��˗���l@��8/�E�M��)褭��k��ɶͯ�]��ats�q�u���'�U���sV��f�c{쩽�+s��9{��c0x4j����OϑϿ6� 4�l�OI�i����_��@���f)Y>i�ڵ�s�C�_N��,mèPO�Ԥm/Fbw^�����ߍ.�7�1uw�(gG+���1Pi3�B��9Ǜ*�.�O�!��f�U�pMK�j��
g`Q��I;�$��C��<����6�9��B���,���g��+����47\��h6?@�B����
-fO��2�_౩�u�1��g's�n�l����槰2���u�gm�����l��<BN~I��4u@(@��Ե��]��
�ç�y�F���+���xS_D
X?�.�>���U�\���7GV�2M�n�ڼH�fj��
-�}~�|�Yw9�kh$r�����D��l�Wq��8��;������ݼk��
-\u��NPk��G��,��(�
�A<W;�q��h��%j/�*u�Ҡ���ݓqt�Lm�'�p)O����њ�?b�.5�MTow��D�fН������5�N����K���'�N��l��֡��̺�Lv"6[�%h�k���]�Zq焷��X{{n�
+a�DЪU&s��K�&�~��&e��͓_�^��ddm��8���w���ۿ�\�f.<����3���O��6�
-h�&nt)��ѹ�%�v����բ��#u����7�����<o<M�f�Lm�T�e���� IDATڴ����r��
)}D�&��^�������#d�з�v��M��ˮ�/���Tt�N�E��}��F���TBt9�����Xk�cz=��տ7��:����3��L�Y�+;s3�EtX
��ޜ(����������{��wM�̂��t꼝	�{������k�׼aH�����J���z>�Q��m�����P+��ç�n�NI��N����L��̓i�烉�
� �Z�����7�^9�Nw�L��*"A�p�9�O8�O��[ذ����w1;�/v+�*�Sr��y�>�?t�܈��Q�Ń[M6����>f��W���mZ�x#�~�����M����W�R��^ٚ�?S��5�h}��y�_���fQ��8�'�
-����l~����7J�R��q����Yޗr�&�St�𙽪�m<z�z~��M�d�=}��i]�哲�'g�l�oӽy���E���8����J�
-�<��襁;{XZI���k��Z�K�V6՗����ɶ�e�Î��YL�ﶁ�x��K�<ų�U���j� �<G?J��4Z��M�d};K&S������������g�9����0_,|zx���]�m߇WWxf�\	WK�w�ۭ�������a�%���<��:�G�2�{Gܮ��
L�瑵�}�ڟ�SUϜ	���sY��6�d#�9R��R5SMmG�~��!G�O�#dz�®�;m���G�w�cf����):"�=��s��L�K_�i��:=4�թ�ɳ��k4A�~CH��~�bd����6��AW�4��Kچ3;�Ӷ���4@����&��@����۩��
dH>(z��W����cfb;��v�>BնT�X{H0�!������i�ȷۜ�R��i�x�E�VqL�3��r�a��ssi���Rx�Sa�
˩-om��.��Sm�h6C��#����j��9�K5Kx]��R*6�1ϖ��X�q����X/��G��L��۫Ϻ��ϕ�%����
-@�����k���L���mx�	�Z��Ti�����|e�5���3�"���|��o]�������e�ƹ�W<�K�5���\��O����]F˷�Cb�F�ʴΘ��"����!�*f�h�h������_��ZO֞9������J�2F�l%\E���H��jJ�v�j��͋dm
-�r��h�
-S�p#W������5�[k��Lz�^�S���*Ra�w�qߑ}5b��oz��o�=\Xx8����
{�<�Ί=ڷT��ul'��h��!7A���a!�:�j��<nu4�l�f�������L����.*������[�G��^���l^���7ǻ7��r¬y]�N�u	il����������)��:,-i;3)l��[��6[���G�n)�Ѽ(�'�Nswf�eŖ=B"W��_�����;��rt�,[GI5!Z]
-��&��ڌJ��%�h��l�>��#N��eT;t�kQ��3
{u4�'��V��q8���we:|�0#�����si	^Z<��~;£E��d����@��Lm�%�p�2i>�P�����v�g��s���C�4�������v��i*c��~u=����bq�څ1����^8K�R��Q���~��.�^�f�8#au)�n�҈*3�y���H*G#��+����T<%�z_B��\:���
q�ߦ�&�O6�4�����s~6��6u^�^t����K\�5���v��]������ݝ�:ݴ�?n�^������,�隁4�~�(��u]���fcY��9A��9ڍ�0	^R�95WI�6�y��sR�Zמ[�
{g��\J���@�=��AÿSӛ߫�Wt�9A�'���[b��a�kHX�1��f�<���
��f�d}M��ש�]�@�ew�+ m����d�5�2��E�{�I��ͅWG�{��s�Z�hט���J��f���ٿx�-"\$��&Z�³�-w�YZ��sKZH���U�\�����)�ԽC;�{��y���wW[f��A�Y�ޗyږ��E�a���K����%��É��Q�4�?���D�ԽG���>|U,��!�f�U�\[�@�
�|�~Z�c
-L�����h6X��f<�XO�l��w�y_��^��,#f���|3Kx�_`��Dg�O��,��<ųd6.!����>��o^�\�Yچ�-���3/>N�%s�^���_ªC���=X
��J����fG��;��x�� �@k�a��>��x$m2#/$�9ڐ��j~xj>��׽0oVO�$��-�!���(j���A‹+��;�5�\!�N�S�˶ݿ+~I;����q���
d�{<�0�B�0^�Lm^$k35__������3����=�5�RB2h6?����W+�;?�)�����%]��듳S����"͕�º��P��~��I�&���gj�3Y��U'�<��fmZ����!Gӊh6��6i���j�z��x)<�\�Z��,�%����դZ�^;������Ś�A�>�z�s>eg���K!k��ZS�Kk
-29$��<Y�_V(:M�iZѡ+u����[�>��l��l�1�i��}�6�u4A{6�6mb�hl�l��l�(��i�3�&�hׯh�s����R�Eu���g�5�J�­6���Z�,��UTNZH��
\��"M���ڴH��g������,����4����(��\�u�l�(s ��ꦲ;��L�$~���3�ܒ��x�����W����fʌ��*eϽ�����Pݛ����]�3Wmw\h6���3�D���g���Lrxy;�I>^���V��yی��ז��k�9!
h��������fo����k'�cv6I���V��	<�����_n&;~E��R���5N�ה�=vW����BIə�ݯJ�f�	�$�g�f	~��
-��R��^1���*l���Е�j�S��~��מ�>Y{%D?yZ�L�OS�y}�U�����DKHM�6�0(��f���g�4v��d��,ɯV\O��$��[���'�d��stK��N�
�	jU�h�]���9�H�D�:O��$;��[���f����NZ��sKZH��1�B��`�����)�=�p| h������"k^ə~��Qӣ��-i!I���IZ<�#�B�ͮa���]'�u_�f��}*2W�qG�k��'�$޻��4��6�2��$Qh��f�r�'3�}u�<f��6��n3 m�������.:>��U􄴐��@��)ur�9Yw���}~]4��i'�-i!I���IZ<��|��S��6[��&)���]�L���u�l���gt�T!��ÿ�ED�f^^�.����`
�2�y��MA^N����
uh6r�ya��r?/1c��΢����e�h$��^���EԽg��׀���YFΒR8�����3�;O�,�{М��[e��7A~v��k�>�r
-����c� <Of�p���^{��5��Y�U�I�:	l�������*)ě�8��|�
-�+6���x�󃠢FO'�,�s]f�s�y���&�h7�T>}��ÿMq������M�a9n���
kώ����
p�����Y
-�Z��H�_a��ۢ���4w��u����j��]H~��ǀ��xnIIZ<F^H��
~ԥ�i"o��S��J�%��N���3uw?�3�����.�͓e.9�ӔH]H�L_qܶ�
qKڙEg<�5`�,����^C�S/K�dF^H��
�h��ͨdm���:�c�mvNJ穹]�lw��f����[�7:���0�^�2�q+.o��J
��
9c���.
H�*����2YG�Ie�0_g&R���6��,Q�5l�;V��K�3K�dn����a��[����
g�أ��������$ӄ&_#��5�c4�'���*��}�ū��7<]I!O;}�Y?���k%>/TdS��M�6�d�*3@�w���^Te50��J�!x�����N�ϣ_Vg �7:~��B�&3�B"A�v�9ڦ�

�dV�+Rs��bD�.�7��󳣨��f����'-Tm��_�ʊ�{2�3�D�6����x��u��+��\�>���=�@�~��J���v�1��
`��
-N�5 �������w�
<��b3C��4�GE���@�mP�-T�����tNM�h�z�)ΔzWQ1i!I��F�^���Ϭ�K��v�Zh6C
-���]�~���=f9�齔�Y����07?K��-��=�z��X���h��^=&�pv9{��.=yi���U��*΄��k^��w�_�W�"</J���=�������W����z�r��'.½�;Q��c^���*H5���F�l;�gt�k)t���<;�=���B��z��͋#;ej�"Y�>,\�{g�au8<�gm�1~g2Og�0f)�e�w�9���E�/�s/1g�Wn�\w�1����s�������&�V���O��R��u��������v�)��63$b$��D�|��_��^�tѼ.6{1����L��]�m�Ff]�6N�/d�I��:�!��S�ýJ���&8�VD�������o���;��eEJ�dPw4q�s�)?l�{�GK6Uԥ�\4�sE;��UTHZH��
\7��g��S��u4A{6�P[�a9a��]ʮ����Pݯg��w�����ӹ�)��*�H{����nϴ|��?�fVigU��$��r����� G�Lm�'�p��^ٙ�ɏ�iK��gZݏ�(%�V��Ӧ5�k���Q�����X����*�&z��v�׼a�Q�͵ʜ�%pԢ7�z+�u���*e��
 �f�D�װ�NV���ѯ�ɮ��OG�()��4,�r��n��6��`�$k��|M�*e�
ˡ�<Y�������wE!�E7�;�e�b�~�Zc���Jo2��%�T�����O
-�F���l���>���Os�I.K�6�{șݘ�O�U/�|Hv�����1���ǔ5'm�	$mI�ü��f�4}�s x�u��JN5�Y���l������>;�9֭;�m��i���]�c�/�h9�"@���u��Yuw{LzO2�k���c{�����
��Yz�.���72o�(������f@���S4���4t�KZ��MV�U���m�a�{:3X�74��u_�f��`��6Ml>Yދ
<A�x�G�nI[E���U�?�F�?�޼�����<�
xV�s}~�ѝ&�<�w���d��g�G�,fIM�v�����t�<K�$�fއ��D�������N���*?�_�.&�qxW�-z�9��l��^Nxu%��{�X��Yo�l�;{�/+�e/1K0N]�o��ܯ�o�ù�?R�%d�����1�y�{����N�Ԛ���R�"S��d���d��5A�|ݤL�5^؞f�w�זj�{����ʩYn#Y��#zjZ-{�zd �B�d7XE@?u���rkt�0eg���|-߬m!�٢y?�\�u���ɜ3�'�ԕ��Wn�{��a�~TH�R
-/j�����
����^�I���h��|����^N���7�\����Y�ao��[�V��xbA��\7M��ƙ��%���y��L�L&�w�\�u�l���X*ɲ�B܇���a�i�p�ǦL6�)�|��o@!��_�����J�sO�v>���4���w�:T���G#�J�M;H��lذ�!�R�I٨@�(G�y�hg�T�u/gzh�&x�˽ŅiX�lmω�[>�1�]E���w]�m�U`
)=2��4����˥��*4�{���(���m&���
88U��j�h�(��u�Vf��J�&{J�*��Q��/cv{^@��+�Oښ�w$�>;���J.3������q��؟��24o�B�"`:�5�:S��1����u_�f-z��{�6o��n��j�ǀdJ��
-4�
���,�f�c��OZ�5����p6�a�a�����ݨW��XE���r4���N��.FҮa-�Q��GYބ�s�D/�L���`��*��siz-��?�������pmFq��p�fPG��)�����\��3�#V��B��L�4D'�{�����i�������N�,��Ϯo���$���4��s?���u���ǡ
��)��� �2�铬+�/)0(���J��qg:������-!��_��I�%se�|����疴���c�$-�PY
-.,�/�6�Ԧu�6��:Ih��5���N��.�6ߋ,�N7�e.9��3�������\�C=3�YH�l.{�
^?�
��i�!M٘w!i!I�(�O�T'k�T�M����B���MӔ]A��������Q�_���;o?�A����+^���gX��6�6:�[��k�/�=�T�F�S��ԅ��נ������8:�W��B�/e�KrE4�'�?��M�����������޷�������zk�}�k��MA����{�8�<ףr4�?�$���y���g%]��7����'����f�P�0G�Qiڼky�%k�._��
�)������������*I�� %W�S��޸�#-��-i!I���IZ<@�1i��f�r�b�����[���?�]'�u_��%{��=�ʸ^�.��yt������>����.�L�n��Ŧ�Nu������,a�����1;��%�4sNk�?������x)\J�Y�]7-q�����z�i�!S��]�+����3�{�����g�y ��
-Kh�U��K&�X����/_����s��r�^����d7L�����|޿�ZsO��$D@�	j���f�4}��ۓ�
t��	��͕�����
��Zi�D��h6?�b>M��3=��VO5Br��0@��5�&�I��N<���$-#/$i�o��ע��C�u�\�u�l~�d<�����sKZH��1�B�P�}y9��?�]'�u_�f�h6��ovZ��0xf�ָf	_��}K�;��Z����������N��T%k��d]JtJ�5��n� �q����r?��	oz����‰��-��g�wfH8�xnIIZ<F^H��
�st�LRR`��mb����	��:C��뤹��ټ�ۋ�n��̘o*�f���5K�4N<���$-#/$i��*��[��M,�F�Sv&�-g��ꮓ溯�N�_a
-�v�h�������Ԋ--2����Qio��0N]
-��&����IօMt�5�G�y�+��O2���ׇ�,WJN��+r��8Ҽ���y���G��h6�f����(EeR]>���Ȋ�Y����Ci��{j��۵$�3u~^��T���l�5�dz��_��n�>�|[x8��ۃ�pFˏ>2��|O<���$-#/$i�¥2ut��O��!�L�����]a����:i�����<Y�3U��;Y���������Vش�LЕ��f�sKZH��1�B� ǣL}N���4Y��|��3���o8k>�Pw�4�}]G���-
��"���s�Z
-s�e�n�~)���{���
-�/3�5�E�Y�
���Z>��L��P�f3 ��;�ܒ��x�����@��ꮓ溯�f3 ��8�ܒ��x�����@��ꮓ溯�f3I4���б�H���xos�3_]*��~���������=������&�e�6�2�閬+�/)0(���"W��Rj����8�$t|��?z�7�W���\�D^2W�˗jH8�xnIIZ<F^H��
y���o�n���B�$kS��͐�]A����뤹���ns�㈧��Wco/*�9>5�w!9zܞӻYٝ+s�g&;���-��7�ܒ��x�����<"$M��ۿ���)�k�z��[J�.w�~�y��+h>�Pw�4�}]4�K�)����qt�hK5Uڕ�D��3\��6�6:�[�I'c�딦M�Lm�'kob��h�6A"���赐I�E���"M��r�a�D�����ܿ���,]x뜲�&�����
x�.���;S��d�/�P*_s����,Q&����%�0zӸp^���LL[�Au����N�*_��
�)���9h�CS�k�^&s�#U�"�[͏2�m��y>��U	�%-$i�y!I�p�웃�m��m���N�������.ٚ�?�}vsh���h6I�kߦ��N���Nv��_���z���2�7L���,�sKZH��1�B�Dm�� IDAT�H�4mf���5ٛdm����P�*�͏��4���N��.��:�:�7��*+O�5�|" ���r�Y<M�����l��{Qq��:��������7IP�I�6������ov#��@DZj2V@CB�L�*��@�"��<;,��OBr��04�|��X��f3���؂y���Հ��ȷv'����.�i8#0L*A� _߾���n6�-���(�=
�)
@W��GM�ȷp��˵��(D�^����&l�0A��ff`����/�i�I�&-�6
-��$S�l�v�xnI�xnIIZ<F^H��ZjwE�7�]+ꎅhl6s5�����y
�y͆+7�B��n�f��N.T 	�
Ɵ i�����qH0#�5a�[.ǓC*i�	�A�*�F*	�1V�aHXE�2�"!A�'ḛE���=����FL*O�>��]��F%I� a��I�1=6�?�]>���$�tȉa�*�����A&����ˬӷF���gѹ�KȪ��.�*!$��3ǹ{�u�[k�Zt����ǹ�nI8J�
��DF�T��E��/�۫��|���^��� ����RaH�MBǒLV�pV��2a	�HH��=�$dՉ4�����X��f��sS&	}6$Đ
-CHlFFw�hrV�X�W���Y�0����ᤙ����n.	Y#	I�S��֥��l���s�N�
�$l2	1�Iط%Ā:��x$G���І�(]�6_f�i:��#GB&��،�H��"�XE�$�"��47�$!AϢ|W�\}�)D�3ߺ/����S���C�����؄� ja���(+�U!$�=�Ӽ�+���Z��o��Uu�~���������I�Gh6�D��$��$�{o3�����&6�Ym�B��z��7�f3��T�
3k4+���ې����IX��吾�E�l�q�����u}8+$�M߆,�N��J�g�2W�I��Q��
�����2�����A�
���(_dp`4��ep�吾�
�l�p��:�7�'����ې��E0�=I�m �f3I4�
H��@�f�h6�D��$��$�l �f3I4�
H��@�f�h6�D��$��$�l �f3I4�
H��@�f�h6�D��$��$�l �f3I4�
H��@�f�h6�D��$��$�l �f3I4�
H��@�f�h6�D��������Q8����峤����M���6��,�
 ֙�J4ٿpb���fl�8���qM&��E?�J�&H-%L`O�)�>��"70ƣlH������3wV�X>W>k�N�%z��QS���Px��p�� MIv�'����hz@3��Тyn�-��Syzk;e4�r���
-]̀Gh6C������k�X�WpI�
��Z��E&�¢nv�Y����f�Тl���V3��f����NS�*
-|:lI�w*w����|�?��Cd|��f��̗=Ƶ��Qn
-�]֘
�"fLU�@9���JŻ+t�L�
��;}�哪
����ݒ�_VD�H��Z���<6Y�����o
-�/��f��l��«���8,匬�n�k@^� ��fޠٌM\9�-vzcrd��l
-�Q��
��7;�3��i�y�m���)� ���J�>�:���f��F��"�˽���(��0@�?w����2��玦@�u�׀�*d�=`i�m��77�'�K�\�>��~{Β��wV��2@�?��h6c�����(�
���=
&3�Yt���x����z3`EM�����=B�72�k�/?����w}[�6�|'��)��xӗ���y<���H�Ɍ�n�l�#��
4A'm�@�@�?�Vh6����9�
@�?���@��
H��@�f�h6�D��$��$�l �f3I4�
H��@�f�h6�D��$��$�l �f3I4�
H��@�f�h6�D��$��$�l �f3I4�
H��@�f�h6�D��$��$�l �f3I4�
H��@��f���ڷ�.�`b���)�g�7ߚ���vZ]2�5�7D�og�ju���SL�4����|)o�t�,u�ʟ9��V��ǷDٶ�lc'���$��FP@�=
�m�ֆi:v*�V�7�k�o�&mUs/��l���m9�+6�w�@u˪��r
��3G�H���s����d�j6"��=�cv�]��v��q���\�	���|� ��;厧�9��L�s¸=�
-���I�FL�Z�r=?�����W�=�>����Zc� �u���T
- '���O�yVt*�������]��W>v>���&��	���ݩ�6�~�%������Xԙ�ݾ��~�F�r�
0��~b����NgPh�ͅ8��������K�Z�B�mt������>��%ڢߐbO�)�tf�3�-���o6���>��|����6
l*<�}>9�`^���%�Y"|��0JT���}+-���N`طO�:��N��tu�~	� 3sɌ�H
l��.qm�s_ba���J-�i��xݷh6���í�m���F�nCfj����̨Jl�l������ǀ1���i*<
r���ޝ.ɪbaƎs��l�p�E1	2}��ĉ�ڦ�JV��L<Aj	`G����ڝ����u`��s�)��#_0$h�c�������M�6ǜ��I[9��*V �|�����/g:��uWM�=�S84w�w����͛͗+1{��qu3����g�Y��K����^<��q���[<��E��
؋ľ`"~{�$����G���	m�w�(����
$�Q�1������<��=D��}���6��k�ş���1�w���^�����3�9:���u{�ڴs���z;X0%=W�99=���T��F�ƌ�����LO���M�"�]����vS��ћ_o�^���GN�Wx}	�?�0��O��᭞�W}&��{g�w��
3
+ߞ�G%v��H���{Pf�!CP��z���g��i~`|��������2v���m�����;��z܉�{�u9@����3����߱s�a�^��[�ڙ��;��%�|Z^�O{����;❚qFI�X���9�GM��I���k���ڃ��
$Moc$>M_�T��ݧSV����ŏK��_=/g4PI�\���?�b�o�T��P�� �
-�a�fgU����a���fn�6����W�=���J6�ן~0�&���\a�P�v43�fTF8�E�ڹ�ƺ]�1��9�S����e��:���QQ����d@ˋ3�S֭�y��w$�#����@Xg��׆6컪������s3k�� Yd�"M��G�D�`�6����K�Z8�mެ��S=�2���#���)����V��6�k�^�D\�^~ϫt��u�4�2*��b�����Ag�]���g�J��w�
����ȬGdH���H���&O:�����f���DXO<����w���>"Cm�o@C��^4�ͨ�j`DU$�?w�5�̣��4�2-jջ�5����]3s�~
�g�������m�S��u+��f�C��xW�9�F�-�?�j�
�V�e�Ĩ`Ey�nG,-��i$C�fs��~t�I��E]�
����ڤ~L��fs���9��뱈l`�Gj�-���t-c�t�|�.�{��#Y�q�%>��n�y<�g��S0����9�==�w�1�X���2%<�|yw>6ωP$<��p������s�y,���λ&��	���/*����Y֪�d�8�}XE�Z�!C��������r�~ld��e�sRC,m�J�!��wՇ�\�ȝ�"��~�$Q&ʹP�̓m�8��P��N�f�sg�m"���D
��)5��Sa�~�X�f�TfP{q��t�S0@~k6v����(�^�-
�F�Y����DXO<�1��m�lkoB�]lV�Сy�hFeT#�"�����8��m�j�;;��V}&�ƺO�+�U�����y|�)Q�g�,_�g��
�)�N��QN��e�[���n3��^�
�_�5H����7���h6����Ee[f�70�7��3S��WG�@1s�3��|�M�GWm6;�
ϙ?���E��H�"9����"?S�źc݋��1�H\�>�y�\<��Q͹s�����1���Z���Ծ;�Քе���.��?oz��6��r��J��#G<���W��v.�qhw��a��/]O���-�v��*���F>B��Џ�'�"��U�&��k"�{���w~���NlN3���]cݽ�(?k����9dH�4h���,v=��p�2�o���S'��x���n%��N��ɯC]�]�r�q��Z�~`������sr������+����f
8�ɔ�e�f'G'zbg>��ߦ����f�e^H���(������t����f��!戰�x���K
��ŏ0�\Ӕ�-���
-:4�ͨ�j`DU�U`wF��>*}���yp8��x�y���˪�d�X�It`i��<s术����g���8M�D�o���H4�[�s��O/TL�E��T�	
`��ɗ
�1�fr�~Y��}�u��,
((}oslf�m��G���q\���N��߉�X�Ef-b,�A���*k�M{����E���?�����"�|�}�Wz���c����%t
�_	���TRᕖ0,�Di����S��G���$��l�Z||����7��U;��8��ԋ�g�����wW���E��i/�3%�5έ�~;A|�c~��'�"��U�&�5�b���f�pT���_����Z�݉���\��]cݽ��&k�%d���Q�C�ZA
-�g��m��Hg�����v��ې�v�n�J����
,$��:��9��*�ʭ/�߱K�+��d����2_�x���Y6ݻ�u`�O抵��4�?���9�;�x���(����P�n��wCkW�C��F��;q��[�����f���zl�J6���*[�j8
�F=�
vb?�Vt�66;�#h6��J��7e:������_�R�w8��h�њQ���\�Q
V4X� v�G�l3�5�i5�E�8H�j�Z���c�0�	�q���^��=a��?Y>Ҩ�������MO+�h6��p`��!�4��)��&p����6�N��Yk_)���(B�Y�z=�a���t`���/uL��]�
8
�F=�
vbZ������i��ى��f�}|g��l���Xbqg�{���Wd|`�,ܢy`��a�,���袵��o��u�E���'��Ŏ�9�U	9��mx	�l�zfzx�?����)��9��������V���M�P�ݝNj���C�q�KL����h@x���ッ��
?s9��uj'>.�$��vW1��Y��?�]l�N�~�9t�Ǚc�:?3Ns���M�[��n3�����/^�&�֏W
�K��4�
u�"p�0�6r�lF1������
���1f��h��gu[7�1����9�}h�њQ���\�Qu��d��8��.�_Є�j�+�g����o��`�v�7�
�4�E; 
X�>�zL�IQ��_^.��h6��~�֏Pܬ
{�Th�3�i��|ie�;Q3���__���
g{M������	4�
��>}:��~n:���f3�
6���d	�������Hh6��W��7x�h�z/���7��/�E���N4�hͨdin.ͨ���SssiF��h6��
�zl�J܀�)�|���mC�Q�l���Z���REe�?�f3�Q;`�ā��v�|1fp4��O��Q|�o�D}o����v/����@H0K�J]
�
n�{řy�����'��.�#�f3���$������3�U���9I�p�l��?�no�|Ժk��J��u�2Y�Bs��<�5�2�����������؉A�Y���cV��
������j��+��@o���l`��V���"��H�����.��7��?B؉A�Ũ0��#��S�;�`�6F��;QV������o��#�������cN�1���w�Y*WI���󻿸3%�E��2��!���ѻ��q\�!�O#8O&�>��H��;-��>b��E�E%>:��]���*=D#��y���E����3>+��M��������ׯp«�h��b�5	/Q��J�K$�t�";W���?Z=��r��Z<<C�-�G8+�`]j_��:K�"��i�=�ygE���G(����DUD30�*2&0?�?M�F�0�g��2�L��fT9>z�Y���D���#TO,�,j�Ч!�4ٳX30�*28��ꈨrV�S7;�h6P������	Z�J����_����g�i�]�&h6��ok��#�Z
މ%���/�d~O�LkTm~c|�f���/���W7A���t~���\4���1G���#��
-��לs#�W�"���
-:4�ͨ�j`DUdX`w�8g�����P��0|�Z��?��;�#Vʬƺ�
[*�ՋN��h��JG�F%*��b��
�u�n��I���[�s����a�:�)h���V�7���{�,��`
E��n͟p��@+v�j�$YW���By�r9#�~�f��}�at��o�1>��e�V�m�l����>��p|x9�OgP.����[rE�4�W �!�C�|ьʨFTE&�x893�����b��ىA�Y��S�DXO<¹����lS�ߪ��yL��ج!�C�|ьʨFTE���Ӣr����Lh[�d[�f��(��Ƣn�]{S�#�
-/����N7�mw�d����@�Z�J^+=;�n��Y+Z4D������(\$Q��M��9u���
V�
��r��'�z������>{�9��|–{�D�|ьʨFTEF[��Ж��Z�Z�����f9���a=����
�%~R4�ͨ�j`DUD����Z�c�]Ӳd��E�l ��t��@����}���6�%;�����ݿ���0Gx���WcbE4�
h�O�:i�1f.��`7DW�C���f+���ۯW��#ɚ$X/d~���8]&�W4���?�O���#�^���ߔu1�wg��_M���B4�ͨ�j`DUd@`Ng��G��n.Ml���>,~_���Z��4�g��Z��nR%$VA�S�������GԷ��U�c�55�}e�� ,_�n%�ѻ��q\`��0�K2��X�EF.�D�m�7%�ډkZ�Z���?g�1
��cz���j���3>+��ͫ/�Q}�ۄ7廋�׵��{Cf�N:6���lXeF���x3���.RB��W��6�k�^��éW�S�����\�l��j�"TԟŮ��Ξ�۶��z��|��w��X̺�������Y�{���.�{��@_cr��I��}�U(x���>�I[�~�"�'�xx�ߥ��AD$n�K��ˀ��E3*�QX�	�n��"�S�"{t-�f��~DXO<B���
-�l��6Dh�/�Q����Ȱ�&l���I�k�Gעh6X@"	��O��`]����h�$
-�:5��WQ�r�������6˹�@ҀT�G�y���q�|o4�
|Ԙ�F�^�Z��h6��|��G(^"�\֦����w�&Q��,A�|ьʨFT�~�� IDATE��*�㷭������Z�Z��ѵ(��r��'�z�j����g�#v���*�e@�����Q
����LuK<�����11��]����f]�����3���X��p��g�\��WA���f6��N�s�rwOI�;��`=��:
��.?��A`��Q�v�/s�k4����f"�'�xxA�!����6T�F��^`�=�5#�"���Q�D׼����b�a]�G>����u|�a����V�W��+��O�
�^�d.�%�g�끏�;h�Ӛz�k�����֭��@טz��
���_��MB<��`mK�`��7VW�ty?G=�~]4�Q�'%0]� ?0;�40�o��
�;�����@��r���
+}p� ���gdĶJ�v��Ή�Ȑ�;��,G�)y"ܞ���r�?��{��+�H��8�:G3*�Qm@ss9Q�9=6�6VD����a/p�$�jא�I�1�������#�=�I��d��V?�Ӷ˴��̀�lF1���v���UǦ���h܎%�K#�m����`0g'6ܥ��>�C�Y�z=�a%�
�?����E�!��P�l����M	�4��h�v`#��in�;�G B���������:Ѭ5�����4��b��曫��(O�Чl4�
�i
��
�m�l��Dʩ�Fc����[8I�L
�����^؁Nh6���s8���݀v�i�5��E"����Os'jF%��\��_0ſ���;�m���@�o�Y'��'Qn8x��2����֣?|�~��Vـ��}�Uy���K[cȡyFkF%KssiF5����t�ps9%]�;��"�Du�S{a�m���V�bq��@�
�
o�r2>�-��fz1
���VG���D�y-�? �p{l�[�X#%K��=����th֊�Q���\�Q����~g�MX^\e��NL@�YO��cVZb���=�lT�
�!I@�u5�؉i�~�O���{	v_��8����z�*Osx�)�3��b�^(TİW�$�~;�rT�|����C��w��N�su8O�G`�4��pv>mRk����~ƺb	ڐ�
�K��ɖ_j7���l~.A����m��5�ވu&��j̒��
9@HQ��$E��ŷB������N����A������
�<���,���H�|�|/ �~	Z�V�hF%KssiF%Kss�F��W�&��p�yWK���6�$�
�1���>��\x.݆���;
�|�u5r�7P���tA?m6{�3O���)]\a��vؔ}�"s)M!��N�"�<���'Ν`͌�	��돌���m���Tx��t�{�I
���>^l���������;���~��ď����_���K_�:~�p�߶\�K=�@�]���]ڧ�5����X��
b��5���%��y|��cCe����S=��lܻ
-\����n��]��)u�
B�U�ÞQ�ai$h��U��-͑��w��#��&�l�l�;�,z
���G(^����Q�
��=�}�@{$h�ZQ3*�Q�,U�Z巼�-�n[
�5w���@;
����_��G(�Y��6<�@c%[&h5�V60A��J3��Q�g�VQ5O��;q]k7�
|�i������iq5�~@�k�5���)���
v�r��J�����&��K�#�U�",2r��$.��,���O�H�
�_���O�}���b��G�D�`�6'QN	�G���M����u-|��^��<<�3��qJ8?m�ݭaM��?3�~�&��
-�m���U�2�q,;��qwe�8D�=g���ᤕ�XTԟŮp6���8�h������Y֭�?z�Y��e"�'�lx��X��`ԍ֛�H�6�Sd�2 H�|ьʨFTEdsǟq4�����14XY�7w��WA�Y��"�'�xx&'��_�r^Kw}���^th�/�Q�����l`�ON�!��d[�f�Ιj��u7[����e�?O�Z)J�l���o6�u����7m�ϳ��eh����(�/��c�-�K�Eb��.�n;�d�Y���4���u����x[}�M��hS}�����������)ر�ƄWz��.��w�,���{����Pf5�
���3D؂x���������1�i��rG�1B��^6���]OTE4#�":�9�,�]��k5�[�:]T�mu�-�e|��hӌ*�G�6+�?����x������K��
/�:4�ͨ�j`DUD$0�ޤ���f��+�\d'n��
��`θ/�ڟ�IGV��v��n8�e���??�&���"�>���6��[�������56���#|1��=�����)C�A��:;���pDw'��9���E�Y��sDXO<B����rL�m�C����20�����Q
���L,�~�����f�
-��_
���ՂOt�>#iXE����?�7��i���[`㚌�����L����h�
'�
5��ޠv\��������a�7�弌�EXd�"K�i��������a[,���b�2��3tΑ���ˬ^f�0�p›R�B�%J��1�s����(���׶��lE�I�#�_�Yv9�6�k�^�>.Q��~{�c=?l�)�������W�s^���U��I?��=��u+y^@�%�V�P�|��<���2�Y�v��>�I[�~�"�'�lx[�v��H?�?d��M?B@�����Q
������>�`�7�����mU���w� ��r��-a=���+���s��x�m�W�^���2����Q
����&��zl�5�ىm�I�J�G��1��� �q��8/�~�Y��`k?y�F&K�N��;�t!4�
,曹ĹǞ�������c�M̶$��h6��|��G(^���ݨ~��|��E���20�����Q
���h6+�t��ST-^������f������)�-�9�<�D�z|��{��,r��z�Xl�L
wk�"�A&�on`m���M�ȥk����<�[,x"O9��9��;^�D�J�I|M��L%"��$�������l�yN<�w���N���x�m^}2����d���S�yxE����W}�t�D�`	w�k��8��yڞ�9���I:[�gTԟŮ��[[�z�_v��[����ğͭ[��n3��)Է�1�|�����;@����Н���3����� �+��,G��?��P<<C�-�G��<_4�2��U���L�'��d[Ԫ��k�ۥ��~\�����O:M�Qvz��AE�Y�z��Sg�K�Ӓ�q�]�V� ׭��`avZM��]_�x/.(`���\2�t4�
`Yk^� ��o�����?~���Ȅ����h6��M����3�;~�������s�l����>��P<<�a����"|{Zg�4�ͨ�j`DUD!���߅
�����d[�G���q\G�}<9'>�����``����;��L�T`���y�[���:i�b���]�\���vM�y<�KגX$�{e��
{�H���#�c �ҫ?��%<�/S��O%���L"]#�KV��ûv�z��iVx	�S�}�9�eƓ(���󾕽�`	��|}�nfY�eV�Xv7�����Wg����o�>�i�(y�ڢ��,v=[�����~�iw*�y���l����u+���m���/b��z�*���[���
���S�ɧy�y��7���-ݱv�d�����K�1�f9��:��P<<�dF]lX�l=#� �m%��a��8����N�f����DXO<B����5���6�O�֌ʨFTE�S�%@j[����wN�Y�P��c��#h^M�R֋�z��Y?9��'�~�f3���D߶�k
�1L���4s�ܐ�B���U�h6���`:� �	h�:g��m\��̝y��N�x"��r���
+��
��S��'��6��
��ɶG���{�^:��h6��W����
���t��
�
��]�gtM�	�ZQ3*Y��K3*<��D�h���-wr}W4�
��)I��]����z�T����7Ef���O�=I,�b�NA��$˙�~sĹ��x�E���0Ծ�q�Z���1�"gu-ad��%^��ŏ��m=/�N|{|����ϟ12]��Y=�j�C��y��Y�Gxr�z-l@Lw�W=���%�����[���t~$��r�,���
	ڨ�zͨP����;͝矿������m�񇖓�:��=��6_��J���A���el�J�m��D.�NrZ�Pi�`U$hAR��a'�O��
-��h�f3�
-�C���7�����ѱ=9��s�Grh֊�Q���\�Qɒ�Z��/��`7
-�K!�Z<�F�9gtA���tM0�{ǠU�`RMV~	�&�l��X;~̎h4��L���߀Uv�v�RhbtM�F��/'h�/��,�ͥ��{sen�Yײ���f�x6�z��Gc��/j�9��h`�jak�|����3uY��j{��S�8Ο7���Һ��_r�"� �<�!*ݻ����k���v
�}<A�V6��5���\uї�+��u�������s�Y��s�5x�4)S�ګ��v��PH�Ch�m�����s9�wu���tm�5
P07Ւ���,G��nO
-F��Ḁ=�9F5*Y��K3*Yl.LD�Y���
+��
��0܉�I���sQv�f�� i��V���`'���
��/9�ܳ������E��b�����Ҝ������z_N�$�
�7p����@YNs0�vWZ�fj4m��G��B��6H��
��/#�a�L�׊��Гz'�^��N�握��NH� ��ߕz�����a=���3y�ù-ͼ%�W
]���fTF50��@���_�q�71�
z|M|��|�u���s��>���c�EJ׸�"�<6O۵�,r��f`�{)�T`&�i��xC���xz�ӭ�"w���
-�hS}������N��=�E�+M"�?�/azx��
���MϞ��;QxB}���o�e��񅯞�񧕜�W�Lٕ�=$���ԓ�_������M�@E���>b�H��k:�މ���]��R�uZ���q�[�k
	��ӝ���8�B�H���~�t��l^���a�l��ࢂ
^#AX�޿�7"Ӎѻ󼖏>۬L��>��P<<�>0󪈟����!�����[/:4�ͨ�j`DUD30��D���՟M��>��P<<�7B;������O{��5k2��Y�M�jd�b�����f`~T
-a^QM�$��	5��Ǐ�<�ц
 �#N�+���	Z�	
|S8���H��~�����w2�������9�	����#UW"����i5�
����0��V�֊�f������⏴�_��f9��ވ��x���/�X{��{�lF:�lQ��D�Ӭ5�2��U��ģ��X�����Eɍ��P���<1��G���#�!0×����Q
���h�D��B)��~O���j�7]}�V�Y���/��X3��9"	����5:i؋�}0�\%ےɵ2�l�f3�}���!֜7��9�'��~�_ +��,G��1"�'�xx&aI��k�!�s^<��jTF50�*�XMT�3���Gfo�f���Lj��x���"0����Q
���h�&��-�S��R,;��`;�)�+Db����u!�~Q�J�2ߝ��8�h6�Yf��ND�V�u��"�qN��E���9��v@�J{�%!Ҥ��
-Y_"����VA�Y��6"�'�xx��]�փ��c�
����fTF50�*�XNT���V�'0�i�B�Y��6"�'�xx&�q(d'B�-
- E�VԌʨFTE4#�"��-�f3�O��E��ۆW	����'�5��J�����o����m�N��A	�<_�tq��Z>�l>�����4�=��E��H��,�"��d�-��D跖�����v�]?�b�@�y׼�S�������K�������V=r��W���{�����a���g"�U�is��8�;Ϗ_�w�v_:��f�"��ݛ�?щ�'�"��U����_��éO����󚫉[1����U�C+�G�6+�?����x����#ym��6th�/�Q�����f`�����;$kn+�70�iף�`sd�(6
�=ތz4�
lG��� ^�X�����Y�b"�n�f3�M�n,ke���,
-@��wP�WR��J��̅�J4���1G���#�dF8����`��7���d�4kEͨ�j`DUD3�;���9{�=�me���~yըu�:�Y�up��o�j�w֔���(��N��!�G���,v=�L�������o�PK�."dİj%��f�R����
-�@ڻ���k<g�2�~��f��ʻ�}�I���x�mћE�ם����G�ͤdA�``��4Ɯ\r�2�2~DA��Us���L��<}�����f�!%�i������P<<S���W�o/�
&@=�
-���hFTEd[�w��ؘ~!�xx&?��0�^�g@!�ꅨ�h�JT�&X�n��r����쉒�V�f��F(�e��C��/�l��8m�"��
`���7S��-���D�6Xϊ����*^ߝסᏲq��=1�ڹ��w�<���fϖ�w0r��S�Ry߸�hb����Jq-��̓gbi99�N��;���W��=}���
<�P<�"�޴��
�Dxf޶D�?�9��5�=�=�X	�n��S%���r��i��"1g��*�Y
U���Qͺ�����{���鉰�l���M�q�L��lc߅����_8�P<<��yν�[2h�����	�g�x���?�S.έ�t�N,����gm�$BTE4kU�#���j��2�;q]t�^��t�x'<��)&�b�nZ��w�O��8��üx�ҧ�,��</���������	�<ڃ���
ݹ;1	��MX2a��?B���A��3�̳Q2N C�uL�6��_�D���	g���c����φ��uQ�?��t��>}�����j�q��eb�0�zq�J��U2��Fç����ɓ��:eF{������ӟ������܉��k�,<�>��9�J����d�"w�iX*�+}|6I�m��Mf��K:�c;�^�����Ϊc]��g��W�U���&k��w�`+]0$}4��'�����~(���R
-���� ��2��&z	v����7f�?�q?��J���ۉ3��4�h��@��x5?*���<�U�f�d��xX&����M
�t�E��x�4�?�����)�3�/�5�Qp"7<�Y�ڱ�a��y�c���ge	�2qQ&c��n�:t�=��%��0�&�
t~�(��_�ma�.v��ۚOs��e;-gh��w�N@ǀ6�G�����@�q�)���)Y4�?�w����I���ۀ���r���Ǿ�
]K'A�??�]z'�r�A
�fl�#���߀��{Q~}̉Pj3���
��fjӌJV���[Ru�{���h��k�E604�
� �3)!�����"�7��u��F�h6�d����<���H\$��^��L���
1�h%�
������):�k�ǗgV���%�)�38����q�}��rh~ͨd�o����s�uIgE��۞O;���ċ�3�͝3]|�d�:OL�5�(u���*�o�{@Uu���3������e9e�ޡX�nE;��mN���/{�ӟ��ϕ�<��e3W�M�P��:�C����vN�'�S ?�$㻄N��^�h���N���J�0a��w��9V���#s����ɤ���i:xM9���������?�S.��	^��N��Io��Ux{��[Κ�kF%�ls�j��?b�fse������󱝃�fmQ&v2_�5nsҰ����M̶A���w8˷��=��9��]߿�eb�vbה9�oz�ħ���_wҮ��m�V����a��mvf����8����?a�f����zWM]J�}�D2�3e�r�+�ƙ,ِ��YeٹR����m9
�76ʼn�5� IDAT/������?~5��wO<%n&WD,���n6��l��ô5ɸG<9G����a��7 �u�j���b	��M"��Π�k��bM$�m�����_8�~���Y-kF%+��^�����x�N�/�����N�cy�7�8N�˝�k>����7�����4L���<
�UC�zE��_��B��m:�6Î��n�k{c�O%���N��������e��+h|V-؉?ݸ���c�p�9�O��I����I�ɸ>��|�jn����v8�PY��sʐ��F&�U������v��D��ʧ��w��J�,�^�?������2q�@�@��8���;��p�y����2Wfbc%�י2�H}�@3%��κ�{\�w���[�f8`�?b_�Y�-��8��2�n���B#�/1t%ڢ\,G;���2��ٯ
-q��-�{��?�Sbe��ӭ?���ڃ_6؇��oG�"�ǷXd�E��7�;o����G�A�������6��|��E_#�dO|T_B"$�k^l6���~�w)s޵�󊎣x�O�f7vbI�Ex�_����}���j>�#�����;;z�-����6���nu�0�4��ǿ���q7�c�]����o{b�S��~F<m�>kV?��.A��m�J��==5�֌JVls���3��d�?sV�߲���Ds��E�=����|�����.�~�v
`��[ݗ7�}���:)چ�]�B,4 A_�S���V�儻����{�K0�9���٤�|_�6�* j9`����p�{�Fo��#���	���h�9(Ώ%�m�!���h���XJ��
�����U�����}�
-
��{Nj���f�#c�W���<�
�NZ�38�
���K��I��bX�d���"��9kdl����*���D����0g�Z2�XX�"��n�����>�&��J�4�������g�k
-]���t�K�����G�C����
-��ou��а��O��zM�hE᭞�WʬƵ�q�(q�*Q�a�Pj/��38�)��� Gd������C�X_�s�\�����8����+ۍO�:᳦�h{ն&��T$k������9e/6��3<�o7y��A+SV���C���z&r�y������_}�/�+;��gȌӟ���?`g��Lb�V�9O���J�@v�n��M�d�N��}�됲�։ノ���t����Ѯ��\�����=������g��"tl�t��N>���k	e�ĥ��R�l@���_}�s��G��@�_Vl~�����0B]��w�Q0^0�9b�y+_&S笚��
��y��e'�_�<̙x��s�8�[�R{O�T0�h6����&��鴋=n�8O+��,�
1�����3o#��^D88���e@��L]S�|�Y�U����.�n�l����c�_>X����ݏE5���b\;?��+�'�2��\{�Z����	��W�x�싵����"�y+������.��	ןP�n����E����}Q#a��v���ɍhh�~,6���=�ۦl�Ա_�/���GE%==>,��g�g�܉�ó7Wѓ���.�Mx������J�`px��w�+I�%��
�v$Eװ��/��<��>�rf��O�wW܋frܧſѰ�*��H�Y�OZS�{�q�o�� u�gM��v�I�x,�u�6o�r�tR66`���Vt�P��t�{�{S��]7º��'�����;T��e�;���g��^t�����^���z
t�� ���DtQ����d}ϖ�ױ��Z�H���U��ܯ�p%{�
�yJW��'�
-\ǵn���p�v�y���_ů^u�G��mcNR6���p�[Ѳw����^!��Z����/������P<<�o�c��"�I
-���
-,��5c&�"����M��,ʧu�n+�:�5۴�I���{_�{I�"�x����+�Ϋs�r�wB�ͥ��"ӯ2�b�#S_T��W��D���f`�fݼ��V�20�/5��7v���8�M��cl&(P�����p��
�m6�Dr�]f����@��TP�m��gOYj���� c���8������C��%Ϋ�bo~{�9a�5P�������,�.�"ƨl��"?S�7��Z�
���&�dO|Ԥ����O0�럩q���ׂ%$tڹ?�QV���|u��KG^_���W��eV��+��Ύ�ޖ��h:�^��z�P<<��u�:3�'�c
�s��}�
k�[����:�gl�?�lH� D'�s�	5�9�zx<=5�_�*�X:���SU����V��SoH֌*�6�w�ȣ*��Q<B��̨k��{�9|�}�ݙ��q�~��&�.���38%XN�J��
-,-V�$�"��U��E'�\�7U�3��4���?�S��V���=4��#��R�a��w�3`l!h*:2��������w����?CA��˻�d�n��`�kR�?0�q����Jv�
�;:);Ҝ���F��If����w���d�j�����b������s.�a?����g���AL�\�VY�N�v��n��S.w�Lߠ�Ě��fy�~��8����l�2�Q��eb'�=^�vҰ�����l$`L���-���������N�����OA�D{P��o{{�I�v���ۋ8��O�r��M�q�r�Bh6���J����ϔ�����������͐�� �P<<3<��Q_D�7MՆ������`��`3�t����<����ѹ4�Q��(��l���hn+#آh6O���m�*�k	�3�� �_G�G(�i7ʮ�ֵx�mL�>Z�q�]�I�A���z��`��{�7��O
-Q������(���$����83�Z]�����6H:�K��c(���!֎�]
O?��ؕ�i'ۃ���Xr�W6�1���)����~�0�A8����2_��J��������_,�"�,��}z��s�gx��ش�x���Y<�����ũ����'o����k���h�_�ŝ�'��|?!崖���K�|���rb��_�_	]�Zx�%����v�xx����߿��=��B3��S����C�4�9]���N���`����?���;�W�d{������ߦ��8�9s����pxF��Y�r�Y�,�9H�XQN��`�V ��]#?%�W���0$�/�&�xx�$B�,>O���S��n�:%�
��5��@�\(j6��� �"���w���Gׯ����j`�Q����5��s��?�5���3��v�oC����Ea��� �"�����g�1�me�[�揚~"Mߔ�Br0�B�]�C����`�F�k�mƆ�G��P<<S�qԽ��~�2iV/DUD3�Ҩ�\4��VF8�Eq��pZ<B��L�;?���m�����g1{��� �2�o��?
-a��w0r�C�jV/DUD30�*"آh6�)��ĉ�+g���9h��Z5�k�/��`�������ȹ���8�p~H8�6�ZG�X�ۑ�
���9���I�{�ӄ�)�n��S쿝ܜY�?��f��_'XH��,�"5�dU��w�d�E�m�%�	귥�_���9:�T:�Y;�dO|�PB��{~x��D��������?r��{]�������6�ɋ��!��K�}���6��o0*�t��Q��@��~>��+��Zp|͎�>+�����:���2kƲc�N�w	~��	��;6%'_	�7�{
�~p�jX����?�6��-����Vk~i
�u�
-&H<B����! "v
:8���W�I�����v��ꅨ�hFTEd[���*��L<�}�I3*�x����_��,Xn�m��s���'O�zL��
�`�������=K�O�z!�"��U��E����50�Nƕ�8���{�`���Ћ�
���ng������t
^(O4�c��
/�lVKƉG��S�3�5p�]N�o?H��`�xx�Y����Eg��3�/3��-<�@ub" �f�dE���o�����5���x\@?��q�������2c�������#_so�DLD�y���Y�xN��2qQ�����x������;��f�!�z�n��V�y�m%X����6�
-i������-�_y�G(�!B�1�2i�
-�
-���hFT��f�G�>éA�f3�O8���׋
-1\���ֳ�S��H�ى�T��vU�{�Er�Ȼ cK�n=�}伄�k`�-�8��������E��������sj<����02��kx��ח�V�c	���/��v���/�����~]B�n���4��`�
-�8�:�^�hC���k!�KY��T��W��3�{��E���A�/:d���~
��$�һ�2��H�fj��\�g.�B��@M>�[��� ��$�('�ڟ�S�N���U-��
-�`�e��
�������L�vl�}Y{8��9h6/�1i���n�:��8)<�^�Z��"�%w��d���bZ��ɼv��I�vi����N��WKى�l�Z�έ����5�Bs4�'K����	6M_t�]�v�����֜���M��
�&�&_*�b����!3og{\��L��Ԧ.Y��a�k�&����	�F��d17����r�‹|�xf�~����ߔ{,�k/�`?s��J���
'F��p��!�L��ڴH��g���s�	^/*gE��Q3*Y��K3*4G�YQ��K���Me{�L�$�
-�k7��'��e�N/�(3XB��M�Ʈ�C��x�f�?��gp>NdG�d��vpJ:ޭ��VsQ�|lƓ�
�I�mv�O�N;���IʦW6��l�,��S:�ڳ�7��.��_��^9!�-�5����
���S�)������l���/��R�]��o�x֬�5��U��br���ď��n~�8P"}���N��;�
�~^'Κ�I!��Y�Y���,M�tN�n���h����V�fӴf`'Yws�ov���O�r=���.�8�׹����<��-m�|=��oͨd�_1��nxb�?�N�Y�;����@�H�	x������H�K<W��3��f36D��J�pn�y�yW߆�)�ղfT�^�\�ozTX�fl��d�؀�؆�G$��M��ď��f�)MQ�I_,�4�6�܉�j���f�������x���_,2�{���.r����8��
-��gl)b������ߝn��}�X*���
-��*Kx���ķ�Zx],a���ꋳj\;l������ߝh/��3�H��������U����+�R@ב[y�ݧ,Gko�	�5%G�1�S����o�4Vҷ�d,��g~�'b�S�e��Ӎ��k�V �m�<��9���_��_��[�NiE�u��8��q��3�)K<B��̼�_ݬ�

t��"��Ÿ�����X*���Y[�$�
hn.ͨ��6/&x�������9�[����N~�s��$��X�����!�R�W�s���'��pO�w���9���r$h*�|l�
�?�f�?�4���q�L���u{\`El��u�Γ)�xTb�w�^�6���`'b"�͓5O�c21i�:�6�%7*@����<yj�_�[u��yb�ȝ'��3bh6�x����d\����i������_�C����c]��C�
j0$��������O,�C��
-qF��ӭ���jMʱ]�#�TF8��m�
�/�ӱ?Ζ�gc��w&�I�v������AOb�v�,�Y�U�����l`��n�d������N�������ж[���s���]��#�a����ȉ��}�YZ�l���G'Ѭ^���f`DUD6�E�l*����)��19���u�F���H��N_
-���L:���=�x���z�Hr0�pH���ؐ�#�	���g�Fx7��3�g�,�ꅨ�hFTEd[�flH�^�x������H!�4�
,J�z!�"��U��E���q�y
�>�"��H���ޠ�
l����X1�֍3����'��3�[�*�aD
�f� ����L<1
�/�nU 0/���;K߭�d�;��q�pgm?��sU�[3�-g��� w2;�ӝ&t�=�����Ni�3q��aL��}G���3u��r{oC	~Ҍ5��3?��)����>g�Di��%n�ꅨ�hFTEd[w��G�\�~�<�4����V��"�%w�t�E\<B����!p{��/��S��E����8y6��궛�&Ԧu���/{�~����Y�U�����l`����Oi^Ȝd2~����S�l��n��sp�då/,����`'�`35��s3c��/v�����F�y��ɸ4��?>�|�x��s<�,��|��Q�S����gg����Hp�E�g��X�|��f�?��o@>~��_db�7��v9ؐ���nE��=�r�s�����c�d�p�lV����g�������ݽ�[�`3�Ft���[�P<<C�-�G�>N����7��[�3�HpJ�`F�K�Lܚ�Q������(FҞ���$c[l��3ɷ��Ǖ����+䔜Y�=ۋE2U��f����K�7=�X��E��U�ȋ���^K��{���"/j!��XF~W�]�I��t�w�w�܅����:��gpJs����N����{WB��+S�;��~28��N�����Kp`'f+:���z~��E��|��1�w��O~�bP	_���5<۬�:�*s��"M�D�;���h�
-���_tv~m2���>mf#3ƵH0�6�#qL����mƆ�屢G(�����U���!DhV/DUD30�*"آh6cC����#�a�X�f�BTE4#�"��-�f3����+��l �!�	�Ϟ��:Dg����ٜw{�^)q�,08�@K뗩My�v��Nֱ���
��6r�畨����7B�%s|ii��vr
��S�VR��G(�!��#��k�Lm�&k�l�3����S�f�BTE4#�"��-�f��b7��G�rl��HtNN�K����g�D��p��6��]�6��\�Oى|@�֬^���f`DUD6�E�I{�DO��"��#�
:z
�	6��j��ʛe�Br֒yQ�|
�h6��Si�|���~
?�d�����C����Ri/~1�Γa�
�i���S�N/�F��h6+z��r�싮Y�稥ze��A	,$�m5O��Fif�8�ؔI�`?e��
����	l`>�]�N'��4�f���N\V��!M<B����!��]�.��Dwk��)[�z!�"��U��E�y�`g��!~F������qV��f�u�x���"lA?B@D�L�8O�up�s;�iV/DUD30�*"آ�x�����T�
-��a��#��8���`���9�����	�u+^@�	���
��d
�h6E��:�^7¢�Y����
ɔ|
/�lƆ��֋G(����~��;��iV/DUD30�*"آh6�ԧ)]<B����!��z.�ꅨ�hFTEd[��7��"Az��\�|�>�5�!����q�`����~=��9���$���G9g���3�uf�\Į�/m.}5K�W�l��u_{�;�l~����{dⶵ��L�Z�
X�m�q��7�3��`71=��{���+�{���s�x�>��M�
v�G�ln �L�%��d�6�KÂ9�ʫ��,���U}-w����d���^��6�t�yR����l��n��N��"��r���vv���9�e�Y��hF%KssiF��h6?�s�n?�K��ıLi��'i'y�Ͷe�rx�XQ~88gz���bE��b���'S��Nj��V���S���yc
�l�'3M���$��L̔���w�
v)w�;ٚ�n�"׿(K?��������R��w����n.a@)�͓5Oƥ��*'=�c9�aLT�s���r2�A�s��V��Bsj�ظb�����6_��ty�;�l�'}���7��U62��Z�Җп���V���d��òP�w�s�.�y�(��"�;���؉A����|�.g��vS����$
��T^��7`e�n8�oC`9	��>N�h�����ob���t�H:�/�N�H	8IDAT��(�jY3*Y��K3*4��f�'�J���{$����^�2el���À)��<������rM���d��������������8<
-w���fs�eT;qT��t|Q�i���i8���%�s��
�N�:WL8'��U���������Y���3:gn�Y"ڞ,keg�H���A�
-��6���4�Bs{6����MN�t���L<=6�<f�st�k�$�9b�Ķ��|i��:��
�X���3'2�O,A�qr4@���f;�����i�4��I> !3A_G�`�����%�ҡ�I��gq��2A>ԣ9R�fT�����5�ӌ~ԏZY��s�ߜg��_����o��w	ڐ�
`w���/�m^tW
�=r4@�>/��_e1;��
X�&��'��B52H��
��l3]}��f����B�XQ�d�Q	nC���j�Q�s�JprC�Ծ֯uNd���y@`b0�Ht6�K�⹕31�3<��x^�\��H�XHj��5��k��Q�y����6����;]"*� M���c��	H�k�Ԭ���H��֩Z$"�K*Ɋ�V��*�F����4��P8��m�l3��n��\3��jB3*�O'��D�H'��Dl�/w
-|�n�TϓK,$�P�:Q	nõhn���Ҍv!l�����g�N:^%�Tc��l.�H�����U�k6�t���B���u��Jv�Bp�t��%�R���5;
-W"*�
�~���g�N:&��\RIV?��T���k6�����U�f��zX�
{>�['`<��ɮ��l��aI0ԋf`��4C]���6�C��-�T��Jj_/��u�Y"�\F�����l.���V��Ҍ-A�F�Y���U�
-�j$7���]����I޶`W(�
x����6ɬV��}�F+G"x��d^'�4�ĚH��D�w����VD�
@з:iP�f3Q4�
���@�f�����71��[�j#����ˁ�����,���2b)�Ϭ����oC�B'm`I�R�C�E�X�y��q�=�Bi��m���R�
��~�)qŚ4����m���*�6kH�_�>
-��G�"����,�+�,��
l�f3����ſ�<).�N߆,���
��n3Q4�
���@�f�h6E��(��D�l �f3Q4�
���@�f�h6E��(��D�l �f3Q4�
���@�f�h6E��(��D�l �f3Q4�
���@�f�h6E��(��D�l �f3Q4�
���@�f�h6E��(��D�l �f3Q4�
���@�f�h6�������8�3sNg��������̜��1��"~T&�[ �Jgv�"���l�@�fl�<���q�lL�/�%��Z���(�w���X�#�g�Ok�D'm��ʝ/�_*�5���g.�aE)�������-]̕�\d��̴��R4�����>�����U�9Kg`9d���wh6�JsCf��D�K��^"H�!���fJ�lƇ4Lf�E=��`��H]=�?~�*)d��*�ٌ�y}a�E�Ei�.'}���aR)`�I�F�P �����9]I�>%����B��:�cu6�nt�����o���toO'�9�ی�ŲK��+�c��0��&_V�����Gԯz���>�g��4�����$�NW��V=&����"�����k^s|�f,��c̙+�c�ϽW׵|*M���k�7??�n��lR�߆��')
�
�g^�?��f3P�՛'Jq+�Y��h6�˽E9��
-1��
A�`�ٌ��͢Ihz�\�`�1ٟg��4����c?�q;�5���|$���1���_��{��#�?�us �f36qXj��+y������7"&B
�\��j{R&`!~
-3u��B�7�&:?�G�������I��w��6������̟�演�|	X���)���83�
�4���޸D��
4A'm|Y��!�h�f3Q�������?���@��
���@�f�h6�迺�|K�IEND�B`��PNG
-
-
IHDR�/�7	pHYsMM
�έNtEXtSoftwareGPL Ghostscript 8.71?h4�IDATx���1
� ��R��d��NA֬�����v��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@����:�o=�e,m������6��fX�K�
`i3,m������6��fX�K�
`i3,m������6��fX�K�
`i3�9B-*ehIEND�B`�
\ No newline at end of file
+
IHDR0�gBG�sBIT��O�tEXtSoftwaregnome-screenshot��> IDATx��A�$�y��6�2�&�V��3bF
����X��"=������O/��_���eљ�&��2�<T5v/#�b
�{y�0I�
�&h�LEa�\�1hY��݊�,
��m�v�Ԋ=�Ȩ����Ȍ��/"�?4��"#_��e����{��DQB!�B��g�@!�B�\8!!�B!��'$�B!������B!�R��B!�Bj�B!�BHmpBB!�B�
NH!�B!��		!�B!�68!!�B!��'$�B!������B!�R��B!�Bj�B!�BHmpBB!�B�
NH!�B!��		!�B!�68!!�B!��'$�B!������B!�R��B!�Bj�B!�BHmpBB!�B�
NH!�B!��		!�B!�6�0!���'SB#�J�1��r'�BZϜ1g�@��SsƮ�i��1�4lN	�0�c*Q!��{���{���ZG@������杠T4�'x��פ������?��\&�Ҝ�m�@1g��3@��=�|
+�[MC�]�35��1�n��۴��4A2�FNH�����?�"�������g��
��3}�jߨ@�3�d!W��Z;�K��bq��b�'̟�p�&��X�49J{ޕ�=I�����&�ɧ�]s4���k�t2��NC�.JiH=����>�i
��S�c��2m�µ?��4��G?���~��۷o��g?{���~�}{���M�OH��Կ;�o�U&^����*k��9B�~��EQ4i�����3��:�<5�B+h��
+�︓��`mV�9V��V�P{U�!a��Lӌ	������o�q�Ν;�`�7Ir�lme��wWrN�ni�Uf
LM�J�x3�*�]:�*ɿ��<s��^���Z�Z8�BDaMRE�Vi��6g���Ԭ
j�����jXM^YRO��!���4T�1U���z*���`�S��"�ҝ5KÜ7���Zk�<9Qս�%���;w�c�R�ؤ�!��+�Ԏ��>�������8�w�N�9Ӹ{����]uq����.��/]���̿�v�ӭ/\\\�<��__���Q/9���^����=��_��ɟ��yj��_��>���*Z.]������v��Q���'?y����o���g���_�Շ.��D$��;�ܹs��L����.���[�>��X[v���_cg�8Ƅu�⬋��s���v�^.�;��
������㯞�گE?��t�ǎ�����"����������?�����s�]��߮�̥\-&����t
y�?==u�ɓ'��4I��-`i�L�B���휞F�_w���:_��/�/
�y�[��v<����%|������7��}���7~��u����D�q�[�K��#����o���)�
��|���Ÿ:ߌ"t��>��:��{m��������vq�q�*ǁ���ч���D��obb x����u^�|/�!�ǟ���bϱ��Z���2�~�{���~A���x�G�W'�K�<��^�ߴ��d����?r~�
+��$屢��h�k��/�gm��y/V�,�'��k�	F7��p�v�����85dg�9��|>9ձ&���{�S��v���T�ͅR+��}�u]W_�I}��@��Z��$=��b��������3_E�F������_:/��8�>��F�o:&ra�9�b�3;�8~�F�d��vN
X{��3���Ck���3lG����7�SL�I3g
���4��I
_u��e�dj��&1����e��������/��_�V�.��|�4ڶ��+����O�����>���q������8��<�����O?ŗ���st�-K^5˘&pR���̏	@�<��ٹ󂵉�)����K��1��"�|����`_���:�y�*_�~�0�n�T~���w7�O��Ο��^��ڲ��3tSv�ݔ���t�8~��3W�>���
Hf#~�ꇸ��E�G��^������T�=�.._\@�Qj�
+%#�jH� �$������۷�ܹ��{��co�0���0Zfa��&_%��*�*3���޾�N���.Nw�}캑�N2O����7����a��V��w��/���>{��v\��o۝�q�Fu���� ��N�n	�Ln߾EѤU�3�͉��5��
+�掐k�0���	�ZV�
+��hX�E4��OeN$�ݧ~�s��if�s�-|ɵkѯ9�&e����3�K�44I��Cr�Ν۷o+��x�陴RW�i�zp���ݩ���	���^�{�UJ��*��N��	�_��~��W�2Q
+PJ������h�zЇ�]m�ޔCe{;>��/���/�1�r���'_{1���������<C��dh�ű�B��C�ɒ�����t�L����R����*b4U�t�4H�ӧO�@��Ν;&�ҜQzr��������T���W{��2�ZA�}j�-(K�Byӆ`���]���駊hX�Oe��
�2�53��^Z��k^�g��_���
.�
+��%���������n)��)�:��-<��Z��;/��F'��R�f�`5$h�h���έ申H�`��쩚��n3�2�lS�U�bR�Oߞ`7�^CJ�#�/3*"۵��|�n�=�l'����7��j�[a��x��I�E�`Θc�����I��i挐+k�|�
+
�O���>�
�~LE�T*��lz��2I��6��~G@��rq����?��_/���%/�zP�`5$hh�?!���Y�(����[�U��?^�U��lo�����̩<�ȘU9+9a���+��d�n�L�����E��nƬCA{8T�a*o��9M,V���2'
�*p�'�8A���J)�5�����A��8E�`p�<�z��x^�S/����1���"�;��!Sޤ����h���Ԛ�i
���Β�����0�0-o{��Y��0�1���4�W��E���v:��Ou���n�'��19�T�y'����_�S���7�������,s�U�?�kj�A��Y\ѵkO���~˙�V;�ycVw�̟Uh��`0PJmmmE�hÄ�����'�?�B�?!��A��,<g᷸�:K�J)�Ŏ�����d�@�.[���:����?��g����$�y{�o&����y�L
���v�@���4��ܧ��kӠ�Lk����Z���_������8�H����ho_����+�n.N���wf>�ȦD�Ր�A�IjL��9����}�Y�*�F��P*#��L��v�v_C�5�(��a��	/7�|{��[���]�H�B����srrR�
+�h�H������{��ʳ������_&��“'ؚnD��Ϳ)�@�ԘM�s����}�c�
0����l��-�{9�
��>SkE��{����o�[GZCk��`zw���?V��`���=��@<
�{��-�|�~����y���BάI������#b"��t�~
 ��tq��
x�E�<3���ݻ�os'R��ES#�f!�O���茚#U��eqėwbv/���ϴ�LC<�T���7UJmF�F��*�?N*B�IrkH�A
B4�ݘ	ZGJE��4�����#-Ͳ��B44I�"dM��>�Il������>�g?�tm?���_��ڤS��G��TM!�c���+��'O�g��
�w�
�<
(�~!)�@�Ԇ�-B�w��*�(�I�F��C��g����/�
�{�̈́�ey����ӓ7Ȗw����SOe�F���F�v7f�zCT�O�:�F���)
	��H���):�vIͼ��PCe9�(�V��T��"$�$!��� _��U���
+�ֳ��d�������$ �N�:��A�Ib�!
`ǹ����k^'��L�X��IE�$�;;pr��[�����_<�?L����!�]i4I�"D:�`r6�� �������dBB!
������wwo{���s�,��@
�W^Ec�2�0!y��i��2L)����fH�K얾n
+F�W0!��t���YҰ1(��Х�Gb�.�	&Iȭ!A54K��ww��e��������ek�V��4��F�I�;f��{�9���چ�M��� [nz�M|#���~i�����ϼ�vN���L�0�]skZ^�r��)�쒊�t:uK ��L����9moGJ]�zO6�(U�v�v㖵)�<�0!���0'�7�4Eg�aR/���<{D���π�Ƴ&�Kl��"�Fu����dsx���,��Y�`0����js����X[痢�tͩ����ȯ!�{�V��Co�S���/�G����ZMCu�1���А���`��z��#apS;!MŦA��x�Np���Yۥ!p!��$B
+bC�:8?G'9x���g�~?�l3�7�kl
4Im�CB�f�A�������o}�������B!Kc�G^{��מ���|p�Y�fg#��0��[Ǚ��fц	���9���)Mщ͖��=o�X�(�GO:���ݳ3�:��J�Y
�*q!�	&Iȭ!A54Q�������_?����0H6�'e��k�yK7��C�Ib�!�f�	�p�@]���O��<>(���]����qR4I�gg'v�X<A�-�)��R
+J�z�
�I���qǵ�&�
B6�=�(����?:���r��s%���B!D ��������;��
���^���NH������yb](�R�8�0!��ω?]�����b�6e;}��g}�N��٥U �?N*B�IrkH�A

�`'gO^���Ǐվ���ν�y5�y���;;I
+�8N��k\?T�@�Đ-BO�&��y�c�O��H-'0��z3q���qR4I������}��~��k�;P��������b��R_`�C��bo�d,��@��	!�R��֙͐x��� �k��9��7x3�C��)��RO�>������u�ɟ�_K9Ȗ��rk�H�Z����9{��kL�c�����
bW��m��0�1v*�?����p���@I
+#^�v�)���T��y٢Z5j�ӥB�HE��?m)q��ol�_@���s<�d��Ԭ����J������\���y�P���P�7�#�	2������I��U�邉��# Rމ���M_���P"k�2d��6���L;��8���*
0x�x���u��D��IE�$R.��e#�_}�Ǐ�4��u����dI���n&MC�i�ѕ_�p<�m�
��3,���B��d6b��k��F /��kDQl�����8��O&$R��Ĥ&�Ri�NP�0��b���Ck�L�0�.,ّ�ַ�v��E�K�@b�.�	&Iȭ!A5�@�`����	L�z|c+���WN�����	��9I�z��"�h��EH��S{z��f���ёJN��u��<$k@��TM!��8Pn���E����a8�������M����_{K@�Ij���bW����9�m������}Oy��Jf,Ir-�b�v\��u�!����FԾ`��-�kL\�=�$���Á����\��^�#�ӆ	��xN$������T�`Y�o�{������I�];�ȼ�u�������~?lJ�6���'!�$	�5$Ƞ��h�մnt��R��<�u� �7�P����S���3;��	��D�Tw���t:uK D@�
|������~�Mo�+h�Q1ɢH��uݺ%�5���es=��=͖w9���iS��qn_6���`��'3�g6����0��@)Ŵ����]B&�w�Q�����cĦ*ɼ�wv��I�?<HA`�.��$B��&��:�VJ�Ȅ!�(o�B}�f��Z�$�mg�h���V$�������L�<��d�J��`���pz���	lޒ���8ZW�N�}���$�$!����
I�_�vfl�_c��	�Y{!��j]�FmI�,�$zHi!�?������OY�}&n�,<�F���E���E*�&��*Hrdٌ[&���cw�=A�������x{Ý$MR<$��c�s�g�r�[n��|
+���[�$�6�$$�2^nϻ|�G5�7�\���}_�r!�4��	�����{��>9�º�?޶ΖY��z�{K	lmm�-!/�#�4EgD�3P�!�x���[<�җ~������N�>}�;IEH0IBn
	2��M�{h�[E@l��v������k08��R���D�g!�$1d��b�!�����z��$�up�����k�	6S��;�KD��TM!��6��R8���u���٧�����k[KL�1
�9YMRB�!)�����=u@Ec�v�fz���v���Y��	!����,����F#$��
���م=�?�@+'�6LH$�4�I���T���:�7�Ao�)z�W��ܝJ�(e�0�L4��I�ѠO�{H6	&Iȭ!A5�I��MJ!�b�R��K�&ZC8/�|
j�Ӄ��׹�D�g!�$1d��vb���qp��y��C��8o	|������'A�DHu$��.k��j��ٔ�9C�S�'1^�k7MR<$��i�x::��
u�0+k{��}h3�+]$!���̙�aj�EȟG+y��{�q�Y?m��H���D��.M�	J��-'bj�'�.���i��$�g�%hЧ/�?N*�����z�1��p8����js����X[痢�tͩ����XY��SI�_c���?:�G��)>S)�;�z0_C���y�Qp�=)��.�ְ��O~�C��=za0d�����K�Cs0���'��9��'Y�Z�5L���E&�'A�DH���#֢�LYq�ī��w��ZuY�-��	�M�I��d�$�U�4E'(u.����3�?�W=兙[�aw���$Gf�L�� ���=-I�>}zH6	&Iȭ!A5�R��Ŏ���$�V�V@*wK�ۈ�������J�g!�$�CBH��s�����R{���cW�����>����f�$����(R4I�T�1��˭�v�bW�$9�$H��G�	\nj��6xH!�8��>8��Ԭ��gv�����ݺ?���&�";��l8�����h��}L���ᐈ����(���ц	��xN$�������E��g���g�F����Ja2�k�N�C���(�A��@�8�	&Iȭ!A5�I�d"�0��!� ^YKB���r�̉I�V2����&%>�&)j>�=��RJk����h�g�r�[n�Yx>}y�Qu��
�R��(�>�>5�e J���뿜�yJ�n��͠���-��֢Tl��X���{��~�RK\B��t9�E�n��p	!-g煳�k��L���'Ѳ�Ls��x���Y-1vIE�$R)vӈ1��q )�&��$�����bk�@J�/
�&�![kE��.M�	J����`D�`�f�Bh
������ˌ�&v?�of�M��}���$�$!����>
ɖ��y6Ȫ�3P
+qZ��	S�\c�m�Ԡ]�~0��R"�h��!!�����Ɨ����f�cYo���o�����7���� ���`t����E*�&��JILUx�M�~8l`��$�I�$��u�۫��Ϭ��E�Ij���2��?��y�g9@�����͓�kBqB
�*�؄B����� �<��t�)��n��
&w��d����a��
+iÄD�<'�tyh�NPj>^ێ+C�Ю����ӌ�����o��mY�tb�uѠO_��T��$�֐ �Z�!s7�1P���q�j?�:�K$W�ǩ#E��Y4I�"����0H���n�����v�<��"�?N*�&��5`�&��Z"�mEy�	�I�4���c�W�C����|�@��	!d>�C��EQ<@�X����a]��E#c`�E�B!98<&LU�ׅ��L�@���<����.�1�d�0!��ω?]����6��!�3��F��˜|�m
$����lk���􏓊��������ۿ�ɟ�_K9���p8����js����X[痢�tͩ����XYü�Ga��N�����Q�ߏ3kYoɾ7�=�@�<�}2G���  IDATwQ����`8�����#�![�l_�����de�1p{�d����d�9��Ō[3�'A�D�z�w���5���}�Ӂ�"��p{�R�|g	֢�d�&�
B�b��U0������Е���x}e!JA��C ]��B)�Ė%n��z@<�T8��B�N���݊#��D�4m��0d�t���������	\�=����i���^�K�}O)����1��iЧϐ��A�IrkH�A
�AkD��lA�(B�m2A�:Rn`Ma���H)9�%|MC�������BO���~?4�ryE�3����]��qR4I��3�o�H��[��8>�ulV��p�`f�4Im�B���}���X�	ݗ�+��.q;g�q)Y�	!���'�H�
���f�Z���RK3���aB"�?�	~�<4E'(u���0��la�Q;9?<�SZ�Y�ޥ��'!�$	�5$Ƞ�MӠ�Іl��0
+�Y%�j�`�jE�Ib�!��5[��؅��ށ:俊R82�Mܾ��@�8��$Bֆ�kI���U�=3Ԝo��f���b?4��t�&�$��Crqqa3��!�7[nM˭y#y��I����������cu���ݻ6�{\F�>��k��-I!p9�B�Q0qc����81����ۋ�.M
+5�����%�Ek]��\4EgD�y/
�
+���a��z�����9�" �v?�J�t�>�n�[��&$�$!����n
�=��&���[�@)5K�5m��0��_���-���?�&�![��c0"���?��[�?�~c+��'^�
`׶� ��8̲#�?N*�&����J��*�5�r�½���������.&vN6��	4Im�"��G)ؑ��~��я�t
|����/��R0���oښV�"�Rv���ǁȶ����p4�,�����3ڸ�hÄDBJ������6E'(u���!��g�ț��Z^�VF�,�8x)j���p�� �$	�5$Ƞ�M�`zWҮX�����'���D������y��.�ʫV�g!�$1d��
"qg�H*[�0���Ͳ�EL����'A�D�:Ɍ�r��
�-����i�/T^x4rðy�$��6xH!9YyĴc�
+�u�U0tjBY
+���|��i[��Hb�Fp��B�І	��xN$�������%I�!�cq���z�N�j�I�RZ�d�˽.�4'��"$�$!����~
�0�a���3S�gZ�����ۨ� ���u��+�h��E�f���
�$�c��rf�r(-�g����9�KD��TM!��V*L}��wzJ
��V��������o�,8�6.,Y�I��d�H��):A�˓s�^�8����dy�T����B�4��HEH0IBn
	2����J��������#����~dxH������wՒ�L�g!�$�CB��a߇����<�0`W�<�n-��������HE�$�f2�e9\a�H��
O�C}U��D�&�$��CBY
+�\��p�ܻՓ���wT��&����~����]�������ly=-�捴���;��J��
|��ǯ�����~?������غ��"�s8��/�C�zŗ���V�򢵮[B.��3�ԕ��C��_�����"�ZG@�vNW�0_��ΐӥ�v�uK kB�IrkH�A
��!eŒ�@D�=��!9-���2Nk�qr���@�Đ-B6�=���M���e��L�������-zZØ��R��@�8��$B�L�3��?�<���`�~A�ب��4�E�Ib�!��h�w��E\���y��J���{��tBk}���톱[�B*C��F�lM� �~��)`�j]�҆	���&91
�
+����2�'$�%st�M{7n@�s����y�1p����+ �K���K�A�IrkH�A
����T�-(�`�zv��,
J��Zɤ���$|MC��8l�vʋ��;
���H|G��g���$����R�D��TM!�'3і�;���U�`	�؂$EL��;F'�U2MR<$����+G��`�ɼ�k��K��d���߄�!������y\���g���1�k�6d)�0!��ω?]���Z��KG��@�Gg����|��Y�"n�u���IEH0IBn
	2�aC4(7�>hW�\���5(c
+�%<v��}�>�&�![�l"�����s/g��P6�k��#�Gq̘�bo�IŤVF��TM!�g�I�_I�V���9-���m��_��h���!!�,�R�a�KY��[.�?X��Z_�Z�!C�!����m�������"N;�x
�6.'m��<y���ĕYs�`Jd�-��y8��7Ji9O�
+y#]n�F����~�Ɏ�И%�0
+揎��j���]�19���:h�P��	����h��G�@6�l%H�A
�!N�5}c&ÃjP�p�-5�ױ��?�lU��,��ؽ�aZ�YJ6Rd��6!і@�8��$Bj�q��������1��Fm����e/�[�@��	!diz=�]�G
s��G(�+]��2\�B!$f"u�$���<�&���^�}��I&$��9���CSt�RW%^C:<��W��	�%t*Uܳa+I��7��t>��"$�$!��԰92m��@\�=��8��Jh�(���g�e$|MC��P�m��8��\�>��w-�ૉ􏓊�I"�fE'�x#8y�U�5��h�xb����}��&�
B�jt���ː��j�2�e;����g��Rn����B�C2��k���V
����>2d+m��H���D��.M�	J-��m�GV�������v`f���Bk��~��֥s�'!�$	�5$Ƞ���0+#˥����$��Q
+&�LH�E3��$|MC��P|8
+L�%�R�IH�0*�%/�)�����IE�$R�~�q|e��f���$U��������_u#�$��CBY��ld��H���k��]5j�6���B
�F�B�F��=wlp���*�H�
+��f#2iÄD�<'�tyh�NPjz=���.{���h�n)8����;I�u�l��IEH0IBn
	2�a�4(/�hjuL)��/5'1�W�k��W����B�Ib�!���@�����R��;[�d�CnOu��.p�8�{�=�����IE�$R3��:����r�$�wi�M�Ij����2v�f�%rt�;Y�$�9I���
+�2�!����*\�9�̥]+�'K�{4miÄD�<'�tyh�NPjq���=�Ax���"��b�VZ-Վ�.�B��T��$�֐ �6J�Lo��:�p�������J
+�J.*�h��E��2��$L�c���%Rܻ]��\��"h����tV���ʝ�5El���;*X�WZ&I�&�
BH!���-;\.��zG(�e+%z�K���!�,M/�dŘ8�$ƫoy싵���4�ֵ2v:c�A�vZL&$��9���CSt�R2�ȴ�<Zr��Z������]<��إ3�'!�$	�5$Ƞ�
�`װ|�������KعG0�i�����w�.�yrVSn`����%MC��\�~h7��8W\��N�p��%ׄ|�1:g�y��Gg�v+KR�V��{e��IE�$�~f9յ�������ylV�[۠1�t��%X"ǁ�9ϻ��h��!Y+�(�����b�[.�Ӊ+��4X~�պ�iC�gg#���Y�
+��Y\�"!�$	�5$Ƞ�
ѐL0��6H{D�x�̖G|�ȵ�#I�u~�D
�Y�~<��'����&�
�k׮�-!/�!˼M�	J-F�]���
G�J�{��;BJ�Fr��v��t�N�n	dMH0IBn
	2�as4ؤX�k��"�/�l0�Ep��q�B"v6�%Lo
+"�$�aBB)D�g��������x]p3��{����8[B�������߯[!�����������+�����z`��
k]7�߂P�riÄD�<'|�yh�NPj)�\�yq�B:}��ċ`���F�$���)��I�|��G��߿y�&d�$!��԰ibrܝ����bY<!A�b[�Z[	��K@�I�vB6;@+��=b����cן
+-6
+�E��G�BR�O>��W^y����{���O>���Ç7o޼�������$R��H٠d�:�I�<�>p轻E¶�7��h���6xH!E0&���j�AZ����M��G��߿������{������=bB�š37]�ZC+�'�-1���+n�&ô��%��6LH$��s"�g�����g��H�s�И1��n�1�"�2v�h~m�]��@�8Y��7o^�~�>�~��+��2��'O^z饝��W_}����p��L�x0��z����:h��*Zί����/EC�
5����:��0��������$}�R-��#UTP���	I���Z��z�-��_~�坝���SH#j>�N�n	�4�# ��V*R���S@����ZS*��+*
+��*�N���[�R&�o�N~���{�O�$R/�;�e}�j6�DK�ul+kD�Ij����2v���

��M���h9���q�D�r�jJ+�e��'Dׯ_�w�^�-!��`4���M���MQE��_i*3Lz�iÄ�![����Ԓ��x��L���lY��Γܥ)��2�ܹ����J�Tu	&Iȭ!A5P�${�x����x�P\�1����M�l��8N\��q��u8��mJ��F�礬�e�_r�҄TM!�bL:o�$�yR��F�q�`�2�X#'0�WW�-�&�
BH&G�ec�f�A��裠�������ӧ�~��}3Q�'Y.� [^O˭y#��r��0�gz^�;v�m�6�F���?`�k��p���@I6�_�vM)���ZGQ4�����5�Yb��jk�RZ�ӥB�HE�+ވ�]gx�ɤT �z����f�4�[K�i�P��	��F<�SJ��������p�GX/dP�fj��=1y�$.y�w�����a_�n��φ![�l:Ih�t���,]@*�߇�*g�)��:�'A�DH�$����꽳�]ܬ�é*'+a�~0XMIA�$�l��T�����=�E[�����BH4��^9��pP��vQ�aB"!�INL9��*�):A�e�$�d��˧� )#�t��ʚ�Pj:��.�Fb�.�	&Iȭ!A5l���eqe[�J͖��7����MC�!��Yq�(^��i@V$�͎e|�^8��"h��'@8Jl���|�h��Қ��t�ř]VMR<$������G�KVk��cu��~������	�f�je˭y#�����*�L�<k��7i��。�
�ò�ț����t�lU���&9���"M�QjI('$�N?2+WI�v�|
+����_񯂻4���&�"$�$!��԰��{��
�j�-�{�J�*R�E[��6�yh���!�v�Z���}�):A��aWR����xa�(
+%5d[�
0wc'��.�����-��		&Iȭ!A5l��Y��R4j$�A)�f�@�Ԇ		!�,��LH
+EIi=�T	h�`LPZ�B!�c��#N���JL���aF{+�6��%p�Í�$ن	���&91e~5������J2���,�((2
P^�R�$���wi�Ā]R
L��[C�j�d
����x��
�az�oj��ŋwk�!�&�Y�!�8�8���B�6���ꉶPA
+�����҄TM!�gz
+$�B6��qtG(X�N�ĥ2��6xH!e�� 8J���H\'#�{�6�]��ô�o�w�B��J�X��o�b�`g#6<��jg#2iÄD�<'|�yh�NPj��>L�(+��o�e��S
+��>8_��� ��"...jO�;+jy����\go$2����h(]s�㨥7Vְ�<��������t�ċbΊk��1֍�"L�$�u�M����#�![���>�w�c���s
h]����;F����}p��b]���􏓊�I"D�j#�îlE�U�
;�(��X1���:�MR<$���������h��=н�֗c�x�e%�V0s\�ˢ�l�휙�8I!���9�y�u=�j�$�c�����ڵ6LH�U:M�	J-+�u��CdF�a���$���&�G���MB�I2�H�A
��!+�oJ��|�	I��w�74�Q�(�r��ת��@�Đ-Bp5m��@�+��@�Y��bSu��\c��q*0{D�0&�?N*�&�	,ȅU,�Ʃ)�͵5!���
+�$zH֊�%�<4E'(�<b���N��	E�ۙLY`ۙ��"?ݖ��(RL���F�j�X
�n�I
Em���Y��5nݲ'��)7M=$��ljw�%��l���6��-T��ݎ�kXL*���(R4I��q��Pf���}�(��U���ҿD��Ж@��	!�\� ���	�.7��-9�0!Ex��i�i�r�/ǖKiF��3�\�elj=��A���F�G} n��.�izH5�����%�Ek]��\4EgD����C�j��w���,��@���b�\a08T�a#��n�[��&$�$!��԰��H��35(D���+��T�TD.N���zg�A)��
+��@�Ib�!$&�7����j��;ݗn�1p{E⾲-��IE􏓊�I"D��n���sm��ڕ_�2��Q$�,MC�!�$^��]��+?��"'�BHm(��	�Zʥ
	)Mrb�~�[M�	J�c�Ϣ�������j&����3�'�w%�j�`���6dP�Fk��R�`)
7��m�j)�s�����^���f�FB�8!�`l�m��� ��G:*4LN7[
+5["��"h���R$ma"Թ\�9�.��@��	!����{�N0(:4*U����f	!������Wd�*jY,m��H���D��4M�	J�����GW�2t��ؓt���[��T��$d�� �6YCR�7[�x�F�_�J�l���ƨ*;L�Ib�!䒤$bf��t��"�(�tM͖�@�8��$B��48���힟�v
+]�`<sc�o|芢���6xH!e��q��^/;@k��7~�V�K���ҍd3aa�V�ܚ7��-'n������゗��(�=�w�Vr��da�
+�P�*'*�):#J-[������L�T�K�W�p��U��KD`*RL���F�j�p
�ڈ�\����"��4�s��J)芾�4I�"�\��$�LN� cIn���[����;
�<�����IE�$"��cnv^8ϻm��R��`��*rH
+4I�"��8���<Hm�+q�=��W}R��1�t�B�hz.z����*�^��|S�V��.H"�6LH$�4ɉi�w������R�d����Ǚ�`�x��&���O[H�K%�ڒ�K�A�I2�H�A
Ԑ��q�9�������e��.���P�Ib�!����=�`ϳR�IJIfe��y8<,&z
+���8�	􏓊�I"D�#�m�-EF��#ڦ�]{{e�/�$��CB)N�$
0z�57:
�Q���9�'����qY(,��B)�1��ަt�휅a��g�W��
	��H��):A��b�#�����.�n7�^�`v];��<�����Y�
+Lw�:(U�Y���"$�$!��԰�R�34h����U�s�O����	��;~!LI;��$�lB.�}}p�u��%�*��d�N`BO��&�?N*�&�Q8�w��N�q�Ec}��ʔ���D<A���$
+4Im�BJ$<�`2v"�)Y����:�{�u
�a���?��!��1�y��F(��])��jb6v6�Y[J�
	��H��):A�e3��/�LJ}AѤv;{���.U�ƞ�B��T���E�ڇ�aE-/upV���D��:�
�kN}����
+��=/S�1��������/z�z���0�e�l$��H�J�=�0�E����0�r�+���`wh�y(�T���$���Ksm��@�8��$BD1�������xz�խR�bǘd6�V����&�
BH���JU��t�`1���Ƌo��[F�B!m�C`��+�4�5[�]k(/��&�� IDAT��D-����	�Ç�̐��i�NPj���Cre����s�T�����!�![��q&I�h#A5PFar�L
#�t:�Bs��Q�p�
+����:�W(o�#�$�
+�z��w>|�����ׯ߹s'��'�\��� �(�:�av��,8���D���R�,f�����0Վ@�8YM!-`~�ܝ� ����*R!1�B	��L��8���,�&�$��<|��Ν;K
���*H�_���ซ��il���}��c�8���"
M!m��3�Vb�z��\a�P�8ZդU��Z�wtU��		����?|������_"�?����)5E'(�b�{���1Z#�⥟r�i�Begu�t��ڃn��Ij���6dP5��*���1�!�ѱP k|�	Ɋ����P�j�@�$+d�޽{�|�}�pE�Z��7o�?NH�8N<߈�:]69� �1Lv�����9��q���LRM!�p�A����_���l2|���QE�`ee��h���g�g��~E����V݊򢵮[B.��3��
+�Z+)��9H(�D���\��ֲ��R "ϋ�|���v�5+ �B�I2�H�A
�M��<�K�T�ќ�H?�i?M����{��
�裏�I>�䓇���;��N�]��&}�Q���):A����(��2�6�=������4�*&U#�N�fdy昤9H0IBF	2��ri��oXdq�􃆏Ae	M��	�u�?|�0�[�߿����o߾w��믿~��M�'!�dF#��TU��^�ĩ�ܠ��-�Df�$BH�(%��e�ʖ�*JS;�&$�߿��G�� 7o޼~�:��ׯ���+��H�A�	�������
+��9}�nv/��s2�Km9[o�X�3G�B��L�4	&I�h#A5P兙��SI�uy-�Fs���A)�a{�$Y�W^yŦ4y晙¦
������N����W�1�����ԯ�\��TE-���h춬�7Ji9O�
+y#�K+�Oq�A��_?z�Qn0����P\��
��U4�?�9����w�q�5w�������K/������矃4�<&i�l%H�A
�����L
J��[��毂���2(�%0dKV���w�y'���w޹>&�Y2�	!�b��'��UR��D[��<b�~��%�4!��6Is�I"D�k#Z�N�������a\`�t�����1jM�,��ܹs��m����R�<'|�yh�NPjc��F�[R�'̲���*��,�@�8�����~�����I�VK?��T�+���js����X[痢�tͩ����XYC	�z.�`8����z
0���`'��Ѭ�S��)5�йl#�����G�A�<$L�N�ҥH�Ɖ���#��U���W�V���Qd!4I��k�kjM�;�@�Sbk��,����&�ٺ\���߮[!�
+Z�q`���Q��(�;�>t�/Qq�ߨ��(j� h�iI
�96`�3&h��Pn�QXS>�5 +d�������*�l�NSt�R+ Sg�vS�ld�%�$�k����&�\�$d�� ��aB�<
nV���`����ɔQF?����4I�&$o�����E$�4ɉ�4yh�NPj\�L�;����-)^��^�
&K1�}U�.U�\�n9WB`J���$!���@
�5�0*>Y��
�3�VJ?̵%�$ɚ��.3�����}p
���rkZn���e����}���G��2�Ѩ4��Ş*z#����;��o�E�I"�e<8g3�r��{8�0��R
+Ƙ�ID�x��n��������$��ֺn	�h�ΈR+��T��=�G�{��!��*��>-�CKu�RQ�^�ۭ��dU�k���6dP5X�!����\��e&�HAgZ�����M�[�tF"M��,[���&�����p}�H`��+����-z��\[S����I"D �N�p��61��a�J�^���0D��Jk`�=*+b�&I\�!D{S�H*E�������cO!���y���J������1�rǼ}����A�aB"!�INLC�
5E'(��u�Q��
+;�g��-�3d�.�+$��)��ds�`���6dP5,���u!k7}�a>K�d�<��,&�$1d����\�ur��`�����RS�YCHU|	�J�5Gn	􏓊�I"D v����7����.+�̨�,�	�v�ó�R_���6xH!�����4sM��E�5�T%���E!E�5�^
+�YU���g#ó����I&$��9���CSt�R+`R�ɹC�VF�d<��
+]�T=��qRL���F�j��I~��s��[�ɜa�J�c⨭.�7�MC�!Y��c.=׳�8�w��\�1ee8�E]����IE�$"ǁr}��<cg��K4C����Z�-�&�
Fd��/�Ė�P��0�AY��V�I`��:��	!D
+���{{2q-�V�@��\��Ss�2�P�*'*�):#J��D�R�ugU,�6���R
�֥�THX��T��$d�� ��A�؜��S'�q��QJA�P�w�%�'���+5�&�![��l��8d�&Ԛ-&�)��alԖw�zG�^i��qR4I��Ž��d|��F,+;�,�Y:���*4Im�"�TD�5gh6���W���'��y6r�ڋB�;�'�M֜e�9)u���)+���h4�aB"!�INLC��4E'(�.uNeYCV��baW�R�`B�6�Z��=$���$d�� ��
����U1s����Pڮ�$�`�*�A�Al��!�$�aBr�ڵ�%�E5d�QSt�R+�R�����e_�g>+wi�$��W{�
+t:��]�Ԏ�dPcZ��zf�;��$J�5w~)Jלh��7V�P\���0��Of����.AC�	�~(��_{�L�`�����Y��{H!٤��:Lv�_�**i3�1�_Z������B`�.��$B��5G��|�J��k��J���,e���6xH$��s��V�����
+Htj\YDQ�L/�qo�vy�,]-�H�V]C7�@�8�	&I�h#A5P�%��>ǖ
�h4B����N�+�*ꇥ��@�D	!d���u�wz�F鮆5�G`�[!Q�r��$Bdb�$���᧻sNr��|/�2�����]{��^MR<$O�<iJaĔ�[.W�p8\Co��r�.�F*�\�/���v쯣^/�|�0�%j�58��ϴ���q��{�ʅ��|���ѣG �
=$	dP5$؅���gyN.k�E��7�ZE�o��ɵ#��J�r!1���S�$�xY׭�$�x
����(R4I��eq����m�ڶ,�;
���V�i��6xH!k��3WvJ��Q�c�8��p�+�Bi-��������2���t�3���:2�W@&$��9��_�����V��Nc�7��|���M�ܥI�,��>R��"$�$!���@
�x^���eؓo��~�����h��E����FM�+t(7�'��K��N��O���y8<,��i��^AP�?]��TM!b�΃��}���
��������^O�Yf:�@��	!���*7�U-�G�_�G�3��5K{{蕗��B�h�-���yE�m�������R%��І	��xN$�+�����
+�Թ�bNy+?��u1���X�K͸~���'!�$	m$Ƞj�������ݳ%�2&�+�k�^A�Ib�!d&��#~?4���h�����s�#���{�[b��T�",��qR4I��eVA�+8��(�P���������Lb"MR<$���P�WW��'')�
+ZcO�{ot��vkG�{�	!�4��U(͓���F�L�6.�V&$��9���CSt�R+`Rg������Ɣ��7Żt=��!�?N*B�I2�H�A
�0��o���(
�'��K��&�![��y�*:9N�;|*7�V��'A�D�d��*��uv���W����#�ׂ�S!Q�Ij�������}c��tN��� [nz˭y#ն�8F����󕒤���W�\���}_�r!�l&�Az��s�����V
+p{���ꉚ���V�򢵮[B.��3��
+��S) R��)�p�U@�����ǦtiE�n�n	dMH0IBn
	2��RRF-�CW)�2�#JE��5�֜�)�$1d�2�w���2�;
�Ѵ#8.ƴ?�&�L��IE�$"�<�S�ӿ�[��Fĺm
q��Y����6�lB�czo_f�v��=��B!����XKWbГ޻��$1��*�n���H�Ն	���&91
��k�NPj\�9��"��yS�"S����`���dP5dh�r�_��*I�`7�jMC�!�H��UIpm�@�8��$B$�;nO��-2��Xn^�r�Ͽ���xz*#W�@��	!dm�qm���F�B!2�S�P)
�F'(����%W	�	�K�
	��H�W�):A���y�1"O��Z6�4�K!�?N*B�IrkH�A
�0�a��{n�W����~�^1�>"�$1d�2��>t2N$��َ
_��8���@�8��$B$�3�8���D[����5X�$j+S�@��	!�:RY���v�2�x2pB!RX�b�*��4\����A
~�\�aB"�?�	��<4E'(�2uZ��N]�׺��I����iJ�B��T��$�֐ ��!�!O�-�B�E�S���k�֘Y����T��8�l��u
'�i�뽶�!MD��TM!��}��_~m�2�K��;&D��/�����6xH!21��و֗�IRN
�_�BHQ��m��z(��L0M��؆	ɓ'O|�7ƌ�'�Vqp�FR"Kl�\���p
�QJ�y�T���r�k��RK�0�ljǷ�(L���k�l�P��	��F������=��� A5PCZ�R��+�:�C��0�u=�q���[��٪��	������9�G'����#�?N*�&��8N�@,����a���‚�zI�;
�T!H�&�ٺBdcF{�G�8�:�2���ܻw�n	��Ұ[>J���<�z&���Jٴ!dK�<'��yh�NPj�u��(��uf�mJ�B����G}t����_����L��[C�j���5�\t�s��ʏ���u����bjZ%�$1d�2��M��P��z�.�m��'E��O^y啇��o���O>|x���W^y�֭[4I�����Z`��	~�;���di�8��M�ʌ%2$&�$�C�V$,�):A�PD�R�����HS�"����ܿ��w�`g#���{���o޼y�Ν��~[�IrkH�A
Ԑ֐3dʘ���m���T.�Qʦ?)��|WL��h��0!�v�Z��X����
+H�TJ�%�����R�N�n	�4n޼y��u����민��䳿��/_z饝��W_}��}�.I]8�k)3�:::����;����kVJ���K�P��DC�����5'<x����������bl��Y_�����?M���[�����;;;��9���-B�b�|��f�`"����Ν;w��{������S4I���(\`�����&�����_wa�w����h���!��ωe���Z
�t.!��ד�)]
+��qR��ׯ߻w/�X$�$!���@
���S�����
˝9�+V����8
+�M=$����ϛ�8��Z��O�EJ��Ç�		M!�����}�L����Nt�>��G��BMR<$��jq��N7n�(,!m%5!��'���^?ԎS�C��1�جu˥���
	��H�W�):A���S��������f�E�ѥ�'qqq���}�f\�L�Z��̧�ͬ�����Ym��7k��R4��9�q��+k(Q�%���?�u��@�(����Ș�߷�޽���x��p8�}�ѣGC�!�p�=Ğ��[���(Խ!C�&�'A�D�t�A�8S���?C�띔g��
����b2�L�Ij�����K-9蹜�B�8��B�v��+1g5d�?
+���k�
�l�NSt�R+ C�R���Ir�B�z�^�]
+�lmL��[C�j��B��5jJ�;S^�y����
+4I�"�,&J�"�D��TM!ҙ��1�4�(UEl�1����ʉw-�$��Crqqa��a[[nM˭y#kk9�x֙ɨ-A��������HE<}���M�l��c�ն<6T��\Wy����_�Iv������H�<x�@�I�����V�򢵮[B.��3��
+��3�h
DJ��gM��(���n�Ț�`���dP5djP*��R*J6j������ZS.�$1d��߇1�r�X���� �?N*�&���)thL|��"��_��b�9���H�IjC�!d=�ݿ�!y!��c�JN�Y]���t!�҆	���&91
��k�NPj�i+��Y����4�K!2�	�	&Iȭ!A5PC�cl��E'C�D�?<�R�M�ѨƉ�rc���ͺ̢=![_��W...��R	J�����U���qDy�'�n���L90dks�I"D:��>�e3F*7�=v~RV4��@k(5���6�`��
�����-�4~򓟴5lwgg��?��(R���{{Ch]�����$"����ww1�\Y��3K���V�)�F�
Kar�
��vEn��X�
��v㱱0`��$�
�Yx��
ȇ�2��v0�h�A�{
X=�Er
ƛQŕ�=j���(&<�ʤ0=���R)�pț��� ��q�����$�'��8y�~ь:�AUJ�&"�%�����p�ՖT4M:|����C�jD5v����&++���dk�<{�looπ��Ert�फV�����C�1�>�T���1����}��O�+}���<��uc8DR�����z+8�W?� �U
+5�ɖ����� ⌇���2��kg��@J�2������>�=)�}CM�GȌ�X������z��j���z�^]������~�?�
/�n�y��n��l�l�Z�$/̿v:�N��o
Д��Y�Jk�Ύ�ZCJX�$Κc�)�P�|�p���ZU���X�l5�|>�h4��n���L�٬�jRJ~�j�F���T*�[��6�~��A�V����yNl������{:B���8����c�а������RB��u����p�"Ġo���W�`�G���Y�-
+$����~w����gh�]�z���t�1�(�_��~���+{>�/�c���|>��tJ�R������v�R�H)Ւ|w*����DT,��#%�3�B���8�;^�������!%�����C�Y$%�MRC�MI:���
1��!z�H�UW1$���Q�
+��>sFٺ2����֤4
)%_�;�N��-��R��W��su)�/�|#���V*�V���ݻw�vo�^���J����_�T�ŢJ9;�
 ������!%
�/�_�d쥩4J|�P�J���{��PC��a���gG�!�r�^���m���J�r��nA�Z�b������"R�����Uz൩�����t��:СN3"���q
+A鶸��CJh��NIIc��PvS�g(b@�b�1�V������b֨�)�o{{[�L�����><==��� �u'-oY��Ď�"� �	g����ڲm��͛+�V�)�������fcvk柏l[X'��h��l�w��vĶ��9D�j��m�o[[�f0�o"�J}��p3߱/a�E�D.�<�kg��@J�)��wh�J=�II���
�5<�Ml���y/�4�M�	�U#B���J���P�dk} %):���
1��AڱR�(t��Ԋ�Ck���!�4���f����YX;R�����<J��x}LII���@JX��OJ8F.GB䤻�����אp�$�o�ҟ�,TA<�	�>�_
j�Z)���m��j��ǩ��CY9����(HHVRҤ|D�$�PĀ��AJ`��tLIiwb���N��n�Sz��j����...����A��}�����������i�ѨT*��=>>v]�����X�T~�����y�7�Â�����f�g���9%}��G�d�R�裏|�GJ�5%�K"��&D*�Uó؄���S<ǔ����ԡ�2U��B4��V�U.�766��f�)��u���Z��l6���{�\�4�*���A:�$d׼)iT�)�ĵ�� IDAT���.��<=��KDHI����m��L(�\^^:�R7�
�#"˺�`t� ���+~��ϳP����Pq�x�XBk�9I����𧻓��R��솨6��?�?}������{�l��h�5'���c�tH{�M;;4�C��E]�'������9������P��ySҨSқo�j��XJ�HŖ"Ā�ǰ���1��`��F�a�-�;�3��m�]wb[�z��f��9���|����K�R�����S>���L�|K�o2�z��O?=<<�'�F���[M�b�[���7o���������?5�{�I�1:�p��S҇~��믗�e)�������y+HI�v�$�ɑ��X�+U_dz8�6c1�21"Q<s��5�z�������]�z5�*4�
q�H
���eb�S�z�dJ�m����l̎`����4L}G�|��1�CT�V��B�׌	\lmm��
+$�ah��$n����d��?eܕ��!��M�S��ڳrH}����	AJRt8Cb�C*m�qBX'��DÔ�M���hQ+�k�`
9�~�t3�,^QR����ZY�/3c�
����X'�g��Or
�b:�G�����`�9��{iADDB�����H�	��PEe*"�t:�n7�,T�z���rWB��j�xI^��t:<p��{�ˆ��nZ�Rj5�tV)i9�	$)I��E�abR��Y�10!x�W_]Q�$
+$���˯�0i4�n��hLZ��j��V��"�D$��ቨ�nsn���{k����dž�-�qZ��9B�]V�L�����v�"HI�g(b@�cX})i�qXy���)ɄIXp�I�M��j�,T����Y�:�N�T���v�R�R�%ՠ�*^�J�0��5���QR��$5��`6)ɑb{����q�LؽL(����G��;���i�&�B�Ȟ>����J%)%߬RɃ�{gZhΩ��P�B�]V�L��a�8$d��4uf��$�PĀ�G�x�<<N��)�F�
� \?>zM{��\;ƭi���'���F<{u:�V���N���r���_;�J�7�UO��X�N�߮�U#B���J���P5���,��&M�NDYNI:���
1L����!Zy������:�z���X+�AÔ�F��Ƌ+��>�����Kj� )�sU���`M9�C����}n8��R@��r�d4''��q�+ؖ�g��M�&��M��|�>P��3�T.��nY:�iF�Pc7}�-�4jܚ�CJZ֏CB�={���7�f_�S�}���O�.3}��}I�����C�1�>�T���1��دe��������D�xI����q>��s�̺Ԑ8II�;�V\_daM�r$DN�=�R��x} %
d��$�F��J��+��g�	5$Qp)qXV���TXR@��J��G����1�@2��׌1����,TA<�	�>�_
j�Z)�(�:E�B���J���P�dk}̕�&YAJ���(�����b�cJ�o{{[����ڃ�j�Z��J�r||\��...�����]׽���_/..NOOy�F~̿��{zz�o�T*?�����GGG�Z�u]ިeY���M?�`,���C���G�J壏>�})	֗>�zf4
�bjHB�L�i���� �o�ga,�P�Z-!D��l�Z�rycc��l6�B^g�ݮ�j�f3�Ͽ��{��	�R�fԙE��#�bޔ4*Ɣ���o��e���w�%"�$X_B��a,b 2��Vp�)!ȲȲ�M9�u����B���bQ��$���~��^R��0��T�:�'F�Pc7)N>S�����5+�����dLOI�A�}��I��Ę��|��PK�DS�g(b@cH�3��AÔd�Ĉ�k��4�L|�����b��J]����b��O?UIB����b���Wn޼ID�n�^�����J����Iq
+A��Iiq��;w���/�
+Y9���,T���)��K-%}�ᇯ��:'����ІbOI:���
1 �Q�$Ç��ԋ}ꬸ�D��J=���4n�w�}9����y�4�
֓�;t�*�U�˥uw)�p��SR��U��$�;��Gdz8�N,1����� \�����Wrqq�V��Hu^�B�ݴ8��
+�]
W�Y9���
+��C�AJRt8Cb���NV��t8�$�kH̠cA֓�HI��Z�۬�Y�>��2#�s�ٳ����|4<�M��+�D�F�K;^�!����PEe*�������v�^o���g�����n��l�l�Z�$/̿�FJсC@D�Pc7-N!�u��bY9���&��$E�31 ��1���ǰz:���ی�`�,T͜�J�ttt������I�B�P�%��b�����.�uyF*��jR`�_kN����x} %
d����]R��,6��$8
դg��LC5i�F��Õ�}))e��o6�<5Uh�N�S*�x|�v�]�Tx�_^��N�
LH�9�t(�G�Pc%N�G(;�����x����ޞ�ڤGIIc�Ԑ�)�Ͼ���'G�����O����X���!��CG*Gc�b�9��&���{��џi}�����q��?��t�v�(��Q���0@BL|��G�	ވr]��Ç����$���w��˫��^������F�Q�Մ���B�����ÇՍ�Z�v|||qq��\\\�GiX���Et�<�hp��ERҸ$���k��4<�M�1l�y���G�4U���{K|w��6�\���68��ˣ�!o�T���Iu+�i
 )QR��^YHI`��KD1���B�x�w5"�胇N�]-4���z�F2���j5�5�3[��YsB��=��T�J�!f����\xGl�Bܺuˇ���<$+NI�����A�aZB�B���D��yH���<�\o	N���pѰ��hZ#���x} %
d�㐔��i�Қ�g��M�40寧��	
t�Ɉ�Rh��Q�F8ε0��A5v3�ԩ4��CJek� %):���
1D�a���p4LIk�d+4���=�^�ܟ���� ����Z�^,�˥R��l�j5"���a�\��X,�Z�J�2����t��+Ѱf
悳x}d%%��c#DJ���8$��3�T��&ԐD����4�|>�h4����u��Z�F��l6y�r��W|)%?h�ZD$��K��f���q�q�\�_����Rͳ�l6���[�V��U��E��;��VJ����L����w�)	t`B�$T?�`JM35�1��1�e�V�%�h6��V�\.oll��fS��l�۵Z��l�����{/�<�:U���!��͈S�V&Y9��e�8$dɔ4*Ɣ���o�}�|>���Q�)I�31 �0JÔdB�����௣Mܥ�z2�x��<X;�k��t��T*�
$�
'�z��w�xw
+LpK��t~c������8I���v��C���jy�E�ŢJB+&t�'0B�݌8�Ч�$+�������
Vdɔ4*Ɣ��or+/��DS�g(b@3bp�u��X]+�aJ2�@2:P�{6sd�Xf�R
p���b��O?������^"z�Wn޼ID|�+��c^*БWR��*%}�ᇯ��:'����І��`is�mݥ=Jf�BEt�_,��B��9==���;���Ņz5�*5uN�Y��ì=!��͎���c_�rH}-g���h�����$�PĀf�@��u8���ek���j���J��`.8��R@��r$DN�B��܈��&tj���~¼T�$��0ۯL(�̜�
+��!��e%N�T�i	AJRt8Cb���C�#=x���Ju8�$4��2
+�yh�Z��y�)���7�x�z�^�T��<�"�
+�)�/����,%ccӰf
֚���Ҽp��$���)C֡햆g�	5$��2U��VSJ�\�KED<u
g�Ro���j,E���V��dž��hW
���
�!%
�<��*��n[*L(���ǃ�PMz�h�4T�f�*�˪-�yR�R��|[�nj�����6ߗ�U�|��M
��4��t�O���.+qR�Bհ~�HJ������t8Cb���{<O�������)ɄIh�����N�>|rD�ѨT*|�^�C��������t:�$
���.O_ŷ�T���^D�Y�b�tf���.+qR�B�p*H�")il��nJ��E�az�$
k��LT�D��aJ2�@Ƶn�o�3Dc�����v�/ǥR�\.��6�zm�������v��Bp�[N<��T�7��^�s�`���waȆ	'���������gFIIc�Ԑ�)��-��џ�wy�l̎`͡�b� )�L"DVw$����hXC�#&a�RL�B5�{�L����@���J�~�B�p*HRR���b@3b�%����fnD���)	�l%b�Y�ԜS�4
悳x} %
d��$�C���������,��vfZ��-�k
@��&��2�0֞	}H"�B��L7&Q���Pc��8)S���`�����p�"�%�U�=��q�0%�Q��\nZe\�P����jU*�I�
>�j���"�DÚ5�������ă���:R��4<�M�!�E�Pq����<�?.���k�ݖRv�]�:�f��?��Z�W�y��SB)��?Vo��w�Cù��`����V̄I�~<8�T����G��c����j	!��f��*���d��B�:y��f�����{����T�:�'F�Pc��8)S�jX?	Y2%��1%����|_,�Ͽ��D�hJ��E�
1��0%�Щ=4Uh™�3:;#"��Ȳ���ܡ)�Q�ѐR�<�T�X��N�Y���n�V�J�n�\.sM7�U�7�Z���Aُ�F�\�
�[�?��W���bq��W+�ì=!��e%N�T��B	Y2%��1%���ܦK�+є���C��J�D��
+i��L(��nGM��r9��^�/�\K^*���\ 8�l4��Q��Q9�����b��O?���������^y啛7oW����"���R�&
+����I�
+U��Q��S҇~���sҹ��m(�����C�VX ��8h��Щ}AS�hW]	�2\?N�R����U�~F}e5�{s�Y�>4OI�<!%
�+
��5*����P�RYA��
�g��@J�ixة]�_�)�y�t�qB�]V�L��a�8$)I��E�
1��0%��$4,��\p��$��q������YlB
I,�����~�^o�Z�z�^��.�n���:����ը�j
^��NDj<�~�ϫ�aL��~���aW���	HI+�A�Ś3�@K�x�Y��%Q]��,T�q�y�D5�"'�Z�V�դ�<"Jh��c�C}bD5vY��2�����$E�31 �0JÔdB�$4���i�&=C4e�I�P��')���J�BE�<T<��n�+�
+�KD�|��Z�R��p������.+qR�B�p�wH�")il��nJ��E�
1��0%�0I��'=������4ߦ����ˤf��a�A���v+�J��r]��ݻ|���\�׋�b�R��߯T*)�~����������8
j-֜	�p��hϤ�}�\w�
+'�B�7����Y���2O>�o��8U�]*����zR�}���S�0kOD5vY��2���㐐ER����MI:���
1̎a����a�4LIek>Q&���Q���s�Y�>��@s��&�!Y�)��������\./�%�$0�	��C�8Nҁ,2�����H�! "B���J���P5��� %):���
1̎A�U���cX-
SҺ4�r��\7���hX�s�Y�>�����_|��4�>!��YlB
�t�3��Ѱ<�h�,TA��>�_
j�Z�������$��Ym�v˄���q��ARN�-�Y���~���a��&?.���k���a9g4�͟���j�V���vu�*Q��Ĉj�'e*T
��!!HI�=M�E�
1��0%�P 	�B�`*���ܫ�F�
.3U��B4��V�U.�766��f�)��U���Z��l6���{�\���*1�
�C���J���P5��
+�dJ�ݔ���C�V��AÔd�<$!���<�,�vv���,0��Xf*���˷Z���A���_�[Y�~_՘�������
+��S�eѝ;3ր��8��J�	5$��q!�u�����z��.0Z �V�|-.�J�r��O����,T�~���%[MY%�,�O�>������+��c�ו��u�*Q��Ĉj�'e*T
��!!s��^��zJ�ݔ���b�cJ��ƍ��oooOYF��b�m]\\Lz��Ç����eNOO/..ƾ���B������,kٸ�$�?R��Pc��8�L�:�&���F.�s�<%�p�"ĀFi��2�d���+�J������5r�g��!J�2Sƀ����g0/@�Z��]��f~���HI�������LH:�N��WW[?��ѫ��-0ը��k���Y�!D�Pc��8)S�F�,2�����jELI+�zJ��E�
1��0%e�@��v��|����z4lKD�\��nݺ��K/M_�?�g	G9�������L�����I3�7s�����I�
+54�d�,�rUVj�Z�|^���X��(zJ��E�!R+�J��aJ�F���J���Z��j��?T���_�"����8��
+A�,�tttĥ�PV��?�J;%!�@�d�@�C�p��Ы��onn�r9��_xᅯ���^x���ID�_cyr���׾��$�o�O�>�{{��X��j�#D��K/i�U��d��4ј����Op�y���������s��׾���.����h\V�������
+
+~��/����k��I�p�[�Ѡ�me?�b?D���}�b�9�z���o677ݕ�gϞ��!����e.��6%e�@4�e��/�L%�PV���L+X���v�,K����:��@V������C$�r����.O7|�����P7o�L+���A��m�8��O���t~��i~H�A�HY��y�����#����!]2
CD�]d4+���B[O�+�n*�*G�{�W[O�8��t#�������y�z��EX���ġV����
+ytt�v83�j�����
+R�C�*����q�QL�P������ 30,)ݔ�z�_�tS�V9"݋��z��A���p^�Cp멟!��!��\.w:�������w��v,��R���~������i�5^�\�я~�w�Ҏe�`��R"�a�Ǝʠ�P��U�#��Af"`XR�))��t�r�}rD����S?�l=�H:�N�\��7���ֵKIi����n��H;�F�Թ�����ׯ�2�·���Z�V�Ttrl�:��пd&������n=��\��D����t��^��ٺ&՘�o]����Q�B��6��MK�d����XB=a��}4u��@� [��������'TO*�V�U�T��&�}T����A�W4
Ò�MI�\��Y�n*���_�e��!݋?o�O��O)�K�&[O�o��%��j��Q9��ӎa���}����?B�d&���������t�r�l���Iw��D��ֵ:/P 
��di0L���,����P$�Z��j	!����W���/�����FC�:M0��J�|�S?�=Q���<�!
�v���画���i��Bt:���5���JI�~���"+��P 
�R����Ϗ�X£O��u)��3���TV
+�$BVs�@@Dttt�����S�R�RQ��(��\W�2������Z�$BVs�@@�N�^�w�]���R�X,�[S+���+����Y	��a
��Ti u�J�VP 
�Ԡ��H
+$�H 5(�@jP 
�Ԡ@�A�R�	�H
+$�H 5(�@jP 
�Ԡ@�A�R�	�H
+$�H 5(�@jP 
�Ԡ@�A�R�	�H
+$�H 5(�@jP 
�Ԡ@�A�R�	�H
+$�H 5(�@jP 
��>�f] IDAT����}�������E�R�6s
63�~���t��
+$1h6�/����8���'�z�>��V�U��s�\.��{��ź�./���/���������>?��
�q^~��w�~���V�u:��^{��l���z���k�ݽ{��j�6������a������)Lq#�LP����~�ٜ�@>�?::r�V��J���T*"�t:\��t:c�T[�T*�FC=��t��n�\V�s�D�rt�ݻw��e�u�o�����pmO�ݞ^=�j�����
�5$�stt���?��V�X$��*"����v{������޽���C�"*������W)e����+�J�놢B�j��%
.��4�@�`u��|�T�R�„D�j�F�5�M!D�6����:3�J��*�p�CJ\�\.��s�������y��	���]��fUp%�θ��ݻw�<��r�ٜ�2��2�+F� �Vn(\�2���R��F�v��j�Vl�E�^�T*c�P �֥��j��޽��k��W���R���b���v��z0�0.3�m�ĥn^��l�Z�r�t��m~0�w
+��oBp�z��ݻ*���v�N�����&`)>@�>�����3iIu�V����a>��������珏��.�zzz����7��}�u�F�����
+��J�rqq�o�K��]#�j�`V�����qttZ�nMZw��}��J0ͩ�8K��T�F�P/..��,�Z�s٤�
+e����r�����97
�H�1]�:�����sJ�_�C�r
`������'�R�e�~�ʃ\
Kr�����3i�������z�V����H�1]�8U(\��`#�8�-<i �����\&��{�-�Tۭ(���Ç9��!�g�R��y$;�
+$� �Q�����Gk9���*����Ie!X[��$p���n�'��P�(�i4<R�2��:s
�]��|;@&F���Z�������|>��t�K_����M/T*�v�-�l4ꂾd�>~�]����n����x�su�j�Z�v;�*��e�~���R�ո����~�Z>��@J)�Ԣ(����lU�TZ�V���t:3o�	!B{��
���H
+_�T�
+i���gމB���ܷRʱW=U'�P�]҉��n�Y�
I,��{����>۵p�<��"FKQ��g\��L����+|o�|㌆��n���:��჊�b�X��Qv
+ HJ�R�9SRֻ�)B���c�uK���|l�Q�<�3u�r�R�$�~�lU�y04��h�*�J<����~�52�&U
+*���S07�*�˓��r1X7h�I�8�nw�8�3U*��h�Z�J%b���%��W�כ�&w�{���qr�o���v;z]<C��t�œ���.���R��I=!��v�����*�
+W>T*��j[Eûu�?�.��Ԃ�����<!���~�T�l�6j�ەR�&����l�3�=�0�8Wst���|e��5Ժ?�X,�������#��{t��Q����gT���|#cGa+��`�������)��X,���t�C���xzz:i��A�-H
+��9:ƚ�K_>��إ������z�R��ͤ�;�`�-���C�NJ<l�
+���FS��iY,'-�2(�@"�)�̫[���M1sxXO�V����7@
+$����[��Y\�A��3��»�L���n>�G�����v`&5"���&��㡨���l�Z������r%O�Q�r��k�c��Ǜ-FD�n���S«5��qG�N���'�NxB�.}�f���J%^�Z��^�>��ކ[��{0
L�	$�+&�|��k�5����J�� �����%�&�o`^(�@:��
��k}H ��5$�j�nw�HY�&P 
�Ԡ��H
+$�H 5(�@jP 
�Ԡ@�A�R�	�H
+$�H 5(�@jP 
�Ԡ@�A�R�	�H
+$�H 5(�@jP 
�Ԡ@�A�R�	�H
+$�H 5(�@jP 
�Ԡ@�A�R�	�H
+$�H 5(�@jP 
�Ԡ@�A�R�	�H
+$�H 5(�@jP 
�Ԡ@�A�R�	�H
+$�H 5(�@jP 
�Ԡ@�1�@"e��Ot�Z`��WшK�{Y��"�^�rLb_a�{��a
X
+$����R����|���g���B�{0s�������*�8���ѯ���W17E/br�~X"�x�"ރ�W%�A����g������?�'���y��m��w�����(��]7ك3���a�Y)�U:�b|����"^��'��3c/�
/�bq��=�,)����	�T�BL<]׏e�I��-��–����-+惣���3}y�^x���r||����"�U:��<�e9��{�v#.��^��{16<�򷷯�mlxB���@�2S 9==�����j|/*t��)�]~�y����=qyu�/�������]>���
+0|M��tszz��~0+�J�Q��c��ؿ2#^6#^�#n7��4ߋ%�3c/�	O�idjX^6
+$��ǕJ����F���3\��ݝ���ݫ%'�`A�5G_��
���繢� [[�����bl
f��m"߲�-�_�xD<8ӯn��G_`�8%���J�*](��´��ZL]x�^��2�8���^����R���=�Qc�blx*%Eߋ)�"xٟ�*��{�����9�^D?�S���2��j�e/B?��Ŕ���!^9�����I�^'�F�!�BP���M�Gv��e�M?8��Y�g��~�1���7��/��������ND�v����;s��$���O���[��:?���U�Ν=�w�h{���I���ܾ�����o|�Q��X�LwͿ��/~��;[1/���ϟ
+�ż��~�_���O�>����ꫯ�?>�kYQ����TYi�A>�bQ��zdmӓ'����w�$��r�S��g?�?��7�׿��?��΋��~����:���۷߾y�'�.�ϟ?�����¾�J��:[;����\.wyy���tLIi�����j�Z��}�qp�J�х�4������C��8���/]����_�u��Ƿ7�x���
*@�G�:yc�d�� �oܸ|)��D�?�_��懖�[����_r�?���[����Ȓ�,z�K?%�9$��z��V�ƍ����ox'-��d�/Mֈu���V;�����v�!@�8���|�rޔJ��=�`3�Q�(���O_̶#޼�������blxc�b�A.~:s/�
+/޽P�<�VO�#�g�:�/n<����@�Iu�.�X'�77}"�?��7n�~B�Kb�[
+�آG=zc�/���$F߲}�阽���&\���
SR�
+$�F����u]r��y�=LZ~�_Ɠ�-ͻ���ؕ�Ї�u}!�¦�um����m�[�>�U8�μW=.i����7�����M'|�$\�����n���B؏��oO/"�e�v�������C�8qQ$����0�,".=�EL
+��E�ᙱ���\�Ӵ�mP�g�,L�Z�'�3z�O�?�qça�e��J܅�U�s"_X'���}3�BÔt#�������|>��A�/I��DD�Ew�L[/��mm�o���ooS�@w$��|��m�g����`�o}�vv&�<�|�@��Ӗ����O�ɓ��'��l�>��~����A<7oNX�$�������6��޴n���l�9���y�*v����?������,��/�7x���8oݢo<?�y�Y�vXz�Mg��m��o�r�%�O�l)�Ȓ��<�cӄ��3���Δo�q�jg�hss3� N��j�Z0+�w�U:b����x��sz��j�~W0�X�Č3��&-vvv�Ť�B{16<�4L�U���\y����^L
+/��
+�:�B�K�
+O�X�빒�;ԓ���KV����K"��ϩN��z����ݱՆT�>?�۷��
+�.��ƿ�=[:$�Ͻw<�f\���SR�%�e-6�F���"���ʼ�p��hVw�e��V�.����}���u�'�o��r[�I�,��}<�^T�D�ҭ��$Ticm?�ݽ����:U3*�#Z�������D��DL.s�\s_ĸ��{1Wx3qx��Œ�Mj;�
%��]���N�U.ܶ�w��0ġ���y2Č�aJ��b(�s���[s��~��]f.�*�#�������̵��/���FZ�����\��e"ʒ������G/p���������7��l:Qm���ۦ/��k���5���൏�����2OFY�����\���Z�f+�7g۶��͛>���
9�
+L�Q�ľX��vw?��B���u��ݏc�nĿ�5ߋ��)���hE_�����\�!:�K���`��������;�
+'���u�V�!�ef��)^z�/��"�(֔�;{𭫅�$����L{�'o�=)�!��3��(��^�@�K���W��̲�޽�[
Hū����ѣ���U@J3pR�x~fli"RCh�6
�|��tp0HЂ$�w�gM�3VFÔ��v�m�K#4l�:�2��d�g�wGK#o������u���Yҳ�r9���qh�w���������=�q��D��5�'��լ٘���ey�B��I�%!���m���uN
;7����$"�#ǡ���@xD��="���ǒ���Nb���曋������8O��դjH^|�ŧO��Ŋ���%'�
+0��$����L�]��B��������,;X7��s͘��qT�?-d�Ý�Z�,ݾ}����iG
�`FJ2�5cG��)IJ�������r0H�y&c��;۱��i�h����ӿ�f
+��D��b^�$
+$�7ի�+��7,�_ym�g���Q�Ή(8뢰<"�T2��H�����$X+*�:�z꾡Ux�s�	
�*c�mm>�|�B����<
S�	M��={ƕ�z֎a�?��	�_"��K�+}�����[�����DD�TP���~f�'{��٪e��o@��'����:�HI{{=���!šW��7ǭw4�������\BP�|�#������pi:���4,��PCbF�xD҈����﫷�����c�|��IxΡmۃ�ۇ%�!��$k���Β���3R�1g�;�����9�Q&D�b��S���v�}F��'V�
.,{��8�$
+$����~�+ڤ�~.���ADo����W_�;6wq�$!��'����E�Y�}(N���Ӱ~��0 �s���[��5�F��7.����Rz�[�Ľ]=!!�$H���}�7v{|fQ�����,��`���]ȉ#�5�1@��WHR@�K/��$�&�#A��3_ՐQ�$��<�<�VGNixd�(�;��&�m�&���4BDΡ-<�A�"
+
�%%9����;L�-_���]��%"�!Yf�$c�P3v$�{!%=yB�E�m��1�T�$"ϣ�o�J�p^�f�A7��,�4LI�!��|�w�m>��>��|3��l������6J��#Cx
�(w�4��mGQUs��v$)	@���K�
��ED������oc��T蘒R�%>.���i�z�	��VO\�'��|�y�p��}亾����[ք5_��{�?����0�5����ڲm[Ắ�����_cyk^͚�ّ��\����oۏ��j��[[��ʭ�ꉞ1ghsї�V�B�B��kƄ���&_�����>����y�'yX�[�?S�9.Hr��xߦU���n��3�,�`U�ϲ|"�u9D�W�����\r1/�9���֭[>������C���g�;b�^��:�]��[<H��/�mf|H�d��-��x���`p�������a=,��ܙ�
+�+��T=��c{��ӱ~���0��;t�*�{�����]I��Tۭ\������4LI&tj�E)����{bqy�߷Ùܷ��ztv6qUrdnx�lǫ�d��8�
+�ҳ�����sՃ�q�y�3��8,„�C�Dd���-���2�g�8B��t~N:'�K�""�zD�y��ˤUq��`h`A�����ˑ���ŕ��p�jgI�!M !f�$c�P3vİ���������O�ʞ�y�q���g�g�aJB�-0��'{��$$DT���[7?�ܾ}�~����hM�>6����KX��g��BBm�`�iX?	AJ���j���������^h���}�/
S�	5$S��layΡ�nj�.���Sῼ���w~�\�\��hP�2���K\�p���<������޵�u���z\Q������{#<'Ih�`0�	3��#2��0�X��}d���}�[DD�*���E�;;DD��������Ic��{����]��Ξ7�6�V^��`�>ܵ�YҲ~bFJ2�5cG��N��XZ�?��7s&=�HQ+f|�$
+$_}���8RJ����L�ɴ�<���1/�d,+��3v��'-�>9��蒶����G-�>�}�l��2X��^o���<�}r�A�)ɲ����ώ9�8���蚅يy�����9�#['���i�a�duf숑{!	����t����M�Gv��@�����,����aD���#B�;��3���d�n�D��o�aǣ�.�N5�mǹ#�E�q}`bD#�l̎h��j����g��W�'D�]�)���������5�Y��E_#&ȌY�"R_�5����="_؏\�����ww�­�<m�?n[<黚�=���N������]������
+bFJ2�5cGދA^�?���K?�(���$�3>
SFق�ƒn�PZjԬ\��H�t��U���e�,5����;���s?aܭ���&��$����žN�����f�ڇ��8.�$��DǃnI���#^�E�$1���d��Y�'QZ�r���'իQ�$F
�XD�8��ˆ�&���>�.��<ǫ�b`$
+$fi�\��d��_��-yޠ�!��`�pia�[\:9!"��;ߎ��N��ND$�`/1(��.�9d�u�&k8�	$Č�d�jƎ��j�au�#۲�ݹ�L�٩�I��,tLIi��
:�ü�U?�3�u}E���D�k���A�V���MZ���{�s$3��@F�S��@JX�`��Vዱ}/��(���aJB
IƘQ4�.�����.|FDt6��}d�ί?v��r�p�]��WĽD��}d��$�t�������`��u�&�x;
+�aFJ2�5cG�a/x"/^�w�M4�6	�Y��R��b�g�aJB�vX;|-s]���ٶM�G�?���V=)I������*){��<.�,����yDDV�ɝ7��	���
{BB���j��#��2�`���$��7\��ю�-�`.�$jH�={�>#b��?y�~��~�g
�k{{=��IoGܳ���SVB$�MZ�!�S��w�-%��������?�k^xs<1������#��vvH��ωȭz�g��,x�*�TqxŅ�K��X��="3��.���Ꟶ��'.�6��K��F����A�X�K��V����>)��7Y�A�!!f�$c�P3vd���/��T�<�a���a&�Df|�$4قu�f#	�*%9�%�� ��Yݪǵ+s;
+�$�E�zҰ~����AuY��"�B����+�#a��gav�h��Lh��5�`��A�ijf2����a�f9
+׽|��C��o�49�����W���=[�O�����V[0�@bƐ&�5;�V��\�P�x��݋2���ᙛ���D��|W:�̳?�n�d�!YϞ=�C�tdZ�I���ǾdƎd.��'�g1vI��q��ҭ�$���s�v^��B�5�I�%�zt( IDAT�9�������,2t��σ��q>��s��l
���m5����SN^��Lr�iKF!��JD���:
��!!HIK����vY�����g��Rr�j��Ko+"
S�	5$Kr�*IB�����:�^�x�]�6���^hړ�sp
"$�쌈�3���t���&�Sx̄	�llE�+_�[�z}�H7_�U��N�Y�%�%ٳ��J'��'��7M�և)ɘ3ԌY���
]�$�vT.v��$1i�b~uiь�BÔ�&[����ǮK�3�m3�q:;4~�w���a!�jd�x̶ig����s�jj�iX?	AJX� �s�U꽞��I)������Qh��L�!
���ᶂ�r�(�rݫ���
+qE�>�ݪGD�7(�H�.��`!(�>Y�c��
c�(�8j��`B�Č��̨+�n��;_�~/���7�5��z5�:��42*�Ί{W�3�xF�G�훬a�8$Č�d�jƎ��^�#���6xR��™�-I�Lb�g�aJ2�@��W_��z���G_�?�%�LnͣO�U�@z���_%_m�g�Ӡ�1{�<�a��
�r�M_>�xҒ��#!���˄�F�_1����K�6677�!"��9�1cG�p/�H<~Shh�W�;ܑr��:x��]�+".f|���i��>$
R���
^�z}�v��뼑�J8Z�b�W-�@O6؅� %
Ă�M���(��|h��t,<���B4LI&Ԑ�Q?�L�į�U���ᶮ��t�����A	'�Q��Uʹ� �:�q�)m��Mְ~bFJ2�5cG�s/�ΰ��ȸ�D$H����{�`R�	�(�0��0%���:��0�[l(�A=IL�lxm|��:���F�4�	AJ��_��V=n��ƽ����A)1�p��)Ʉ�8	1}�-"r�$�{�A=Iώ�nM������Ue.K�$�p�t�v�Ϗ��Q܂��}qhH�	3��#2��0�T���>ԖC�mZv-V&�4��������c�%a�r3�tkݾ�֏CB�HIƜ�f����ŠG;���]������2������jK�7D����)Ʉ�C�Dd��ѥ����U���$q�b��Ҕ2ɒ;+�'�+����n�d
�4����j�����B���<�%3v$�81�>�>��k&�D��?��q0�	(���)+�}r]�#R
+�s�x�Ƹ 3p��σ�=~D��$k�}d��`�Uk�{Iԕ;$el�n�]9��7�ӔG����$�]k+ԟ�U�zg�?-�9=��y�I
3�i��L�!1�~<�P�x)�/��!��fQ��[�.�{v�6�cq�*I�9�j��^u)!W:\]BR�5
+׺}�5�������9C�ؑu�5���P��lIB�N��Y Z0Y�2��0%��`"''ɾ�X�مϼ��A��M�+?4Q����I�Z��%�����'�ӧ@�4�	AJ��CBD\U2��̱+�`�$jH"\��A\y������p��Y�U���I{
Ơw�g�r��C��rzU�L�
���ꍾ4s
�A_��4fB�Č��̨+�.��U�=����_q�������T�A:���=�VW�P=��u�&kX?	1#%s���#k�����ԓ�}i�J�3)�,���BÔ�&[�p�,��B�*ݻwm�r�L]0��"J�IU�_~\33�\4��� %
Ď{��i{<��}�A�N���4LI&Ԑ<{��X�s�5�Y�5Gܜ$H�O6>~��В�J�Ď��&U�"���vw�ٓB�?�k^xs<�����B�=)��\oy5]fx�b0^`�EЈ�}[[[i��:���J鰿�}��w]��/�ca��Y��y�����D�m/�(^m�_�X���*
+��C�1#%s���#��zB��N�!D���<.�h��Ĉ�BÔ�&[�99�`��ޓ�:��Y~+�Ih�-5ƈ�$y譝-z��
��!!HII����#=+�j�LHr�0F��2%��dˌ����&�dEu����z��
�;�-9��`��{ݍ��\��n�)����'�2h��>�HIƜ�f������ɞ̓쇳���(�Q��ƌ�BÔ������m��I9���IIb�S�;����8�.���[QS��z���v$)	 	��sm�%�3:K���D$����b�0%�PC��M�G�E4��+$9{�w�����xUy=��V����svo���⡱�T��_Q��>�
+�j8Ё	3��#2��0:��;]��	��IϚrs]��-����e7�@��n��nK�Ov�4�������9C����6,��^}rڪ�-��ڌ�BÔ�&[3Z7	z��ޓ_���'?�=v��*�'��'��A���<��}��J�����$����!��yt���s%�z�>�֠��Z�n�0%�PC�9�QJ�Q��׳�ܤ�gQ\��$>ц[D��${v�}�
�S�sSN�4�.���ѳ�{b	�=m�P 1�~<"3�
+�K}� ߿�GD���!�Ǿ��g0�anb�%,���K��9�v�e��$I��L��'�b֏CB�={Ƴa�3;�O�l�<�%3v��� s1�>�>�e��V����<+��$���K�
�v�����1�z�w$�Yd�૟��|���4�����SN.�XݹCr��I檃^�����_��
��!!HI�ᱶ~����3��>�=)�\�5!��-9)I�(���4LI&Ԑ��x�""z�J�:�	��^W7��ɞ���$!����ډ
�h�{���3���+��y��[�|=Bxx̳�P��2
+$h�e0��W��1��#x��Yq��v�+hK%U�DDΡͱp��$>�>٤����0#%s���#؋ ο痷�cE�V�#*�څ�z��?�	9�����Yh���d`>�j�{�O:{r9�]�ܿ�Ü/��XX�do�<���.|��`��u�a�8$)	 Q��1�K��.��]^>(�ϦaJ2��`��}FD���G4m��#b�ti��>;9<��wW�=�����6=�qM�
"���dۃ��CiDO&H̨�Ȍ���4�_n���'D�{Yp�V!Ȳh�D��M�Y�>$0.���^�gg�lE�O6Q֏CB�HIƜ�f��"����&������|�kg�,+R�d3>
S�l
̍�� kg�h�λ$��*�n��`U�R�^���Ѱ~����\�l�<�ޢ�ߧ�F3,g^ߍ��sHJz����_�V��$jHVmg���9���s@D�~/�͊�� )=+�4jޕ�lS�Cn
@��-�w�!"zr��k���$"!��>��d�	3��#Z�sE��TPܱi�ظ��E�(�����IB�O����̭z�D�M���d��a�8$Č�d�jƎ`/+��
+O�����1=I���Q !""��f|�$4�X_�x���ջ�vV��s����|ŋ'�Z����Ұ~���������$�y�ںzcNJ���x
S�	5$Ϟ=sGJ���џI<�5g}�Kn��'%ݳ��n��%�Kؽ��^�1����C{{q�y�Kt�̵y.�?V
�0{{{��hx;
+ [T�b߿*��Uo�~��CS
+W,�FX��}[[[i��:���J鼿D��'D�?+H���f.ug�����[
ޮ�M�O6	�B!�`E�HIƜ�f��b,΀���L����)	M��cmIQ�2�r�w͹y''�DG��M��V�Q3hX?	AJX�\�l�v�=6�JI�C�}(N�����4LI&4�H�Ύ$q���Po�x���T�x�.I�ZeͲ��`���sN
$AX�M̿���^5��\n�VXnk�L(��1�ID�v�輿\K��=������{�>9{���]`g�k�*�I�C{ɍ���&
}Hև)ɘ3Ԍ�^L\'�)k�
+O�Hؽy�s��	=I��,4LIh��8ǡ�3�<r���>m�d��H�fYJ�`G��&|\֏CB��VC��XU�Vyj�Di�p[�$jHR�yDD�7{<\�<�{+���J�}d�t(F�*��Q%
�w8v�����-<N,Ƅ����QW����W��)/|R�V�,��B:���/�j�F5�\�k���N��qH�)ɘ3Ԍ�^L�YX�M�'��f�����,4LIh���\�E��]x���b�{q�����j4xL�%iX?	AJX�)c?�n�-��LnKÔdB
	@�� I�%gR�qР
+xj��Ebx��!AV|�F�T���S`�z�A7���ϟ�l���Ή5gnsXs���zD$=ktI!�vg��υX$f5Bf���_4��7�yP�`�,T�1#Ot��/OzX�{�:����N&�vK��O�׵�ȷ�sT��O�O6^�B	1#%s���#؋)�|���_a�Zt�B�����)	M�����7����/]v�9y�9�vsJ�N�)g�'=��,�z=��[ciX?	AJX%��ğ؍�����9ܖ�)Ʉ&[f� �HU���L����ߓ$�4W�lA�������
+�´$DD;�6�zDu��dc�c�8$Ì�d�jƎ`/��GDΫ���XD��|��9I��,4LI�!
X���v�y�Kj��Iw��$j߃�Q����� !HI�� ���G+I�웞Ѐ4)�0%�PC��A�9��U�/���d�%gl!!!B��_]�qϹm������K��Ü$+`B�Č��̨+�.+�+ݡBF�\%5��BP:#n	�\r(�U;+�l\4�������9C����\Z�9=�WYی�BÔ�&[�{��F��{�����U?Gg�h���^�ƀ,����У��͍�����+)$�h���J�)'�����k�
<x�t�� 
+힕^DW�(�SJ��jɲ�Y�*2�$/��s���CB"��{����s�9$�sC
+�"˨p��<u��hMZg<q��V)"���q.EQ�#0>R�@�T*D�fW*�zZ��3�ݘ�%P�\���;�R��;��(�ɩF)
+��W���J��w�p�� q�?�� ]�C�HtD(.8$n��-)��P {��'�����_��O�~$h,����%P�T}��#*ЕM��q�nH�3w������������ֵN��%	S�H��EDSl0kk��Jt%(�[��T�~Z��
+���8H	HcS�k�j$A|���?�J�$`~�ke�
��x�
�U'W��AeI�0�G��$RF}P'�'��V�þ�֒ĉ[fI5}�%���qK܈��S,{��߳ms�L�X����$9�� �K�XWvw��AJ�!I�ܡn+l�)�\��.^O7�����Y[J�l
�ҽ��/l��t�-����s����&;U�r��q��$���'�O�V�i"����>Y�$�!
@����xY��K�-8��q���q��(��S\%�_J����Qp��B�̅�M���V��	i@"�����č��=�w�����{�J�Q�E����8�]�V� �"��Wvk��AJ�!I�ܡn+���Ƶ'��n6x���i"���[��
%	S�H���
ߝ~`{��X�����7�6͋�>��
�:��K���#0>R�@.T*t�����e����vMn�u%P���,P�\�� ��k���'H��v}��pKp�0�%��*����L	CRJ
���
+�̛
�]n^��b�?���R\k$���qK܈��S8{�!P}��nz\go!q�A��?أ'�c��0T�ûS��޽r���� %ܐ������!�Š/������4��PwvJ"�;%	S�H�٬���{���?;!�O���$��:�����\�����^���\����AJ@�ȅY��P�x�T�Q�F
+�b%���~�����nqf�����(�fjs�H�Û�Iƈ�`@D�uNS�8�>���Y�[b���H � �tH��a��o4�ԍ��%n�m�)����iR��?�����iԬ�S�xC��޾^'JPd#0>R�
I*b߻7���}�gђ��o����,f�_��T�d4M&�v�=�Lb/���k�4)TI~��)���:iR���پכ9$�-mgB�)��ʙ��ޔ�ׯ���nHRA��E�0VX��}M{k�����V(P���%�I���v��n��j�z�Z���$
@w������K�wmZ+��I4)"��}:ɘB�
�ï~>^U�����Ѻj���b8$�F��<"�<�Z��^}���������;Ｃ�>>>&�迱��l�����~�ڼ�F��@��hr[^&��;?_q�����Rt���o"z�{�b���Ir�����J�{���O��W��d]���w�	���������W_}E�`ʖ(�0VXr���]"�PJ)��S��)[�ɲ�n������z�f�}	)M�(b%�}��c��YIe�X��A@�/)���?��tB;!0�	H	H9R���������W�3�Ǖ��p.�|�tJR1"$��y�^�C%��{�7� "��i<ޠ�2��SD�p��x�5� �(�H�� 9��՚x=z"�3[�Y̥��(�C��tZ��RjqQ��qK܈��S\{�����7I�������RJ+Ejp��A2'
+����pC�����p�Xa���g����ъ��B]#��T�)[+@|�":e˧�|�dVR�B�>��TI0f�=ZS�}=�.��� % I��������[+m��I)`�B��_&�@I*L�dϟ?�@k�n��ilę�~��.6���ͳp�=��~�	q�n��''D����D�7��-ݻg��stt���(�/^���.�K�3��p��߿��fO��`��d�6�`�z\�	������JҴ�\�z5�&dG�y7!S�k�RS�)�F,ac�?��2�����a8%�*�Oc2`oo/�&��pC�����p�X�ɻL��ʿ�vO��ο�
+~�]%���)[��	��3����f��ǃ��z63���
tW'n	�����$
�/�
+ݼ>��Y��������Z^"_�R�%Ʌ)[n� ���JB������κgc�?����ZE}P�+���
) w3nI���tpC�
+��Fq�X�u��k+7c�j$+���I�"P�!
 E*��������b��hMA�~���T��B!�d8R�@���o���>��j(�H0,_���%Ʌ	b�}?���?���
+���"b*T���Ed �?x��V��6�٣�c=�K�"�C��ٳ�d�:��p(J�w�x�P���WZ[���Jѓ��<�6���(ü@�
Q*�^
$\��ߎ.��$P0eKn+6����Dd�n[�FVX���D<����#���
+�����+E:Tz�IQ��@��ݝ���P徨\K�E��� % I�N�B������{�wK�Wp4���0�������B��l�#���(�YT��_�w$���hM��x��O�x#D���� �7Uw|MJS�JZ8\pH܈�[�F�֞���?�-��Ɔ�"M�%ע�q=��{��U��?�?A����q�nHR��^����M��ڱQ�֊צ'����)[�W#��>�x�q�I����"0>R�@���!����U{&Z�ļ5�/���B��(@[M���1�t<QJ}($IHx��G'�E
+�U�b�j$+�3�W,\pH�eKx�w�X�,[Dt��ODgg��G/.?Pjv`6mV����&EZ��[)}�6�����Xk:>���U���e�l`ʖ(�0Vl�:��r�/#��b�S�@�l���@2�D[� m�ͲB"ÿ����jpL	֋ڡ=��4�/n��q�I`|�$		�O�Mv�2��A�l���B���XmVgQ�Cc\'1ܝ={#>q�(��p�Yu�������X��7�㖸���%{5��
�Ec��RƟ
w��T�͖W���c��')bx�D��AJ�!I���n+��p��ͬA�T�RY?�j�a8ө1�bK�$a������(�HDAEkRߦ�if22nq����W�O�K$a�6�����$
 
2����?�[��^s IDATe쁘=)�a/V.��%P�\�� �����W���*iMggDD���]�gޝ�¬-v�M���޳Q
E�p��ߚ�!X������č��=�ػ�?&�)K�U��R��`@D���)�J���aH��̏�}":ڴ��q�nH�#}�+���-P��ЬX���5�6�����)"sm	�$��/_�'���K�ۼ���Μ�!�d���ǯ���ˠ�aHa��u""��TI�sVJ���N�P�>6��������%P^{���������n+�z��CR�q4m��[�;�X�%ׯ_ϻ	q���,������6���9o�SQ��<��$�~�֤��A�a]�ǜ9�@��R���j�z��K5���$+w����g�T�?)P�\����$7p�R�{���x�=�Ƙ�V�?
od�+ˍQԕ?Ѓ��ߤ!0>R�
Ir��u�X��ۑ��������RX�f�z���Y��?�5,���	Yp!��M�uP���h>�5���E��4vA�pH	H�cRl����}:<$��L4D~�MѰ$[u1)J�
+���)7��`�R�Ih�&O���R�y�2,�ek���dz����ڪ��j�X��.8$n��-q#nk�;�r̘H�?�l��r���C��{��"����ʪ�w%zJ+)�$9���a���pE]��0�3oa���'P�0e����k�.t�up�P�\fmiM!Jɚ�%3~�� % I�Iñ��~p4�hTt�F��J���b(I.DH(
+��'[���~���k���A���!Keޟ�����z7#)�U���?�[�����č��=�ٻ��5]6�h��y�����z��Bv��jp��AQ&n	����pC���{�0Vl��T����M8�&6���rm	�$F��7�w�?"��I�`|�����Nj'Q���l�����&��x�?�R�}F\�Q�p|DD���?��?�Q�l�0�(�0Vl
{ g_�љo�Z��O�%laO�
+��7=0=P10aS}i��k�[n��ޢR����݌�Fn��	� % I!Z��F��S��hLgg������B�č��%z�����;�ݼ̮5�*R@9��e�)��N�ʆ!gܒ�)�$9���a�؎M��lDvK+��4r
+o�@IB���T�������۔G$� �"�rI-5:ڮ�i�5��[��@J@���	�LU�^$���Ô�DTfH���I�pc����=������zc�"?���c;
���#��&���/���(�nH�3}�����1�>��B��4��W첵JҲv���	��H����8�"4HDP(q����Q % I�bV�t8]��0���j��A�a=�;P�?wK�$�!
�@�>�4��۳��$o����PNl8Bj�~�� �4\pH܈�[�F����=����*�X�dk��8�Y[J�V	Dg���aHDj|O��-��q�nH�3}����]P�����|���k3��b��B���$7��[�F2r{��X3��.�k�Ɔ��/�ԏ����Rd��k�y�^����pC���{�0V�NR��.V�X�8�@Ir�!
�(pgtvFD��l�P�6kӟ���쎄!iMD� /�_���b��
+\pH܈�[�F��'��?�>�o9eK��}�u��H�$�+�g�g�+)n���8H	7$ə��
C`ER-��m|�b���kK�$����|�2�5K�Mcc^g^|I~�wܘޙs��~��S"��Ǵ�?�{7���gVjL>��+0�f�i�fF�� ����N�Ϳ������`�R9a���!^�L�������w��Jz����i�n;Z1�ep��4F��-�� S��
���;��̿D�T�#����ZW�B��4P`�E��$��*�oh�G+�����/�\�.P�\����$7pW�]�njl���,��3�reÐS+E�o�(�����q�nH�3}�����~����VHȵ%P��:$���~g7�㖸���={��"��8��a#csO֡�NIKR��ڿCDZϖ���D`|�SBIr��u�X�;��I�j��V��
�M%I֔�n�;�L&���y�N��(��A��	WZ��������*��>�ǹ�Jʱf�*��������k�$
��
+�ן��޳T�ٴ���R!U�������@I�!�L&�Ng���\��[""�!۫ѾO�*=�F���$ȅY���Vl�xeÐ}$�l��'k)�$9���a�ؑM3����$b�R��y#$R�d9$D���'�I�߷?č��%n�m�q�^���#�퍝Ni���c���m�Q�W�?9���ǁ
��$g�^7���Y)��B��g%b��z�i#P�d9$�j���{��Q�@�x0���,y���'	Ð�{ɬg�0h�IU���
ؔM%���C����l�Hp0���}''|�$��Q��QJU�U�C܈�[�F��'��m�޿kalllR޿��"Mj�6�{eg�����s�	��,%i8���F�A�H�3}����]ٟϏ�YqY5�Ĭx0���(I���hDD�ɄX�F|�7��8i������q̸��]�	$�"Usn�
L���r���=�#0>ֲB��K�v;���
IʿsI7�;��~J���TKwLʊ��$r��(I�"�����p����H�8����~|,�%Q.,�!�7���������.u��V����j��G�_�@�l�#Da�”ݧ0T���L#
+Y	O����G��č��=���)�^-��Th+cyI�?��:�������$$� I�����Z.��F�a�x�����ٳo����N���D���	nL��Z�µy�Kn�����͋͵ȫ����K=�����m�7#Y�=��bGC��7�]��������~����+��:$��hd��I�A�09�+R� m�-+*:̽�S����Wo�َ��[5E`�w`Ϣ$���N����z�f�i^�$
 �MK�PʪQ�\x��<	�$YC��˻	d�a�h�0��;�T��"�'oW*rgF�$
��2I�<���m����{���<g�U=�	U&M%?pb��NuH6�ٳgAh��w��il���w+V�w�h�E7$��v�K��.^\�3GFT��4��z}��~��S��Μ҇{ip|L�
+?�L-��#:::
+�����%
��R��VK�xr	7f��q�q�X� ZٴDk<X�1)+�p�J� c�D�,bYS�z��Ifb_�qPD*R�1��Z�V�PƬ��#H����y�� 0�=?��k�$
�<���z�thM
���L�T�n,P�dEH6*?@�9;K�r_��Ȝ�}�}���uS��柯Y��
�$C�WE��\�$�yȒ�9#�!����fsӴ�n��-����]b+�6V�0�> =�-[�ݕ����X`|��̒�L��!�bw̜(=���d`�<*7��@I���V#RnT��č�H��lo�P��dz� ئ�9)�~����X�sVW6�cPy�X�
+�PZIr��u�X�Ļo~L.�Ƶ(I��j��n���~�

 }�}�p��xk�d|��F�̢�t��H`�(�Iҋ/8��c�8J~fg)�������h:ճ��6'!�=�A 0BB��s��ռ��a�݄Lq�^�iN�pJ4
�L���R*�h㶅h�(���p�^Y�f~f���e�f Wܐ$g�^7��@4U���:�[\�%IV���@JPP8�VxߟU_ҕ����II������ <�'d���E���!]�4
)
I@&\�X�붹�� ��4�<��#P�dM��7VZ�<�
��U����s[�����J�~�F(Ez\_{�r��ߑg�e6�Mb|����L��!�"�?x�bˤ
^u�g"$�	kpǸ�8�őӒ,4+�����Q % IȄ�|�2Bm'T�J�ߧú8E�
���B����_Ȇ��Rp9�?$�!^��M
,��R@��$�
.8$n��-q#Vh�����Y�^3���"!����Õ
��`�I
||���-��q�nH�3}����T�iO�.̦g�V�$L� O�4"����G��ۮ�O������:��
+�>���N3)
I@,�
+�!
MCMZ[v�B�!�@Ir!B@���y�k�!H���� �li;)�Q.�[7iM������:$N��Cp�O��/����!���I�����n�!I7��[�Fl{��W�YMߟU���T��ɵn'8��e�Ur��D�H��1���z=�J�L�R�
Ir��u�X����}��f	V�@I”-�$8�O4"ߥ?���]ɩFB&��
+dŹRkU*T��`@D)���AJ@��"��:�ס�T��ׅhk"�$L� W�����j��y�*T��,���$���������DDZK��$N��MvK�L�.8$n�4�D������n�
5����l���V�����rj�H���'�nIH����
Ir��u�X��u��iC�T�cz�#^�;#P�0e�\	��y�wv;NJ�$I�5
�!)-l��EL�,�Z�D��q��$���9���I�A@DF��@�$�!y��9�3���g�yf)��!��w��������.g~��k-���N�/������X�C����$&�v�pI�p��~ż�^�wJȧ�8y��O7R�X�Fz{�`/'ښN���\�d���J�x�d�b����0km
+LiR�
I��M7�I�)��KDi݁su�`���$L� g�i�*
+)Pj�IW�
+��8���z�
�&��h}d<K�U�Қ� �\[�� % IH�R��t�Z�����<C�$�0e�B���iן�4�I�-%ϟe��6�
�(.��`39�Z�v�\��C�FJKt�~+��^��^-����ý~�D�c��K�b��^��l��8i�������s*�3�j�җ�0�8��(m^�h�E�mfxѦ֚g)�9�~%�;����U�J����/I��@�$�h��OG�i��ӳܿ�ډ	 0>R��dX������>
i�)�Ib�#%Ʌ	�&i:���;��AimU�*3.YӒR�@�l3a~��-L�r��ث�����U���f?���ĺ¯,{P	�S�ʃ�$���
C`E��Y�}���AQ����U�X�%	S�ȟX�-E:Tz��pp0�㺨�{f�Ja:Ԏˋ6&;�L`|�$	�Gc=�_%�R��������&ߧ�C����(I.DH(:�g�
+��Qp4N��;0[��I�uq�b�ă$�����S�'���Ґ
+.8$n��-q#VhOI���GG��c?�s��w��2sH�u�z+�ʚ���
+�'���8H	7$I��3n+Čn1���cQ1��(I�����WS�v������^��7�_I�����8H	H©T(�;����4χIDa8��X\J��KP�2K=�9�x)�]g��;�j#2�W�*#�4�%$
 =��D���Ð�B��tD2.8$n��-�����M)�i>_+�}ԫ�V�x����B���Nj%���8H	7$ə��
C`E���F������	��$L� g����gy�8Z�H~�  z0��B`O$I2k%.!�t[�� % I�� �T(I�� X;+VF��?�J�
+M���q��q��z,��Y2w���sI�&�Sl��/���� ���迱��lę�9�3�����Y��|F��L�4�Rj�W�!��||��	M��իW�nBv�a�w2�$�*5%��)5Uj�(�*��i�pJ4
��O��I��~��
+iW�[��+�e���v:7$ə��
C`E������5w#�X�%	S���_�F���mO7�e��"�JeV[J܌-�/���4�6�#0>R��pL�`3w�l�$�l�����+	%��'2�͌�����~��Q�Ƃj6F������BF��q�nH�3}�����جQA08>N�)"P�!
@<_���������S�����,�tvF�
���͛��1���zu���(��$�ÅD6��D��@�$�!
�
8��૷����./D�Z�`@D��	i���Z�j9>��l1-��g���č��%2#��Q*{g���)�!�D%{{_�TBG���J)��v)�$9���a�H��z���Yj
����C��k��݄�P%��Ke����?��	ڭ��,����n޼ND��z}y1�E��I�I,�~�z�-RqC���{�0VHA)�n�(I.8$����S$��uB����M6R����4�V����Dt|,���
����Krb
�L\pH܈�["6����MM�b�<�=ii�����I���R4��Ċ=DNV�P�b�3
+����pC���{�0V$σ�v͑eŶ�$d�@�I%ښ��t8��0	K�f�����gK�-{P�)M@J@��O���\� P�\���J��
+e$@PJhn�b䭊,pg���gވ�(.8$n��-q#VhO��ռ\:���O`������G�B���++0	�LYD�y�����������pC���{�0V$�N��j�n�(+�F�$��������TlB��ec��>JtX���Z��<��#�/ec�H�CBs�
+nj���kH�4
�qtt
�p��{��Ɣά�*\����!�Džh��Fs-$��ψ��x�/ݻ7�<ɒS��7����I��!��zD�l61a8���J�Y�GkR��=Ak6� �J�*@?�=�ŕ$�`N�)
I��E��Y͘%����p���k���y�J|ܒ���<��Wk�3O�
)`b/��_�x�&����'nEn�F`|����L��!�"U6R[�Vl�@I*L�d4y���v[��h4�L&�~�Z�"B#�hk��X&6�5����}Y�@�J��E��4�� �W8R�@!����K�hK�$}#�X����֞�Z�^��j����h��.
+�٧�Wd6���-�hMZ+���%�R�Έ|~�5'�I1�l5
���y^�Z�����Ӄ�����w�yGk}||LD�cO٘י���µy��l����o�5U}�a�3��/�����|fu)��_�%����%_�WO}�t��[���w� ����}pp��W_(��%
+7�)�3�7��(Њ-����i��D��tz�^�ٌ���8p	D&��]��g�O5��L�#�mK`/ɺ��� % I�h�J��(�$(Iň�0���z=��,�3=�/lI�w�Б�� �
��#<k�H�!���Ea�N��j��ھ��qK܈�S*{�M8і���W�jMZ��|�آ-�L�%0>R�
Ir��u�X���̓�.߷]�f�v���L�Z
���%�Ad�D�AE��YU*��VT�Y[8���X���8H	HE�R!ߧ���2��%�0�<��k��,��3�<�XC�n$"z0H������>
~tv6�g2������������z}�����h���(썄�lPɈȚi�z�j�MȎ0�nB���^c,�T��F��W�؇�(T���ζ��R�0�^4�D��Ԕh��ۺ���Q�@޸!I���n+R�h֑���2$Њ-(I���8�Ӵf���d��I����k�b1�Փ���AJ@�(
+�z2�zoq�X�L
+���”-c��PY�*��%O�3V��PB�>U�`:���7R�X�K�{�T�FT�٬$"��k�N"o�Q��TYze�4ϊ0�
+��J]�x�!)nH�3}������ڈ�/ҊM(I���8b��L�%vZTp݋Ӡ
+7~i�-��q��$�Bp4�����%Ʌ	�l����nǓ��&��Ykz0�e}Z��ݣH�D��y;�4ݻw�b!�V�x��_�B�-8�̷Ù�9�_?K��b?���c������p#��%n�w��T�c���[�S$��P�}����&˵5Of�-�x�4
)�$9���a�H��	�iŦ�$L�@ZWef�$<��R��tu���$+��� IDATج��uK��	�����$
P ��]J�S��XAh�	���R���X�,�dO�<�v
�����T�������Z�� ܐ$g�^7���``��\+6A�$!B�Dbc6�
+�������:�A���
!�+,��8�&p8
+�$	�T4������*:%�y7 1�nBZH�ҀP�1�ݢ���̱�N)(@�A~g��b�ji��8���[�H��֝y��הRׯ_ϻ!����4����ݻ��5Б�+6n���3��b���*
+��w�Y�H��޽O����"O�d9Wp���)Ѵ^�b:���u��o�1���E�!�"=����2��,jO���%V+E��&���.��H����Ʌ�<�*F8I�Ҩ$�@IraQ;e �)@���O����E����V�!
�q�!�=�I�ݾ}�v����z�v��n/�m2�����d�>������db�����v{4Q��5��z=ޙ�����>�l���)��QcCu���S�j���DϸE�]��'�}���iÌAS���@�-Q�a�H�M��2�����C��k��x�N��y^���F�N�ݺ�n���Z�����V�����^�ǻi�k���}"b��_�F�3���<�I���K˦*Y�#R�T�^0v^�c�Qp�Aj�5���۩�\�"]�em�I�_��m�@n�.Ip��u�X�6��� �d+�(I.8$q*�ٟ�5��%^m�H����x8��}�t2�t�]v6<���_�u���*?���h4��j!�<���7�M��ٙ&����7n�`��l9Qa���Y�\��Y[Ƅ'O��\`=ggy���������+ Rg�j˜N��l6�	�9$E1Ѻ�O����eT�U>��Z����
+;3�.�*;*7nܰ4֍X�=��w���O.<2�Ӟ�kse�T!qYgBs�ݣ���A�M9�)[�p�X!7�8eY�f���N�ëG&�	O������<v$�ݮ�ix����������y�h4�<��<�u�]>O�j4�n�:==�����ʥ�j4�v{oo��͛�]�"0Ȇ�`@�u3�58�q=���i����$�������%�pd��X�t�R�F���2��	���gV����<� ��y����ǏmNbX��:V���E6��Y�!��h�����!;6�^�œPʧ�S���%S�۽_5����_�8��E�pU�BտȻ�¿-E�<r*Q��!Yd�E1ľ4�NI(��1c�!�����Y���˯�6���E��������AaDQ�a�H���P�!�0�kH�41�-�`6�����Rٻ�؄�ZT*�Y8����W6�<W:��D4_��O������4	d�@I�g�^7�rp�
+d���
���|xuG����䖶����f����6e0������
+��
��8�b��)M�@�o�4
+#Ǝ�F�P��K�{���D�n�w��T�ƍ]H��(�O#�^��+�Ц"�_��L��V�sZ����Y�D�!�"U6��(֊��e˅5$�zd���m��͗/9I�Պ��t����~�{��{���N��v:����������t���?~�ۛ���~�3~zzz�s?~�j������������[�>�̈�:P���nY��J廌����?�(�Z~�Jᒅ>JM�_�/�7䂨���ʿ�w+�C�oK"$1L�C3��TAd�6ZqqH"�?���T����z�F������nW)e����[�֣G��d{���3I���Iq4=)1Z��,m� ��Z��8����;9 ^�xqtt
��F��=Md#Μ͙�1g��{t46?���eX C��?>>��T�e��aT�W�O�������hl$ÇN�S�T����������o������i���>|�l69b<==��N���N�SsF8�rzz�,[y7!;�U^�������&��O�^٢�US���@�-Q�a�H	�&��ԧ/��_��+h��$"$/_�"�������DD����ODt�~|��v���s��V�5
S����j�����z=.��x��p���ֺZ���gϞ�ދ,�s�h4j��\�ќӸ�ѧEtͷؘޙ�}D���}"�JlފO8�OC�lY؟#��̸�[��(
Ȳ%
+7�)a~���w��m\�@+�@`��RTj�b�D�Ԯu��.��y���;�F#�,���L&���/����/���I��	�"�hM*z�V*	|��g(%�B�T(c��*a�\A,��Ǎ\���o}�{�{��y�
I�����x��aޭ 1XYs�TX�H���C4	`S1�ɛF\
+WKĔ�����Ɔ�b���<�]!�q]��+[�
+���/0>R��ի�k�v5n��H�4�fR�X+6B�$�"BB��oE�z%z� Cbт�`���d���Xв�D�}�jY�	7ry�ַ�ED+������#�y4EA������%��
'�:o!rҴ�b;�?J�(��,�� ,.,j߽
+�eaD"���Ȧ0b��抇�n�����xgޟ��Ï>�Ȳ��5��S*{m�
��|�����9���|e�ś$�X鐍$�
+�.}�{r�x�$=�|�;� 7�X�6��6j(�
+{J���)M:���y�Ng4u:�{�z=��[����V������)Į���\ܧ�<���V�����\����/��l���)��K�U� �%�$v�����+������IҚ�`�gX�Ek��$������#"���6z�$���]
�HKo�d[a�@Ir�!�+��tK�8�EVF���#�F�Z������~���Z��y���Ժq�K#R I�g���B��+��7������ջ��+�S"�s6�C�$="�����!
)�C������r�l���t��&��1�$�~��)ͻ����yr�j5�5�W�������ƍ�ƺ+��T�Z�x��'��Xc,�+�L��D��AJ\��0��t�gX�e!�v�$q��G�Jd\"2�d�G�(7pCD`�ܰB�$���=>ekq
���}a�M�Q�Z�f�Q��aod8�.��g�Z���F���O|B��Ks��q��>���͛6ƺ+��T���X�_>+��l��%�����H�0�e�d
+����E%i86
#I�X.�#�W�JЊq���rp�
+���w����C�8\$���>�N�>\]�$�3�"�5��݄�Xn��m޽�؍;���dy;�\���8M���DfuHh��z4�D��ㆈ�
+9�a�@Ira��˗/�u�;bwnjQE�2&���(�Fc�!�!?5�OWl�t	g^jr
��?�x�O����lT�{4��@��gg�~�j�:�����ɹ�[��GGGk;(��FHV�(@���#�����x6���V����0bq+�	,^2&��
����>�+�jMA �<��gJD���
+#�#�Fv!B�6��|�.���
�P*{m�
CE	},s����,?�R\و�(p!H��$IG2G��p+�]
���V��RDH��%�*�A^���F.K��K�8O�����_�E�բyJx����G�'[\<�h4ZLi«��@/d����>֣_��`���d��y�$�sn��pY�D_�:n12i#I��7*@�X���Q�Z��z��d��M�	��.DHVÁ3�ԳM�0�[o���v� �����{���~���h4j��?���9��ť�T`{���"!��zo%k�'Z8�b��hM�Ot�&�����
+#F������F��$�#����?�
���$7��MG����.b2�?���T����z��{����w�]��9g��o�Z�=�,��C��Tn�
+�)����&Y9$����uc9˼)�$�/���6�x�'F"�c�r����$֣n��y^L¨ȥ�X!7�(I.8$��&њ��:��Ϟ��T���.b2�yT�Z�*�L��"a��?��C8�<]R�ʍ����^{cWG�6c��d��zZ+c��Q��|D%)Z��Xw���s&)�h#I[�Q!pCD`�ܰB�$�P1ƅ��
�x<�b��WM�O�0�黵�\����={v����{M&3�eḹ�y.���*]���<$�ovHD6&A�'.�U 9�z5;�f�V"�c���ѣ�)X,C��ƍ׮]#� 3�.��+
+#ri�ſ�Y[�l�T���K�O�����g?[z6.��ˆy7!;V;/`8Cտ ����h��'�%��F��ʆ�ζ	 �DS�U�@J�-��Ԕh���nT1*I+�ȼ�T��(���BnX!P�J�e+{�&����+0ȞX)�J�|��'��}x�v:��$n��	�h���JP��d�@�����$2��q`�N�≈�t���R;O�I��H	�C2K�
=���dmaD�p#��=���Rc/�N����^�Ŭ8IR�q�L޵�+�F5S"�����$!�n����V�$�X��-h�۷o�n�۽^��n������4��~��n����
?�L&����;pA+S���z�������p��GY6Ս�����K�
g�ף�Vth�V�{�Ͳ�F)� �?~���
2"3I�\!$�D1I�\,,I6zM&�n����V̲�C�;��{�^���v��ۃbu�x7S���t�~�U�9�d2���/31�@4i����'�D`��i�QD�䇽$MY]�����6z�dc)0.8$Ϟ=�è���K�D�#^dEa�N�é9T2�RW���j!�<���7�Mη�[x��g�N&�7n��2!���c��l�>]�q��%���u����7��"�V�!)����Ӛ��ggc~���a�Eܣܯ��owtt�a�b�Ni�0ek�֬ز�L���B��#�C�$=�"�A\�܏�V��
+N�r!�/'X|�f�$�5����a,p��2��a�����tzrr�j�NNN���NǼ���!�G��NOO;�N��RJ�S~�h4>|�;󁧧����J����'���K�+\�E�	d�����~S|�-�՚���\�_��J��f:���2�����V��l6���`:���I��#~I�a��F\��dq��"�D��0b����%�z��7cu�x��p�g�Z���F���O|B��K�(����n޼����itzU/���F���(4K��F��\&I�B��#I�H)���BZ-@���%��ˆ鱶0��c�����ˆy7!;V����GO�My�R]٩�*T %^��k׮e��6��e������'����M����Lfo�ҙ�޽[�6/n4ע@m^��E4��ݻJ�7�xc*FL�MQ��S�,^r@��x���.@y�4��\�F$�J%�[l�ˆ�$�F���¢v�l��#8֠5�ϜXJ�!Z/f�������2ZoQ����U��� x�W��tn�w��T��26����J��R��,�Li���Vo���p���rp�
+���C��
+�<�髿E�(��x�)T�����^��4�y�)��y�,�h���e��4X�
+���$����6iF�¢c/I��Q!pCD`�ܰB�$����E)�Ni:�4qP��z�n��ILe���{����}�������b�rW(M��*�Q�����-aod^;h�>�F��K���ǍF#*Ifĭ��~����#@����������p���K�"&S�O>QJu��^�ǝ��y�q��UJ�s���V����#��=�.)M�F�ОRٻ��0�Ci�\�˓t��q�QI��E���R=Z��)�ӗ+W��ƨ$�u�]��bFE.�膈�
+9�a�@Ir�I,>����
��a��ep�v�k�
�j���>�!�Z-޳^�w:L7H�jUk�%Jj�Z��3��H4
�ٹ�	��Q�c���Z��XW�_fQ*{s6v�ɚ�V��hn�l`l��g�C`|�DT��h<~�Qk����x[\&I\��L�2{�jb�%�ʕ�XdT��УB����
+9�a�@Ir�!���p�~�ϛD
+#�h�֚w �gϞ]�z5�^���b�C8��yJS��xW�d��O%��D�{fct�u<�>XL�0bL�=z�8�e��߸q�ڵk=dFޅP`uaD��D�������0���E���ϗ֟:??���~��l\���nBv�16��,�ˆ|��W$q�+[��

+#���W�.գ0|uOE�v�v�F�J�
+=2�.գ�$��
�rp�
+���ˆ��E!�Ex���5 � �J�J���b4P�s�*����en��`S1K�#�7'x#;��]���tIi*7VS�S*{m����2=i�$/Օ%�+AJH���������
+9�a�@IB�D:�X�AE�!��H�ꇊ�L�ۖw;�7ry�!I|�
p�7��ݱ�BE�Q\v���L�)N~bv�ʉ���!!�^�����t8~��Gi��K��=:ñ�����I���4Y+
+#�$�����\p�!�=>nY����޼�jݹs��$Ҽ@�f�Ûܾ&��)b�9�d2���/-��F�ОRٻ��0�T�kM��K�!��ʆ!<�+0>R"I��m4,.�Z��r%촬�#fG�����
+9�a�@Ir�!��!YRbjqK�Z�EVFl4f��y�'™�=>qn�Z��.
+g
+n6��o����g�L&7nܰ�r#
�=��7c3l@��f���� %.H�R�Y�e�2�e�+ԫ��"�Z���˘p�޵zDE.���]
���V�$��ϟ�N|q��͖9�N��lr�sHb��}.m�qsWn&q�j5�5�W��������ƍ�m49?��k�1��8s�R���j�R���4
+�9::
+�@�pȂ�Z�b��$i�Y�:��qN��"-�h$�F�(�u�`��ڿ��o>}�t�E��v۔]�*T<���K���ݺݮ	�4
Sy��hQ���3h�=�k4�n�:==�ٍ�wQJ5�v����w���h��[x��v�;��T��76�H�"��Q�+KD���w��꫼[
������k�������t��m��O��*@h�<O)œ��l,I�nw���E�/�����q���rp�
+���C�K�-��}�Z1´x��w�z�"Y�"
���<d�e�h��-� I���م)[��")��Q����kȠ��v�p��c��#�$
2��DZ*�|�}�)3?�$��^c9��ʒȔ& %�I�B�[q7�X!7�(Ie���ߟ"��V�R�����k"�On��z�V,Y��`�&�od"$6hM+|�4
+#.ȩ�/;g�^��L�E�8N�PFX���R�(�;���%	zH���z�-ε����{���~��!?V����,!�>���Tn�
+�)����aa������q�k%i:��]F�����v�q�шJ��p����n�G����V��
+J�I�0�)0�㱨�/�H�0�'�|��{�w���}����nW)e��Y�=z�%r���%��H6�����X��?H��� )Օ%�U�@JD%)Z�(��Ǘ�EL�0bL_�\�����z�I�cFE.��FW+���%�y7 yb_��3:;�'O����h���W��ڹ�-OĪV�K����j��)�y$�t�Z�^���z�V�Ň�H��%����y �Z�!�V���d�Ek+=λ�h�jc��e�_&I�0��n�9�b�wE#}aI�re6�$� G\pHb��#�<�d3���G�k��ȱ}xl���~���D���á�j���V�,Ϟ=�z�j�<���b�Cx��k`m��IJe�c%��&2��
+��q�/^�0A��Y����ZU�L���>�	�Z�x�Z�:$�F#&I�=Z���2��oܸq��5Z�G����V��
+JRY�l�;$��-��hq/�x�d2��/~�����XM+��̄�%��k#&~�"�����,[1�$�٦0��b
+�/գ��-�������d;!;��e@���LTt��C�̿)��<d_�}5	�����]X�.�
+mU�j��7�;�S*{m�
CZ�fP8JueId|��4IJO�
+�]
���V�$DH�#Ћ�S���Kk
+DH7ry�!I|�
p�7�̻��IDAT�ݱ,�h�O�h42Y�c;pAS~��z�W�����p8�裏�0{��7@�XJR�P/gz\Z��5���F�8p6��C�YaDS�+$��T���FbR��,�,�V��Vq���d��_n�T7b����^[c�@Q�?�R]Y)��$�
+��z��$�Z��2Y��w�01;� 7�X!7�(I.8$�ˆKJL-n�V��Ȋˆ��WH4u��U��܋D�	��&�Y�-,&uɍ76�r ��F��ލ�-z�X�+K"�P��� IK�fŖ��a�IR�Po�Z5�uBx1:�11��W��"nt5�BnX!P�\�C�|Wl,��0"�T��m�:��Rq�n	q��0oݺ�]|�v�]�V����۷���0a�
��u��s
ș�����˵ɲV�d21����^�Ѧf��V���&� 2��$_\껸e�Z՜�y)���&.�>�@�5o4��j�Oե��h}��g7o���X7*��S*{m�
CU	4���h�A��R]Y)-��\klDj��Z�<Պ�h�V/F4�Ds
�˅���K�1^nt5�BnX!P��ek3��C\�`q�X����L ����0L'��R$)��<d�e+Ya��ڄo2 �Fva
I��4Z���=�C+lLR�!Ya"h s\pHlR��$��ٴ��1q7�;�S*{��V��R��
+��q�Ftf�����
+9�a�@I*˔-�\�J!��V�ƴ��+]Np#��)[APH="|�
p�7���:�S���E,�;d4q�����U�^��:٢��=����X�DT|�/K^]JueI�pH	ˠ�
+�(��x�eڴ�0Iƍ�V��
+J�I�I�xb�<�}��*���[ou�]S������~���F6����n�RV�+R9��a#Je���fTէ1Ϳ�E��JueId�w�+$ɒ�#��m�ǍF#�M��d��j`�ܰB�$����0cƳ��NHtPy���.�?����*��{����w�]��9U��o�Z�n���!�VE*�����:�rY0�	Ѻ�1�Y�}�K�0b�׋
+͕+WxcT� L�q�!���9����}""�� �C�N��l6�Ǐ9$�N�{|~��F��y0�Z�*���pV��d2��W�!�`��-@t#VhO��4�I�^QSg�֤p���KteId|�DT�brÒU��b���(\�%i8�4m�E�$�FW+���%Ʌˆ1�+Mr��x�e<���xv)�h�l�u�Z���gϮ^�}��db^�q�Ƶk�h~�<ϥ�T %�"�*� ���*�5JdH�0bL�=z�8�ȓia999�t:������t:�~��������z~~~�K>|�������Ǽ��C���y��� �螾�G�*�v��`��ލ��t�OʝC���t]������������˝���V����Yz����$�����
+9�a�@I*d�d8N&z�Zd.Njyu�)^4�OyD��=�[|����Huvv�Q��N����X�f��"夤���$�6HV%V
IJ6��Za��b����$7�X!7�(I�YC�Y>�iv9HMD���a�E��Dfٮ�������T�nd����|�������R���(b)wy��z2��HR�d L�q���rp�
+��T�	'%�<���:�؀Ϳ��r9*�x��y�MQ�{!�#*fq5�K��ɉI�U�?��?}�7��G��t�g���}/����	���yJ�ث/^�x���*��ӧO_���/_����ϟ?7�Q�i"3;3}�[�2��>}j��ms���4�,�#�^ܵg�x:U�o��K�4^�|�&o�o����+W��x�R��L�
E�H-S�/^��?�3���r�J�Rɽo�b�˗/�\����x<޽O���x����گ��_|i#u��ō�Z�͋��3�ٳg�JE�$�!�����˗���������$	6�0kH(��0�P%H�Q�p�ټ[
A� 	^�я~�w6�K5E�������udm��Y�'�ɟ����j����Q3Kre{���z4�2����$�l�z��_eǴ��"�:��w�3�F�nW�}�g�$899ɻ	Y3�$V�Z���s獍�鼱����X
PW1���▙�_eǴ��"�:��w�3��U��ʻ!(����F�v���λ!�3�$VO&v��nH�D�,ɕ%"��J�ԉ��幸e��W�1�)��8�E�����=ϻ}���j�y{D� ��K����[���L�M���F�l�-��*;�-��8��n��E�/�o�n�KD���Ę�����fI��6��i�1���q�P��p876�li�nےS����]D����O�D��j��7�w@�=��v��e�ZJI����,�ծ5�$&�\�2P���ָ�����E���C((������C���y�V���)�F��O~����L&�NG�@�1��yKo�FP%�$�ϲ����}ӿ���d����N����y7@�0�d$i2��F#�p8$P�V�}�6?f����q^?i���Q��$T	���NNN&�	;5�M�/��t���
��`U��ό$T	�h8����h��N���j�j���0�t�ƍ�$T	8
+�l
@Dd� w�J�T�!
��l
r	 7��r	 7��r	 7��r	 7��r	 7��r	 7��r	 7��r	 7��r	 7��r	 7��r	 7��r	 7��r	 7��r	 7��r	 7��r	 7��r	 7��r	 7��r	 7��r	 7��r	 7��r	 7��r	 7��r	 7^�я~�w�kL&��O�^�v-�������h4��yD4��Al�;0�-�F��d�I��d2�����Z�F�K^���Z_�v�7�7�����Th����p��^��nW*�J�r�֭�v�F��w��v��=,3�Ln߾����~����;��έ[��}�]��p8|��7��n��o��o���[�z�^�&�	�zY�MkM��ժ�g
�X,���ܾ}�ltO�;4�Mv�H�)頔z����}�/۳�l��V+���Ç��y�wzz�~zz��@����Ǟ�)�bF�L��0;�w��2����j�!�զ
p֋��$�u~~��"�	H����Z���;k4gh6�K�P�V�ӌ������_֓�޹��,�vzz�h4l�Z����j����0@y`�"���cod�!��l���<�V�u��ջ)�����Ec�L��UJ-�|m�ۓɤ�l�Ѧ(�Z�2M&"�ZGwh4����������Pܐ��dr�֭�drrrby���J�׻}�v�	�D�h4���b�ۇ;��~\km���;򁗝��l��PS�׋����,��z�ɤ��޺u�����
��nA�~���n���I���C�g2����<������wߍ��܁..���]�֚Gw�^�g��QL�b��Z��*��
�v�֭[�mu��Z-�V�U�V�3�� �6F��0�p8.
�; y�ky����%�����pH��ܾ}�V��<T"RJM&���/�[;�I)e~뛍Zkm�0=�e�!���~��7��ط́�Z����t:�?>99�<o8"N%����:��R
*��l��j��ݳ��mH	8$`KF�Q��t:����?aj����
+e��C_���󼓓���S^�W��$�f�yzzJ�t
8	{1=��=(����h4��1�T�ٌ�N�
�%+�[�l6=ϛL&�A_6��"a덖�7����x�v���
+B
@Hc�R�$��Y[ m���-I�9�z�"���/
^S�w�i@l�N�ÙC.�
l	
+�@IH)��@�[*m�C�	����X�8�L,��Z-��F���۷c�p�&��4��˘��;v��@e`�"兖�Z��MZ|)��d�	��N$��-��Cˎ�t����"���~�Y����K���Z�ҽ�m!70�tmVb]�Rfi;M(@z�!
[R�V[�Qj���~��nw���DX�BL&�h���.O���;�V�q��۷o�V�M&�v�m$�Z�A��25�˺��ۍF#6�l��z��mT�@A�V�������,�~��k��Z�8nM#ɒ�"�@2�]*�h'�l6��ϣ�rnĥ�����t�?���f�<>991�Ml��t���c~��F����h�8`�l6[�w���|��q��aI�#f�Ǐ�vv���?6����<:��j��'~�Ӊ���7�N>|X�V�R\���������t:���
�2�L��!�=����ov:��g7E�F��0�x���A/m��[x���5����-]+���p8d�z �����v���S�8$�]��
+��]3��
�#�����F�C�@��8$����-@n�!
���*HL߲�+�IEND�B`�
\ No newline at end of file
diff -Naur ns-3.17/src/lte/doc/source/figures/MCS_1_4.pdf ns-3.18/src/lte/doc/source/figures/MCS_1_4.pdf
--- ns-3.17/src/lte/doc/source/figures/MCS_1_4.pdf	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/lte/doc/source/figures/MCS_1_4.pdf	2013-10-26 07:07:30.139364395 -0700
@@ -3,277 +3,267 @@
 5 0 obj
 <</Length 6 0 R/Filter /FlateDecode>>
 stream
-x��Ɏl9r ��_KI@�grы.@Ц!@���zѨ��
*	x��hm8�u��7o�[]�������f������?���~��߶�?�Ǘ�r���mԷRC�����o%���o����~	o��F
��KK�(��q�e���[no��pK}6��ǿ��n1�#����������VbI�����s+�Ȟ�-���Cm�r3����)}��C���~����?���y[d�r�����9����x�i{|�0�eL��ӘB��vK���Ĥ4=����]��i���dhz|�[��&
=�IizS��֓�i���dhzS:F����$&��YL%�[ώ�z���ILc�	q4-Г�M�aʹ̋xX��$&��YL�H7g
-�IL���0�T�m��$�'1)M�b:�e_�x[�M�az��=xr_��&���%��!���G�iG�?YD�I�˘p?�^�樔����e���4��+~���9hP9⸥���Q��(��ʿ	(��~���7?N)���[�����/ǭ�Z�vo��B��b��+���~���_��o_���/���{3���v3}b��(���g9E�����gߜ�G<����햎v���Y~$���C)��Y�|+��Y�����d�9Ϗ$�W�c��v:���,?�U�f�����,k��P�,����H�ٜ�G�ϫ�L����i��g��D�9ˏ$��g	�?�I�������7�����9��v~P6f��ط9ˏľWg���?��e�����{��P�|y��
-��k��Y~�o��#���Y��r�z~�i�k>bkK�+�?C�h�A�X/��xδ>M[����Y��=��,���إ��h�a��v
-�ʷ[n��X��-���h�=���J���!�K#xh{9$/�.E~�i"���Y%�
-�]=�R&�x���PџG|��ǘ����L��ڥM0�":4�/��?��<��1�/b�݇߉ڥM0�":4�/��?��<��1=��}ܪ_C�lS�x�
-$����i���|�g�z��Wq�Ǡ]���C��*������"�0����A��	&^D���ET���'�1�'��[�;�A۴-Lk-�OXDA�yBc�^D1G��j��tH^^�_�����-����cq��y^ڨ-�&۶-n��!���ō����W�]��;ˡy}k)�������*��J�."�viL���단��#>O�cL��Xs��]D��&�x��QџG|��ǘ�q���w"�viL���단��#>O�cL����q��Nd�.m��ѡy}�y��	}��ESx���i[��"Z4�����<��>ƴ��c��I��K�`�Eth^_DE�yBc�^�v�n�fh�
ka�E�h^^D��<��>���".�3���z��"Z4�������+���OXD�DN��E���"Ŏ(�F�G'Q$�"-����]��[̡y}�)�������Un�K�`�Eth^_DE�yBc�_��ۭ�gw�viL���단��#>O�cL���z?1��K�`�Eth^_DE�yBc�_���m��ڥM0�":4�/��?��<��1�/��S��ǙA��	&^D���ET���'�1��E��n��h��G0�"z4//�A�yBczb���_C�lS�x�
-$����i���|�g�4@V�堕v	�����5�,�A>aY9az^s����2��{����}	�x�|��?B�������-$�����/�e@����̣�a�ަCo5J ���&��8�<�v
-�����yLr�Ry������F���bj�f�6�Eb��v8+V,%�B�	5ڇ��%�y��~.:=�w7����b�g�Lo2����+������
��=l�������m��X*l�ol���~�'V�g����
*���8y.Jw�sG �ʱq��G�#��n��#�=�G����WG���7�p�|���O�F��xyD��rSa�W{�Ϝ���]nثv�8���=�Zq;ZЩ��5NNFLs���a,�V<����U8{v���~�i�#������\�G��V���n~Ӝ�]���\�1��m�)�;^��~ōX����$u��f:u�<��ʈm���9�������{����#���ϱ
t���s��#ʫ�#N��V�{�����т�(8�c�/q��Ȉ��������G�7q�Na�vB�Omr���|	)������mc.�]�'Ӄ��#���� :u�<"����	��1���njbk��ݢ�:^Q�y{w�g�Ll��{�������]O��I{�8!4�O%�,E`U��q���r��s���K�o�>YP��Ƽ�Ӊ��g?H�Ô�Vl�)NY����������z:�s#�t��vzㆌ���q��m��;���m����ki-����I�Sq4�H���emom.F������ѽH����ɀ�-�ܒ=�I#@�4��"�
N�A�g!b��	�i����/=LNit33� a}J�����;�O\�̀I���$��ȯ5��(�MD+�5-��[(Ʉ�4���/G�L!D���0Ӛ�S����wh3-pϭ��LKD��f��LK(�J2a8M
�5ڔN��Z
-A��<!Y?ŨpYD3�1���u�cJ�=J��k
��I{͊�J�J0!8M&PI̤�T͟���<�(|tV����	]��kTA�
ѭC��)��P��,pf!%���B�
�Ғ�=%����`�l[���)3S�%�nBf&D�B5c���EHY��B�E8�����|3�m;��uf��Ig�~��Bt	�[���	��P��,hf�I��lAxf��F73�	�;�6@��
�7A�~���t-��5��l�ZՌ��g���f'�DV��l�P���NY���a[���$��K!D� `�e���Z,����*d�ʹBd�\oz�ϟ�a��'�gf�S�YR��Sf�"j�g�e�Ԣ`5����
Ϊ�hf%"��16���1w����m1�ѡ�P~ʼBt	�[���	�bQ��,pfu�����!�*c�@
sw%�wM�2�W2��S'&&k!`��2/!A,�	�i4�y"��xV����0h+�
�-�NI��2-�0U����"���#J3#pS�Y�Z���ϵ�Dx��o:��@�Lh|������Z��+��c`���`Bs�1�7�X7�j��\�<pn=��A&�
4�p�����;�M ��A�ǿ�}���i��V�7��=d��E1�M:q��z,*V��1�y��@i=y�1P*�j
�Οx����<L�����w ���i�,��C@��c~�����»��X���(��Tn0���g�z�{?�Y�
�O~{����:H�a�Q_�aL�M���0Mqh/���?�S��2������b��
Mj�c�H�aac�@���<?Ou��x��o�a�mQ;b� �q� y���M1d4>���`*V�E����s���F����TH����oX��s޽��4�ױ�?gt����7�A��"H
��@?q&`5���N+�Xo��g%�����{~���)_�J�
P[L������!�C�	�M1�u@Ǡ��cQ�Z0�����ѣ��\4MF�=�R+��2=0���Ӽ���tO}�@����M�SF��7�v�j-ץ��l{�K��n�xk�u����y2fۿubp���y�U�x�-]V��MA�fY�Ԋ���3���uTK���<��k]�@�
䘳>�@�uY�.Z����j�?r�/�0�"�i��M
-Ɯ]����j0)D��n@{�0z�����&�k��n(�7;۪����&�8Z��4���@ :�t{ڤ,)ѭA�lYJ���p��
h����[��[��p��
h��2�í
<�ݭ�@t8���I
0�Z
-���J�D��n@��Ɋ�%�>z]
��V�{�����V���
z3�@t4���K
�h������԰л
�4׉*�w�nW���%��=�C�9r)z7�c2�nj� �x՜>���Ak�
L���
MV������:]5����f@h:P�`��
-zWPsD$�!w|ҎW��5��ϙrL@�2M�j�Jz7 �GJ� �x�?���aR5÷�d�[Vл�O����:^��O�<nZ��ZE"rG�G@�4��8a�wY�.�P��0�LwD�<:z�����v|Z/
�^.��.O�Xk�]�Gƀ�`�����w��nD-�R)C��@�xsNK��^��P�(2�*�
-*�<p��\���u��T
b�s��I��D�.�$�-Q��z	Gl)B�3�4),��y�ꃴ]� ��ۜ.�Yc���x���]�.���G=�z�}���[:�o9����ѯ��Hɹڬ�A���o�U�~}k�
�K
-��5���Wx4����;Y1Tp幼�j(��X�Ƽ�B�.ܥ��B�qa�!	�
-�L
�iߎIP�f��89�����n���Nz�-gi%I���(B��Ȅ��U�hC�xJo�)���)���“��&u�ޢ	��NL@�;\}��&u�ޢ	��ïS��:���Ҥ�[4!��
-m��zvnҤ/�Ф>�[4!��:l'�֋���
�Ekr�Pt93�=#��>�e2��$/�g8j�Pԧ�e���/K��nz���;����=�qШ��4����q�S6M���t�\��_�F}:C��;�G�쾊���g��n�9^e��ҏd��5W��uI�&���B!�,mz��@��4ő��:��p�ʘ�8\����j[^����
�|�傢��C%s�(c�g�����|d��fA�����G�ĉ3EQ3fu����I�l��;`2�xe,�%�ҧr�[��Sx?8�BA������Jr:��(J7�
�~
�p�#��UP�x}M��!�
J��b�k�D̘ۡ�D����Ԏ��"��t��S���%��I{�,�r����-MK:� ԇ����1��5�L=i@9�h���#��祐0�s�G����q;IЁuzFE��K{�V�F�=J���z���B�2��z9Iu��"t�;�:�<��x	����.7
s�H����@������ل��F�|�jC�`�6�sqx������~�zJ�r�\��]$�ٺ�O1��x�X��M�cu>�cA��Jޟ>��Bs�cA2 ���p^ݷj��|̧����K>��;��f���U��@���+*��^2A�^�$�I+0�zC@3�?m5T:�KA�
-�K[	�
-���������@td�8�ߖ9��q��b&hJw���l�nqF�j��V2!ť�{U�ҥ��z�V��{��x�� ݎ�g�~�Tw:!A��[���y�"{�����(.�S9	Y�B��wě�
��p�"!�a�f>Q�툳n
- s�rԹ4�]�!�����Hg#���R��*,�
hD0͗8�o�?#��K&́���IC���twxB�;��=!���i��\fi�pB�i�h7 �h�nz^#�p�.r�
sV�
8>�c����٣I�L���ŀ��J�i��6���/�yv�,�u��,ir8�����4H~����Q�~�H+���2�;=��e-�
h��q����Mf&LV&C��W��J����ɓ���La�Ti��\t�U�L�E�
t|w#����S�
xO�@qp��8��nq�`JϧV�^Ƀ(>d�]i%fP�e@��͒]��2��4ס��N��J�,D���I5VZ�H��V�[�R)l��V`)T�g�2���蕲�*.R�p"ݎ�eZ-�
h���舧9n8L�U�|P��y���-л�%GB��ڮ�f���b���M�BTQ�ja�J-��?ߍv�߆+W]�Xf�>������r�C߰��5�V�p��,��Z�@ie|�.�,*�~3Q��"݀�2��Ý&��b��)�����`5�M��Ib.��[�ܺ4?� ��eaӪ����R��+��KZ)��q��k��7���rJ?����q�;�]ZʘPo,�H�.E��i�e�ǥ 5%��t�V�z����kĻ9nx�s�`�G���E$�Ui�~�݃��&?R֏H��D�9��d�u�(m%�+�7�i���;�������D�Ƽ�0�A��'%R�D'C�ja���)�Hd�6*"n���XL$I~hsޕ(ۊ)� �n�����/�$�K5����"bQ�Sy��H�t@;]�t$n��&��kʤ&6��@�pq��L��VB���*��<O�Se���*��%�+�j��Q����r ��LNc��*[j.Z�Fp7#�M!K[	�
-�p��G<Mq���`��@��
-Z�dU��䯑A]f���
�A��՛j#�B���^�Vpգ�� m%d�@��w�܆����]HZ����u��!N�0��
-��Q�@*�
��cm4�%��b2�5ޔ��W��VB�

�Ѱ#��mx���.����s�*�/�Eu
�gk��-��o�6�>�Fy^�d]Y�,d��+KLJ�i�趠������������v#�֐9q��5 MY���6�z��Vp�U�_��Ō �"��L�-�C���u�eZ-�
,��
x��奁4Od�(�S�
s
)șE������h�7����<(UL�i�)�*q�v�KA2"�1���� ��W���)^_���3����xkHF�@�>�VC����ٶJ��@�Z��a�4J2bP)H�
(dI+%^;��u�
�3��4b���hB��w�*��+!�r�"fp �t��m�J��ˀֈ��#vM�VJ�
A^�jG�����I�	h
�B=4jH
-�&���qgB ���]#�Ã��QȘW�I�z����+��x�y�i���r����<��.TB�6��{�x&��^U��4^���+ݕ�W|�5�s
)�Z��F2?Q?җϥ5��%��!��5h�g�"D�h�<�#~���c�/������!X&4��Չ���^�z{u���ɁOl�� ��k��ǦP���@j��'-����ZC �sJ=
����<���|(R�_��O������m����V�����jeR��*��_�V�t�mU�i[E�4�j~pu[���
̶
-�趚{ᨧmEQ�fWM��B�U��
�m�B�o����m5�?<^f[�C�i̶ײ�x/�M��
-�NȞ*�HE��%cH��Q2�]��
-!0Q2;1�`�8#��%�h2Q2;4����Yɯ�$Q2� A2[q
�����mz'�Abd�Ѱ12����d���Q8�U�#ï�����l7F&�0�X�
݊��W����;�#s��{Щ�n���&]$��f�̼���
��Ud
�!���,6b3Hf�O0��j�$C����l]c�[׉rDyPH�N��L6Tf1Q��2�J�@�0w9@Ce�es�2�������Ce�f�N��bM��r���2�%*3P��*�,���.v+X��‚
-$h�L��ױ,�<�
�6z/X��9P�a7,�L�
�>~/XfL��`���^�
��2,5�`$��ez͔3Հ�&��uZ�2,��Xd�Be�\bh~�ˬ���,�Ʉʨ$�*�ꠢ�2i��Ñ2Kj3�2*�mE��	E����ˈ�[T�t�Tu��״�"N��J�yk^~�"�Y`���
-�CԍYI��R���IV�R�s'	t�h�e�y���A����0��i 	ӛ��t��%�
-�ݖ�>A�{hXQ���
��l�5SʢK�b!��RL�"�V�p
�� &��˭8{W߹�^��������k�D�ѧ���q�\M:e�n+kN�7(٫hR���K� ��̝&H�����
�,gU�_ƴ4@�8c��Q
-A���:(��u�
H�9y�F�x�|�j/E$�w�q��f�H�8�
D�K	�-DP\�:D�H�v��R��"x�A ����Gz��1�=<��J����k"
-�U&��b䛘�e�!��I739ƽ�
-V�*5��L�<|���5D��A�po!B'�S����Sh����k�f01�=D���V�E'�ۤx;iNV7�i!��T!9?�I�|-���]ô�L�&p�(��!�
-ys���bI�L��9��ՎY�
�ɍ�����`Z��0��H�»
��}��ѻ�Ǒn�I��a����sl�fyU��M���d��a�+��&v���'%J��8�n�I��aj+����S�v&��k��&������mp2L��nW����f11�ML�P��F$�!�T;P�2(��b�n�I�oa�P��S�����i�˕�C���'������a��+�<l+�s4�M1
-���B�)&A����B���
N[S�EO[���~A{)"������C�");[5P44t=(�&馘�&�f;ȷ7!�s��ha�K]�$�� ��4(��ai�N
-�@��|��|��&���N�+-R}�yD�4 �i��_�n�A��	|lQH͘��騆i���k7Ŵpo"��Q����B��<8?�>���I���b䛘
-�J��*�P������x]]���½�(���0����tL�Z��4X��`Z��0�#�A��pCDT��+Dx^����B���D<?�6�k7A o���e\1M7�$�-�����8ӈ��_rQ�he�Rж�㊈4>j\��c��h���Z��?]&�s�X㢶�t�E
"�|\x*U��%�:GJ�AF�Vj��4�A\�������t�+�j������n�����t�-�F�'��� ӎ�C�
�,�l��>yd��<�#����4_�w+�jN=t��jJ��n�1�wtB��<1�~��-��V�k��rmGu-ZN���#�xZ�lcfW���6N�Sl��]��]<��W��i�A�;��S�Ɂw�Q?o�t�i���`�q��fSԕ�Ñ)�=<��τ5�M�navJ�[x����x�D��8��bv�JK��b��w���a�ѱYw1X���.Np$�&�%Fa@6qi����N�`3�y	svA�����:F�~��`�ۂ�gءc��J��pxk�u��Z�������m�#�;ndl��2EYЗr�KB���ޙs��<H��̱�����g����p)X�$ӽ�]�s�"G�q~��ռ�(����F��zg�er8�}��SZ��is񁻜g���A=|P`�����K��w��d&�D�q�̩��Faވ�+���z�tpv�����ڧEZ�c��}��	Q&7M)#H!
-�g�^.i�Ƃ�����i���0@�:��;���|�9}й��$��^���|��wme��&�̳�^����-5(iX܃nZ��w�g���F��Ȋ0b�_�V�\��q��S��v��J���Cb-;���!��Q�)���g�WJ��%���VV<7Z7�8e���T�ÜD�L�V&�ƹ�F &��<��մT{��#�)�\bȨQ(�O8Ai2rg���k#��P|n�_�N(<�g4�$���?�a��?������Ȣ
-+�0�ip �,]I�<�V�������߰��J��;n� �.��à�9&\����s���ކ���7(��L��w��U�qǍX�Fa�yr���ex	BZ��I��:^ҷ�7ŠH�0H�P
EZ�#p���#�Ma'��>�c�|�򏶪��s��#&��X�:�b�╴>���s��#����va�i�\�@��қ���1�y�xy���v�
-
5�����
-�ڪ2�z���~U��«
�(���=�U%gԻ~�l�#B
h$�D�&N��i
-�XL�w�<$I
F�v�~k�Ȭ��Ow��8�aDz|ȵ%�kÊ�ڤ/����?)��qVoE�~Um�b��j%��'s�z��5H]�p=���.#��j�sɺ�xN�l���![�]t��3�tV��Z:+��rp�����s��F����y�gP
�e�Xj+1D�ڪ�A�Tm%��EmՎ��1,�U�KF�DmAlի��E�+m)_sXؗڪ��
�Zj�6ן��Km5/&l"J+`�H+�W`.��A�`_y�!����#�=I��Z�ہ~!���E��Y�˺����
-P��oN�2 ���܀=���B��qXf=�t��q���c5.��Z5n'K�U���x�Y�'bIR���8h��Q�i�)>
8�GW�M�t$fsR�둘V��m��Os$�Gf�	�`.CːF/�#
ٙ�4G"0��G�Q����?��0�Xܡ(��&顀�x��2p���hl꿔V��<t�:PF�z4 _ʡR�O,c\}+���H���Hѕ� .�z�^X�v�V1�����L�UV��o�(=%W�
�F�
��y����@�����`� X0<��'&s�V�-쪞}+�b}t�����I<g�]n�P�|����Ӛk`�;��"�emI�����klup��mkn�u%��!��6:2g]������9������=�^
.&!�Fq�,�
-��
-[�e�}�ayx@�%c_*di���9�3����
-ST
-�va&�3�G�_3ikiV�H��(+~|=� 1���YHM���V���3�F���N���W�&�l �uxXYˍRXyʥ�(��,�.�[�%���l����;%u�VP�/8\'�7�&+U�A��̓�\)b`����9�eढ�	ӓ�)c4��Jk$�L�K�o*T5p3��F�l���PD�D�����I,{F�BEph�!yOS>�w�+��ʍax?Ip��rM�V�aS��:Q�Q� ތ3��\G�K�
-(�B��8JD[u�[�A�S+;.�����k�[.	e
-E�[}�
�b�D�F́�>>{_)��|�&Ę�
-m�Z2��k���PМ
�e��5q�Q����z� ��*�Ž���ҭ�-[�W��O��e4	7j�k�� N&]�$��RÕB+�� �٩֚\��ɤ��b�7]Q9�7Jd��@�"��+�h��&��z~�c�ŷ��a��� ?J� ~�A݀��÷��z\'�7������$�j1\��$Yz��p���k#�H�[U��EɨZ��1Ez�'NJh�V����ӽ��_UU
-�?�
-Y'����&���$Ι#�0�ZŚHD���4N}��K#�:@��0l��<h�����H�_�Bm\�f�����T`_��Z
_v$:�$�M��>�n��~���:�����9�VpO��L�F���g�G��#U�띜��
L�*�����~Y�yPQd}�(�?��N�6�:Tg�72�W��eh.�d��	�40�>��F���J`�n��`�7N�_���V<rM�9�C�4j�SD'�7R�/�/r"tHQO�@��_�\��n[�[$���A�\J
-�'��i�e�S8�ye�
�Y=*O�u�|�E�UJ&��� ��&�'���pd�����A�uBk8}V5�l�9�I5�>��rB!mU��׉���H��1�?$�oQAF?��}yGH�+� �,*�������
���j�nJdd6��mՉ�����=����fk�ӀB3u�N�VSB ��d���1"Z���A�?��-ݦU�*6׉��>
G�K�i�| iSR����7oKl�5��J ����^PG��G^$F>{k�(��4^�yT'��zׇV�J1`
�a.��c��XtJ�2g�2����Bo��rdFW�a�9�;HǔC�`��i5�QT�+�3�ם;�S%ה��M�ߖ������iN"�m�V,E*��v��)�"O�X�"��䭘=ʴ�����dB
F`i7�5�^���
�L2�F2��Fq��H�D��'!O�C���aL��T��{��"�1[\g�7<\�JG�������D��������<4�CTͿ��<*)��X��8{@�&�F��V��L���
g�!��6��sW��&u.�8�d�j2��w�����H���)���ʊ/�s!E���Jb�V�\���
?N�Wz�x1��A΀A�`V�tLc�U"ױ:���.�=tf��ݮ�=��_%H��	�L���\���F��-�ܛʸ��	�x�-��{$�.m���AP�m����ț"�q�.k���!?o�U�\׉�
'�����$�MA��gqD`1ѣi5E �KAP������0���@���M��;R#ۡ�2`QD'�7����#<R���l��f��*�����m��s� �޴�MBƔ
-���ɸ�S'��5��#:~��+0�v�9�*U���ZCN5��D�b�?�e$������S8�'7�����j�����dF1���u"�����oPA�����f9��ih`g��U���4�C~��r����y��:v�>vǁ��+I�����剿>iҦ���^��l�9���I{���o�9��
E�S�g�X�m�+M+��@ճ
uD	J��i2Y��3��=�@��-sSֺ9�B�F`b�I�z�:7�(�@e����HϽ⎑�����h+�G����:�~yΐ�%�wf"Kl���
-�y�@
?@�!�ሶU>@ʩ��(���
-�Ҁ#N�#��S&kB2��XȴꝜS��W���b�xt�Y6��89��V��c���wT�`J�]Rӎ#�_g��K��7�8�V����L��i�¹<��Cϴ1*�,��j\�1�أkr#�;��
�!��Ț�J���A���*CN�T}+b�����
�]�,��7y�@��y:�A��	������XPǔM�"x�oZq�#�c�CA�鱭�#{T'�;'_�.^�&\��v���ì*=Ⱥ�|���rrP[��RkԲ�[cˀ�Z�nF�/ U�/��Q/7���b�d
-h)▫��P���;�_M�/���d̈�ꐼ��e���c��"VI�,:85�e��X]څ���Y:x�)�^�Q+	3Р��.$H"�o=%
-Fdw�7x.Ѣ"WP�������q��������بr-su�cɑ!Ur
�� tD��gx�1d-�@n�51q�7@u�o�K��BOp7�I鹂�E��z��M���dو�� �����Y�&�DkW@��z�
�g�����K�\�F*^s�e�Ld��q�E/�U0ƺ�w>����$-�ٻ1+=��UŖ���;�;��;�s�-N�'ً���ű=�ű����y�ű��ű�}��H'��(8m��;�9���\UE�mٻ#.
��;�WX8���(a*�ձT9ru2����s�^`q.ҭOJ��B1b��#��7�Po�ឱ7G#���
���:���w�y���j��n�zw$v/7wG�J��������+~K��:]�zuD�i�]��\�^ʒ0�r$���)Zn�5�s�{
 RG�ͱa�0�Z�<#����k\��ث^�}����J�#_M�7�A�C�ã���{�J�P�z��+[h��n�������\���A����"n�j��q��!xU{�J�n]���GI�kH�6}���w��A�U��A�݌��ܷ�N�z��^yvl}��V�뺛�<��R��̶�bu�]�plI��VRc�Ӫ<�5�^ϖb[��)��R֘nw��uGR-�v�w_|�V��~�k���c���)�������~��#�m���V�Jx��Pk���N{�W�J]-%�Cʲ�7�����®-1SOM�Ǫ��d�yZJ!��V�[���I	���N�[�k������]WC�P���J�TZa�I���V�뺏����ՖFnXZAn2EKI��F"�^u��
-fR1n�B3췴��K\E��W��Nl��8�*~f~i>��bXU��b\ם�D�H�a�T;3"������~�I{Ԋq]w�	&E�"$�͌P#�D/$u��b\�]�Df"9�43b��Zw�B{�j�LW]�DJ�j����ܴ���V����V�«:"λ�rڬ�eFT�V+NPʝ=lE���ˈ$J�(S�L�S�j9�K�����f��r�
I�p�ɬ8,�l�U��A���:�Z��g*�	|�һPJ�=h�p]wmY~%J�p���ݚE�W5@Z�^Wղ���&�R(�m�ژ�2�V#F	�e��Z��;~���7S^L��
u �W%�o�x��`���,��r�3Zm�3'QXE��"\׽"������bFo��((A �=���� ���
Tq�p��H�G�� ���٣V��	]Q�`}� �i$���V�6�d�Z1��6mQ}Q�rf/Nцi+�$���
-�1���y)�8��R&
-��\�M��G�$/�U"D���&��KE-U�m0�"B ���6�f�U��(��3�RE�/j�ƒw���Vǖ�mԗ�S���*TC4�ҪM����D+�u�+
-S�@D�J���C�V+Ax�9�}��L��hK"�;CD�8'��VM@�v�J����b\���p�
-Fd����Uu\1O9�p���L���#�
���1���V�

 ���[�U�]*�����nu᫑xf��!�t߈1]�@�������1:@u搜����K���L���i�gg��'WA����JT�����Q�ryl5#���dx�s��i����Ra���Q����]%b.�S�����b��F``%�"��F��*j(
<r�<�ɧMl'L�G���a+�u�1ʹ�
-�	���5j�
�8�2r2[1��4�-h2�X��@&
-��yH�͑�"���أV��2j}��hw�f�Q���
’أ6����b�J+U
�Q$��~�A<{	n��q+�u�5��H��K����ۤxʓᬬ�Z1��4�5�	��[����ޗ���#���<�X!�+���&kK4�ŚH-X*�F|܈1-������ӗ����o��������AT��~����C6�N��"z�7x��������~��/�������
;�
1�M�������DǓ����T��7���~�:�䨐3"��

��A'�h���0��x���������?~	s�P��p�
-�:�M=���������o��M1&p�:YWW!Pn�i��1��b�;:�wf#��������]�b���hȻ
wi:����'R�`�ɩ}>E���ړWh��<ʐ�w�'n������qo��W������������(�~�C;x��x@�x	d͍C����ψL9��h��z�y�I�+]�.�X�����������?��g\ܿ����b����i�j2H�̤}
-h�R� �F����r	Tsh��^y�ڀZbl�h�BPc3��8�������b�@
�	�=����qW��L����� �q�����90^JW�A(�)A�:j1�/v��-���h�󟾀#B��4��@0�c1�7�^L����z����/���- d
-l�A���@*��S�e��?g{���.$r��$~���l��/��S����v��v#����> �n�[�_��N�#}u9��p�I�&G�!�p9S�����B07UEȃԈ
=�݂Ψm:>�����Uk>�����}��o�"�7=��۾�2����~Ch���ZMݟG���5���[=�
-�[z	�ij�p6+��.����2��(����
�~�[�b����h�}�#p4��'}ۅ�d	1��W~:�P`�5Y�zp:�Y����l�Q���G Ͽ����@|>K�@bP��917���p�2�����V}D�B,�,�G�e�F\tI+�ހ(Y�x7�o��Cq��,��]]�Q8���mE�|˅��|����~I���8e�=�$�9�cɥ�sMC�n�x�
7����z�
/����
/�\..!�ll2$H
-�"�eQ�]�_�h�D��!�V���eL�3	���Pr������#���~[@����zp[����)bnL��u!�癊�Y �@|�lWtHPb�X�kt ���j����	�/Q�@�<*�-��A����rQ�ya�GR7��3���;��5G�!z�
-�ӌ�=�<�T7*�U"�qd~��rא�g0���m�(ϰAZ��3��	�ۑ-����c/ĀW*XfZ��AsG�7>��M��pf�����+p�� ������iQ���h�g�t�dn֠� ����)}��@^�&��j�X]�5�FXyo����G1C��\i����	RT��?��
i�;��F��[��V��[�a0��r�
-1��{���	k���o�M�-����bP���-(C.'o+��¢�V��{\+��"��Ա*Tq>���Y�.�����iL!S)$C���Ĥ4=�)�N���&
=�IizSo�Nz���9L�PC���Ĥ4=�)G
-�54	�ILJӳ���xv$1�9<������;_�N[���'1=��\���n��8��`Z�M�^�$4M���}�ڤ�eLBS��խ�m��2�/�Ͼ�W*>e!~9*���2M���w��T�ɸ}7�0 ��A�=&7�rP��NF�y�?���&3\���&R�+L��T?b��T��&�i��7���_��G���D?��>a�����>����i~�L�>�Y����,��#uo�q��O4AF�p���i~���M�#����*D��Y���ӌ��,��~}��)/�p���)~ȽnM�#���i1��O3m|�G�'�Nwʏ��l�^��F�u0WgZ��
�ĵ�)눉��gXP����~�AF�p�x�y�ZP���a6�j&�'���8@*��e���
-m�I�����#�}�և���U�C�A��ڥM0�::L����4��>Ĵ��qt�
-�ud�.m�I��az}��A_��!��u.��$YG��&�t���ьp�Zb�_ǜ��.#Av)[xt-���P������'�o���pp"�M�&���'���p�Zb�_�YK�Fd�.m�I��az}��A_��!�'ֱs�^���+�nҶ0�u��>au�Ӡ/����:��^��ue�ZG���u�����G^�m�#'L/�#SԸ�7��<9(��[���I������2#�}�և���Հ2���#�viL�����hF8
��1m�c<���Y��5 
-&YG���u�#�}�և���1L6�k��R���"Z<�����#>O�#<��Y��cT�A��	&]B���54#�}�և��X�)[�YGmӶ0�u��>au�Ӡ/����:���ߏڥM0�::L����4��>���:Bu��ב@۴-Lf-�OXG�4��>Ĵ��➣�����ZG���u�園^Y�%��NےGN�^�G �p�����/��Z8���+���`�}�0�����A_��!��}�&���}d�viL�����hF8
��1��#�jN��c�.m�I��az}��A_��!��u>����&�t���ьp�Zb�^�t���:�캲.<����kh������'�o`I��ڦla2Kh1}���A_��!��u�+��ڥM0�::L����4��>���:~ZGmӶ0�u��>au�Ӡ/����:�k����N�k����Hxe�<�:mK9azA��ù�My$��#)O6�8�e�v�C0�r�^�Wf�Ӡ/�����*�},N�@��	&]G���u4#�}�և��ױ��9��&�t���ьp�Zb�_��-�2d���G��y}
��y:��_?(E��/h�2��K�0���f�Ӡ/����8���[GmӶ0�u��>au�Ӡ/����:�;{���6��u���8�l�@�CLO�c'{�mӶ0�u��>au�Ӡ/����:��ɵ�����x�}q�A0�3���i[��	��H��2c�_��G��Gd�GZ�rr������*�$�w�`�h�{�YvD�L��)�$S��&�v���n$�1�*+��Ճ	T(SZ�h��Q(�x<r�2�i@�QI�n�y���Y���)�~�H-��7P�����4�10��c�I��?��Z8M����ɕ@�g3�)a���b���:;(�Z��2�
ڔ�� {^�9C�cP3���݂�$@	H���z)D�O��_�4���A����w)��讣���ш#�wvD��R��G��It�xu�g�p#���T�
>x��S������
#����NGq�s��#&(O�LT��bO1�N���p�s@ƃ�\���r�<w�<"c3`m�#�;�����x뒘3�9�bz�w�#
*���A���G\wP�m�D��n8�ر�h���Aν�g�y�05mĪ�	I�T�)BN��=����z}�r���ԭ
j1���� �����f�sV��:B��u�T).���k)������!N����L��H��e+�2�]N_���e*�f�K&�>���$X�ՀNm���3x�D���Q)#�ٽ)�t쳞���P��@�g��+��T����Ǵ$��'�e��<;��og������Ѫ����w��8��p�z)�i�Eؑ��1S�0-�n�u���r��2Ӳ�Q��%��x��:�B�(<��E<��<��F̀�g1.�x�x�g!v��x3 s(f�S��<s#f�ų��4��x�xy�Ŏ��bF��.��]gZ��A�c��rWɼ�Z�|���8�bH&P�3-⤫�ġtw��:�"	��O�m!��'ۂ������aI���%�˞^��؟x����”L6jWZօA��O|�܌��ʺ0W�e��UօA���PȖ��6WYfJ�QQq`X��/PH1�w�K��>��yﹰ�9���q�fz���#�湟�������Q���$4�bW[��¥���/���
-�qZ�H�]�J^bv	(4+0_h�Ȳ�&���f`y�[����Rj8����p@����@��<W^�E��T�ʂ�
-zWP�z�
@��
H;^d�"`��������(�v�G�(CD�l�".
���
h��07tq4�
��	�a�̀���MA��'y������pu|�&"�#
%F�`	1�q�{���u��QT�#�2�aM,�
-(A��H ����2aÊ�c ���F#&� ���l��=i��\Y^���Y�1�i5�wM�{>1Z���UN-.�)��#NmrcÀ�
H����
H:^e�*B�l�/ļM��л
�R�az7���U~n�,
�/�.�^%��лA��K:>��WY�Ě�8ߛy�<?m1�w��#�@���t���5|�#��ƏQ��xW@�/=�����\�b'"Դ�"�lTр��<��Ư�@��;dCE�̰eK�&l�QN�c��{g��d�lY�t�		��x��
�_,_V&Zg���B[���R(�_+iny 	�P0D3��>�}U%�,�.沗~�����p1��sR��Ĭ�[��-�m>�����\�qZK(?��Z���Y�6es�t1�/l��0��1�0
b�RU�2�93°�7ԁ`�u�h{Ƣ]Ϛ�'���:��s	]�����rX�M��)f�!*���&w�q4v'�Ig�%�hI�T�ER�{�%�Jx�&=�B�S�hJq7s�Q/�H��c���JP�t���D�E�eE׺J���^���e��$�Q�Xd��|yj��Xvn�e�T6�C�c�E�`5��^�#)��&E�'�5��u��6R��4p@�s�C	�1�&G�(�-�n�2g,E��_	�Į.R<B��./	�䃕��qٴ�L~�
-�򴍡���!�>'e�=�r�)RH��M;ݎ�/)���\��g�n�ٌ����o�Iʓ=D
-?娠Mpu��c�N.�7(��m��)s�½��T��[���زb�<׃��2)�&����i�� �?��V����Ma+-
-�h�zpu�d��HM�!�Z��&eo���r�~�E�.�Ž8�����d�;��/a2��������+��HE���@ewd$���V	 R�F�؊
-_޶����F&-UVH�fh���n2{�哖�;�Z���-S����
-y.2YY�I�'���L4����57�	WZl�:�
!���|)�~�%��/Eb��RdZ�/H���a�_*����R����/���T�띚o������[6v跚�7j�̷�}v�X�6��4krx����Z����P��R1oAb�+݇����#Ϋ�Z�*Z��z�N����K��[�O�����N=.`��:�`lp	�^>4t�V�z
��}8q�n�׽S&wt�8�&���;Ir�
-�&�U���F��?��hZ�	\�T
]�J�P:����<�
Z���d�PX�g�9.l�m%7�Y'F�����@뮛��
�_	"Ri��@�ɶb�-h�]�_p��m���aĜ

-~�A�T��=���k0�a��杗���\���Z%ȻJ���eA*�/3�e-�m��X�Y�g�aKK�Vܖ(����H�<�T;����Ƀ����Y��߇�PY����� �2dI#&݂2�M݀�	n���ؐ�;��Y���<X����Z�y�ӣ�o�˻�{��bM��H�܌�gG$r-hn�#�
ݤ��䩄�|?9�hq�����!���%�F��<��;��Vxi�jqY��[j#��Pe1�4�W6�ˀ�nX@+8$�8���5+ ��Z��}�I
�,4?�[��Dz�*��dv�[T�VL���*�4�
�,�C~�8�0�#o�q�ֳwy	�x��Z[�;�e�ߺ;�ԴZAZ��T�D��B�4Q���n���6�őDu�~����
J �]�hn�ݷ�7,�d
-�ϖk+�R\
-�痎�B.ti+�^Ai=�:�i�.��HD����)]�e�cN>��D������vD��^>�V� �[\�V���eZ-�
���aG<Oqø�P{��
8�#�� N�*��+x��@[���5�ߺ'�i�����q)H�|��x
!K)�����_<�p��_n����j�r��v���Yŭ�\\#���Oݜ���&��~�JAk�����+Di#!]A�.wZ�4�
?�D�xxAI�\F �(A��]Ȧ�ED~U�뚻�B>*�k����Fq	H,�3�*U�HHWPg6@<Op�M"YN���Jd����(1�/"�[Өfbk
h~����(C5��P��{�i�Q��"݀��l�
O��2=b&h�PS�+?�r��"8X�
-�W�qMǁ�f��1�&�tT��ֈ���.�K[	�
-����9^^�1/�A�Ry��t��T�$�&x�+3��ƒ<hJp�����������5"D1!�i�Z��
-�w;�����D��w�Vx94e����!2�'�zm4��><h~��U{ڪrnVT
-�`�[��R���v�K�?�i����u�!=�&�+F`����2�u%xKr��y�у�Jmt�ҪLfm��ˀֈe>�4m�˴Z�P�Kَx������M���C#��F�*m�s@�[�g�X�j^��r��b��^�
-4���R���Qt4Di!]A�8
;�i�ߕ������{��˘!\[V$�!c���ih��i���.��.����Ѩ&��@���@��I.,B�daJ�$��ߵ�`��T[��wʦȍ��d�9K������!���Y�\;�ss�']��Z#�W�Q ]DŽdpw������S�(���M��s�&XA��-�M����K㡛 q#�	���#��)���&(K��M��u�ٰO:��7
_�vd�j�.(����v
���]��� G��.�K3� t�A�6�~@$d��`~cR�ߛ��"P��F����$�פf��4wF�_Ɲ1_/�h�a��Ț�]w�DQ�֝1]/b�P�8d�DQ#�w��9wF>r��\��hPKl�3�
w����3�[�ތ�_��1ތt�8o�u��y3&48�'���f��z3�;oӛ1���y3.��;�b�;�޺{�1�*�F>�k���H7��g\���?#YƜC㼌�e�~����9����m:4N����Mhi'_�=�F~c�C���{��T�
j4����h�n֣q�p:9e j�\6C=��0��vly4�*�B ����&.���X�F�z�\���K���h�p.�$.��dY�FỶ\��ݺ4�����K���K��}[.���֣1��_���h\<��hT�sˣ1��֢þa`K�>9�Q�br
4�D]���0-v�C-(C����$E*�%\�WP���㻯!Z�:�(�~~��$A�T�2��el����D�x�p((��9a��f1@l����%��MH��0e\�P$���{�9 �$dߍ�s	�
-Ly�P�M����	$	��Y�x[���%��7�w��9��.H-����rܤ�[��5L"0B\#
eH�uun��2TМ p�e�ظ��"���
�2l�D�W�(]!d��K!�B�~H7�$��0�6��8�7
+yt������`b�{��
1���(�N�� w���V�n�B��)�����H���7����b"ܛ�Rj�#����&�̑d�v]��^c�Ó[W4)ø-w��w�6B��������@&�
�'�zYD�{Q+a�^e�	
�9Pld����zY<�zQ���ʇ��&�BQXc}9T�tL�|S<be��t��䱴��xq
�tSL�|S�٩�A���.�G�t�$@�&����a��	�.�����e	�f0-�{��|�с��J��������Yůa�n�I�oa*�U )�q��Y�~@���f�x�=< �Z�����D0��p=�N�)&A��	�L�3*q��sB�
-j��v���Y����@%�Bd��X�@?pY
���"���`	R�
�Gªl�u��"K7�i!����)�'Li
-Yx�LAuCP�n�I�oa���
WG��ȶ���6�����¦�b�[�J�4�P��^�"�P��V7�i!��T��	vH7�g���\%���Y���t�
Bq��U2u�v$J�s
�tSL�|(\)%w U z�c��)�\�]�Ƽ�'Sƙ���9p
-�s���3��"�������c���d����
-Ę�3�!�!q%��s�m㬾�l:�~�Q��%y�_K~}�Q����v�
-�˧�O�N���$�ӳ�M
ʱ H�w��F:UwV ś�sm�/�TGiIN-Ky�8ѹRt')��-�E:J!4L�Tp<
��r"�i�͑�FH��؍*�����V!�Op�崣�)hϸ��i2fG��YfG�ӣ�Q�\<NY�5���ι�̎J�LP��^��W�Z�uKqV&��t�-���햊�YN�T#���R�.�-�
-q�fK�,���k'��2���:2mt�U�E����
-�n��U����$R��{ƨ��1�}A�3z��y!
-zr���e���<z<��VZ�pڋ���s�B4���:
x�X/�GCeؠ�[���[�����0��[�0^w8�~��9�0*�\
4qq��:׫��[y��_ڗ}�m\!)�������hA��p9n�yj�-�FZv��je�;n�be�yԃ�B�w�Fˁ���������[�)���ƭ��j�ɝ��j,�@~7��)/��z�-�{�19*N�6�٧9����s�Z!���j���Sˍ�O�y����c�����]��3y�L^
-���8�wp��LZ���x=@*2�CG�~���{*��(�:n
�3zƴ����$+ٽ��
-�{ك��F@O��9>j+
��k��L���z�$[9�i> �ױڪ�Ov�x=�dD
-D�0tڄ���(�f0�{�u=���f�V�
��8HZI퇻�A�\e�(�uJ��+������F�A��D����8�K�7m����:^��.@Np�	ou�ʞ9�V%���:^X@td�GGwv�l���V2�F⎗G��Lxg`�#h��m���Kt �xyDH�w�d�ȁl�C��%�:�V�Xz�^]1#S�x�
-)*�y�q��p�7��wy�5��{!��d�3�'	߯��&�	�Y��x	"�A���hN�`e�զ�珤�S�ˣ��~��x��/J.��Y�EZ�������+x��_
��� `��C�*E޷w��X�����8�9�ۥ0��<�z�����Vd���9��3j�eL��_e�~)�+R�$��X3*#$R�$!�8�>�G|*��?g}G+�v�J���R?�89\8�\ƾ.=��),��.bx��r��H�	��5[�H�	d�D�<���Q������HFwgtM:H�=w-#�!cQ��!��B1�oϕ�G���E�=W�ݞk/~et��Z'�n�t��}	�v{�sUMpˮ�o�|*�� �{�d�*��Y髛�2�X�=;	Bv{2m�g�"�=ӊ��퉕�����]�R*K�v'�����$���h4�9���<�[�������a�3���ڝ)W�����>/] ��;�_mQl	䅊��|M�X���1�Kd��4%�u�CeՐ�I��;��8m�s��(3Ժf
���
��[�� rd����i�&7@�8�;\d�*ȧ��Dc }�]+pU�Á �g�*�q̙&�1�&�j%~sqȩG%P&xTg�7��/�ȋRq��U�&N w�a@f����<�D���<Q����$�&�k42�LF#�]�9�NP�i�ȶ0iL���1�!�F�@��^��&ӅYwl#�)<$%����C�d{��iL�	 f����*}+xG��u�}��'�L��)��R�>qn�$z�Fy�T�-	��{�Rsy�4:m�	���l�o�f.�xNTo%�����x�>Ȩ��Ak��.s�IiU�<A�9��
-%'29�4�?ǫ�Y��O&S^�,]��L�F��%���Fi1�a�o�r��)�l�ZV���@��ߌOq�g��`we\$�&dZh͵��p:D'�7��%�axp	��j�t�+��-#���O���!�U?ҊŔ��rZo~� Ei�
-����<�s�fe����ج�:������� �pE��r�0����I*T`�*��KA���]��#N�Yi����4�]�>_1�3U�}��lwo��M����mJ"��Zg���
-]�&mC��]"���7r2H�CI��x�7��D�F���oB˨Q��*C ��_�lM�Q��]�
�lն�A�Z0�Ǔ�bS'��,���Ɂ�Չ��r�_�e��i�NE���/\&e>�
dUר$N����JZ�� eV?H� N �(�]�:��δo���(,�U�e�@/˔Jh�J����-J���c+�����`5C����s+rlCI$'ڳ��x�N�oT�uPcW���BePY�z4N�(�*0	�e�J���	9���I�=X�3E�@�ִ�/���L�u�X\hݹ"����m$l�%��
{P<(�M��d4�g��ƪ
��3�P�A�4��n��D�F��BB�/���qG��b��q�p���d����w�j���t'��|3;WԒ>�S�k�K�����H��(��rU��B�vdcN��y�M#���/79�N�AC��rP)���
-�e��FGഠ�����h{ �\�����#���VjMm�A��Q�Kd6��
�IR
��|\)�W3@r��"5<���M���k�jekU��1�@N�57k��f���i��A���oY��H��tTF�=�G�9ڠ\̦UCE��u����)�֧΁�V�)�����D��iUHUdA�jܧv�/�!r��a{zǵ:ײz���Z�̩Hי���Д�I�5��.�3
0�)*A`��Q&��L�i52qa�
-)+���N��K���ޢ�]�%EصU��yaP���n�m��0WW�
��m�@V+l�M��W�W8�dmނ�B;*�b����Zc�ĸy�U�8p��L�u�0�[�d�V΁�H_��m��Mvp�E>�4���Ā
-_�%4J:A��9�UA�����GҴ�F��
a0�(�n������)�#�
EAN��2�" � &�PY}���.x ?�
�>�Y[��R C��5����׉��qй`�4@�Σ
�,�m
���A��I�F��Pl�4Ǒ2݁�e�
�uH��
y�ص�f��L�u��$�����8�Yc� g���\�'�MZӊ.Zu@�2�O�82P���2�se_�)Ѿ5�r���u"���(]�w��8��F��!���#�	�|��*G�?c@G\�ϝ.�	ē�H��{b���ґ��4�7�&	�3��'��2��#o2���a�3lU�M�g�R�aӪ��Ȁ2߷�� ;oɍ���Z�G�3�EP�V
��[\g�;KP�H‘8�C��P�3ޥ��'&�\�m5�~��N	ZA��Vj(���n2�rx���kn�X[Mپ%��D��YC
-���-
S8
hp�
9�����0�)!Sf[%�McA��+��@�x�T�ŕ�Ơ��^��K+�t��L��i�,n�(q~��f�����L+��F
S�8PI��$^�t`��PA@6߅y:BI�f%�Z�0�H�:���fr�i��Z gi�
-��)��U���ߠ[7湎�EOPg�P�bx�R@�+i�l���{��D��Y��� G���`9G�ՂX[z�d�/1J�di�)��A�-�
-�5KL�p�ARqg��0�-�Z�h
-h!YDg����1)��o���~e�I��������4������o��������AT���Տ�2��X��[�
-0�T`���p?~��W������
;/1w;v|}~��C�3:ٹ���B�������?=d��=�yP�L�{�A�����s����{��ݏsQœ �|�70-����E����
-M����ǿ�a�a���������y��!ON���@�{lk�.��:���"��c�����!�ĥ�< ���^�Hу�%����W�j�^>p|Ǽ�!+V��.�?�������8������?��?��_��Ω|��U)4*cj�yD�6���ű �;�>X(����rLڑ����޿��.��W�����?���_������k|%���kzt�F�5%�	}W8��ch���+^d��.��
��/lUR�O<'�
́�DX�l(�P�Pй��d��Ę]���C�|m}�C8�~����.!&��nM��F������\��PO�u� �.�9qa��w��!<�
f�L��{<��S�7�a�-!d���~y��C��-)A� ��{��?���I
O�U<��H�
-�����nA��� ���:~�s�)M�M8b��%�&v�C��l�jq^���Lb1G(tw*�=�bN%�~�=�x�^P<v�:(�-�1��{��
X6ym
���[���<����xL���	�׮b�7]���|^��㠂ݭ���@������X&v�H^�`���~>�����΃q] ����a~P]{��ZAZ�P��Ʀ�yk�4�.ť 1�N7�ҥ��z��O+n�����������"EN3���A������t����}��k�4.��������}�s_D(���}!��y؅^}���vp�@�Zq�W͏� 9��N�HQ�?Q$�
"�%��E�v7����}J�P�"��Πo��S^��nu���C��[R�������sw@��`�
</�s�0[d�@�;O�i58����7~�!oZu���(���Iqv#�|�#~����~G�C�����A�?f5��G�IR7��g�����!c�Q�:5DlG��.�C3�&p#2�:���}Z
-p�!	rnˆr�T�+8�*�"�k�&��ep����@���8�C�C���-��?��
�ln�M���B����ܵ����)�x��N��>b�'���1����G[����(��άo@}�J� T��hu|�ǵ2�,� n*Υ��b���Y�*Su
���<&paoPC�=�����^B�Pr�I@ObR���4d	q�N@ObR����i���dhzS8R/7���$&��YL
S�;��IL��g1U��X��K�3X����G��&C�s�ܕ��Wg��Ih���:
�i�6iz���"D$�i�6izӃ��g�O+כ�����^}��Wy��;??M���_� �CQ�ߏ1H[JgA��b`��	U=*�B~�"t� mN�#�M��iB2�
ܽ�f������ۛ�\����Q�i����#�7�ɗ����i�u�{~ĝnN�#����B.�1N�<͏޽i~��<M�G��i�e�{~�EoN�#.����|�ow���1ߝ�O0�/O/@r�v:�y�;~�oM�#����ʁ�'z��|�"L��)L��_U�:�3�O��R�d��Aہ�iN��a�@�:�.��zBa��cű����Ķ�d)�Qɷ�{���Czb_����+���`�}�0����~�Wh}�i_A����:2h�6����0���v?�+�>´��e��k��ڥM0�::L�����
-��0��#F�'��ڥM0�::L�����
-��0��#8�����#�viL�����hG���B�#L��X��5V �u\�]e�`�u��^^G7��ZazbG;��ڦma2�h1}�:��������:�q���A��	&]G���u�#�A_����uտ��'x����3x���K.��H.9azA.����)��}����(��+���`�}�0����~�Wh}�i_5�
��:2h�6����0���v?�+�>´���X���@��	&]G���u�#�A_����u���ٟk��&�t���ю�}��G��ױ)�׹Y��5�&YG���ut#�A_����u����.U�pע����	n3�����xb��?z�K����.;��Ɓ輾"gWj@ًorЃօቯ
�x��ے�Ț����ƛ{��b��9-
U�	��$W�A�\1%�q��W�;3���^�Q:�Lj��>F�x�”t������'}��g�>���c����!�GK�+��/���>���5xC�c���

�*%:��?¹���X����"��~%=W�������'}��g������� Sބ���>���������>���nr���M�t^�CC����O��_��[���t& �d=������'}��g�����7'23�7����(���v?�+�>��}lS]�>"�7�d��R�
-�hf���3J���J�͠Sބ���>��������'�q���qA�9#:f
����J����O��	��
�
-I��[���{��'4|fY����QzAP�5�3=�:WC�ʳ:�G����J�4��]!YI���K�5�	��.`�j���|�,��V��.�C_B�-С�j�0Vӻ
-�h�;T�+�G��պ�A�?�Л�jD���:�_��C�
-�qb"���YsQ
���}��b*ڷ�b���U�h��r��T*��.��?Sbo޿���Ԋ�P?d�B$;�~��l��]V�� h�춘V_��N_�1a�q;c�b�~ƄM�hx{Fhυ�KY�v,yh�zE�ޞ"Gw3V(&�z�՚ɂ���g�.�=���6�E2�[\%"hx{F�V���X�3���~�}��;t���د���y��ݓ=�=c�����I�;&����A���3B]��܌�b�K�C���!۸����̄y>/��:�u��ݞP��dBH!pg���ս�nOX�x���B;ND�1P�+��ݞO?02a����Ros�S�m�����G#����O�U
-��`_g�ޝQ?�����Bk��f���`��P\,zx{F����g#���]�����G��j�mA~�����~U*�
-a��Q��d��#�j��m��Ur(
C+�o�&U-�,`���ͣz�6���*��ӿ�w��W
�	�,��ϱ:�>Ж��n�Z��"ѐJ����
���j/�^ɝ��}����s�R>�#�������?�J~I�=]�_m\��,7a�u��@M��r��-s�.�B/��[S�N�_�������٘ z{�.k"��X���b����r��T�;�a�}�X�^�Qec�Qa�qx{F�zeF��eF�e�}�}�X�^�Qec�Qa�qx_6�WfT�XfTAXf�ޗ�E�U6�U����gT��g4�1�2��̸�/��+3�l,3� �3>�/��+�h,� ,n���,��|*�|*�|۸���+�d,�,����K�"�ʄ*ˌ�ِ	�q�Ecz��+x�A�}$����h,B/��h�v*��k�9�a��E荓��HPј@N���S�a�}ј��0��Dc��o6H��ˌtW2�˕:�X*��DP�{o^Xf���1˼y��8ɘ@N�h�P=�=�ȼ�J89�!Nx����<��nOW��n
-��� 
JM2ȉJ�DZ@~��}b���	��/���XF.���Y����f���,������
-��5E���8�����^��k�ma�\�e�S�ޭ8	l�2���J��N�+e�<`SFMDv%�&�+y�ԆdW��x��
���dx��9ۻ�m��}���X�)�ޓB>$tT?̰' wW��J��Y�S�����|:�	萅<��^>9�� �Q>
2
=����LԹ ��3
-�u��!s�W�m��B'�<3� �Q>
2���	�9�=
-�u��!д�V�D��Ms?�
Ɍ:�	茉����
�Kd�g��G�!W��c!B;Cw�H&ԁO@�L�����L䀲�aBA2�|:d"���ofj�_�w5 �Q>
2Q�G0�;h���a*��3.����j(P�]+�R����ނk�D
-B>
���JKe+�:�X_ΐIMBЇ
�e.�����d�]=fJ]XTx�c��a@�FkF�$�6S�	��a,s�悚B>$W���aO@C��ԝ)�,^��ԝ8�S��>,h��X�]>
���P]&�).kh(s=ɀ>��_?�XG�!2�F����<ʅ:������a@��"`Q{��aw����B�0�wԹ����Â�D�C>
���LLA+^��;z��L����9#���' ��oj���h3l�mf���0���6�f
-�e��|��|gSv���7�<P����ȴ%�Q����|���p]!�|���4A5_�v�fU��0E_�����F��np m��pl������p�h�u�W��`hx��C���7x���7��ˣ)\�]N��Wh�v��(���,p}w�+$�]�|��䋞�B
-��tBO�a����G00�p7�i>&������9O�_�t�S�������K���#��5|�z�y�����%����+G:�Pv��N,�IAG<��~!�	���w�0n.�IAG<�Ξ#y/��j<��`a̓
�����],�r����'u�	O
-:�)������2�5wē~��'������-oZ$�6?t>���
-�
+x��ɮd9r ����KI@�grы.@Ц!�K	hQ�E#kx-�x�J��?m$������%
�p������f������.�_�?����۟��ӿ�n��!�7_K���������>�[�o��ۿ�����۟����S(���·[m����ʛ��ޮ��|���}r�\jz��:��������SWs,.u����\H�1�1�[,��7���9�P������p�v��#w{��������߿M.ܢ�o�����N�s��y}-a�mD��Y<����'��"!�9<�ʷ�&��"!�9<�����%H@�!���J�%?Ġ�)A���.�B�b�s�������n�#�Sh��g����[	�
=�H�yO��%��)A��I��B�b�s�����n�M1�9DJ�Sx�ޱ#DB�sx�c��W�v�Ih
+��K�`b�!M/cR�j(��L�tJӫ��Y��w/�^�$��~)�M�*I/�_���$P���WanS���W�8���������o���/���ι��ß�XR���c÷����[\�Vj|����M�����?���5��l�r�v���2����b�,;�=Ϗx�y~Ȍ�:ϒnͧu�۳���?�����l}�^5ϳ,_�#��p�	�γCoŹe����@9��G��˳�WPm˞�'_�'e��Y�����;��^�=Ï��9~(9�<˒;%i�e:���c���H {y���|*�<�g���w8ˏ��Wg�]߳�ͳ�'_���p�	�/�3��yn��c��d�J/�2�=뗳��#�6�[�w��V�%{��d�u�:+�O����ڮp���g�w
�s�Z�/lw�V�n����7c���
+���\��������S���M{�@��!�dOM�^�S�2��>�t�����[�vt�XL��3�Ѣ_F|�Ї��X�ξ�etLc�E��^^DE����1�/����@��	&Y�	ѫ�h�/#�@�CLO,b��+ϋ��c��.�E��"*�e�}��|}�
�Ĭ0�X
Θd'D�.�A����1=���u�`^D�Ƙt-��Q�/#�@�CLO,bn���ED�1m�I�"zy�2��>���"��,���,^D���E��o�,"�_�6�=L/�����d<���b��6�N�B0Ɇ�����e�}��|C���4�!BN)c<��ͫ����'����˾�iZ<����xd�,�WO���=O�#<O,^	`T�VAǔ1&]?���T�ˈ/���"�3�i	tJ�`�E�����2��>���"&�[΋��c��.�E��"*�e�}��E���k^D�Ƙt-��Q�/#�@�CL�X���y	t�_Řd'D�.�A����1=���Zf�e'5^D���E�ż�^YD4^�����F]�p�D�p�F���'&�A��A��jF�↲�_ �!��
��nuYD�Ƙt-��Q�/#�@�CL��2��i	tJ�`�E�����2��>�t���s�q^D��&�d'D�.�A����1=����Ǵ�:��1�"ZD//��_F|�Ї��X�~�:/"��icL���ˋ��_ �!��E��ܤG`б�c�E�����2��>���"�x��N$�1m�I�"zy�2��>���"����ዑ(��S ʋ����<�x,o�LI3��
`ݮM��!l\O���B�q8�>��W�E����������? ��'�����n.zڇ�����8| �w���X~��m��� 
�L��~$��vke0^����?��ݺ���y�YDž0R���n�'�rA�i*vr��ͮ�ev���2�8������]�����n�`��5�/t2������O�
���~fI����_�.���})`n�o��M��аu���4`+�����r��<��qw���[Iю�b��f�'�u����籤0
�|o3�'���y��:}�]��s�Gw6��WߪqZ绎�#jt��XA��&�S�T!������P\Ӿ)
�F�|���
�������9��Ӿ)��S/�!��M����M��
kgi[N�\��w�G�[MӾ�%��i�75��cAk��M� �ؼ�#�jLr�o{��Ϻ0훖�U���~��O9�֎�#�7�GtW�4�qKq�8w�G�7�w�c�n��3	�����3h�?�<�)����sH64w��B
+h�=����
K�TA��A��2���������_s�����zߙdh05���m���B?
L���oXd( 
+�̠����‰�ps�#��n�$u�޾�>�~�f�ґG�Ÿ�8׏ؽzkqޤ���0��C�0�{��l�$�"T�T�"�����~6^�t!m�\���}F�������{����uR�uF�����*��ϟB���Ǒ�@���>[n
~w�t���?����3�w?x�οq� �7�"(�bgv��
=�j�D#�e?~�2\G�NL!HY�@n8O�;�r����yE��rֿ�[����<���
R�#�j�$#�e
+cZ�i��i	��b��2��x�f^�e엛�̛I��o��B�,A@d�2/!�Z(шa�L,u�25������ؤ����b&���1�������y)���D���i)
1$�ƴ�
��^
+�i��x���X
~�2�J���±ͪ�o�@�,A@d�21!�Z(шa�ĘX����l'&��3%��FL���h6bg�o�����c�~0�-S�%�lA&&$p!1,���e�̤�R�����F����r�Z�/�ἧ���7f �E���<!%�[�rX��DrҨ��@����v�_�Dz�����|��ʭ63�-�QR$�Z@�#p!,S�i�kp�:+
 Y��ꚨ��ȬJ?����W�&�[f��A�"@�u����-�dB0�`L��ӝ���M+���2�ҏd
+�L+�Y�
�<ko��C*I��D���9���B(&�Ƭ:�r�`g%���#�wx��b����tV���˙��[�$K�2�LLH�B4a�'
��T������a*��SA|I�V� K���'�Fӝ�2�RH���S��M�I�����>TQ���J8��f'֏t�g�������LL!H�  �e����-�h�0O&� �-�]>�d��
xj7�Xu1(D����������V�e���z0���M1tJ���1�7�`*��PI�y��%G&��l!q���lWN�x����aE��q��J5-:3�� ��Ѓ!���_V1d�����SA-�J°�c̭�O8��o(�JQ�5)��_���������y���qh�Zv�Xъb��8���:�����*��ҍ�y���<�����~@!�@��O}.!�‘����޾�p)��6���{0:0$
&E9k�
C&�[��a�N�0?��ϲ�cb����	���p���b�ø��ë�-�`�;�g6�&DŐ+,�����S�-�J�0�c�́!��Z���@���0�����$?���ﻐM�kh
+��.x+(��<Z��_
�C�O��4H��̳���a�9z��@.$,P*��E�Ax?�.�o�/����b��o��H�D8Խ[0��74���G����~�:3���*�*�Y��`��%��ir��q�4�ު�ʦ�1dY�M5]�ڦ�Q�*���xA���%c�K�x2�_�`�������fm�#�~�<Ͽ�8�M[��p�X�=pC��ä�K�IA���2����
�;nZ���Yc�����qB��dD��tFD���LC���
*�
��=䐂�@84�
+	��	�
ɀ��
茈
+�V-���~�e@<���tH�8Ӯ�Ս<�Ɉ��
茈r�[���(�ȄiW�h:>�/�<-D�|�aڕ$J�{��ߙ-N����h�����@�DD��ve-�e�ӄHFԎ@�D�<xCD�|�u��$#j��3"@BJ״+Ar,y:�#��@�D4��D�0�����S"�w�,�0,I�;wڵd/�V����:����-���蒦���.52�1���Qӈ4C�o(z�i� �k���~A�9yr�g�Wл�5m���
�;����q����|A��v
�[Z'�������;������:�y���nA�����w�%8h�0�
��7лu
4 �(���&
���1
�- "D�#�݂b#N];>q�]"@�6�}eO+
��%�[h�Ǵ��w�^���I6	;y�Zԏ����i�8���12��NFhĔ�qvnB;
+ ,���2�(�_5�(tc�����d�ot��g��I�^�䌧�强�����7��}yy�v��p��˛ۼ�t���R��Y�~��,q�GA�����t������`�[C�H�N�E��=��W��A)��D����>�IY(2~�%ןo�9����i�*���Y���2<�6�z^��e2^�B�q|>�(��d���e���C�i��:F�P��j�\Ǖꌓ��c���
So-v_�~a��?��8Q3E֯���,��ץ�Wǵό��d��Oj�>�m]�
�:���ia��_�
E����_�ޓ�:���4兛{�n�emax�ɛ~�W�iz&=�;Mpuֹ��+���V.�(��Ys�&�;}�$ޯ�%nݿ;��=�ڥ.
+\��h��b����gOHwg��x#}Z w����r*���pcϱ`6�6��$d�>��	IbN���P'Hp臻'{�gw8�eCݧ��N����
+�.�7��|/5�CU�e���}��	�.��&&"OP�tx�_H��G>��_Li� e{v�\�g<d�ZJa�����^�8��r�'(w��A��C�Fͩr�{���O�6�µ�8�_���
��8$F\��$R\�� P��鳻��&N*�$��&s��w�l�)�_�!�p�
+j�U^�2&� f|:���'��!Neg�CX�9a���/R�M�s]b:���,;�ۺ�Iv�fl��h+�C2q���3
i
Vv���Em����O��Z��RW0c��L���_�@�U�D?�ew{A�aX_�4�cQ\��Zd��_��%��8d�ĥ5REL�cu�t4
+v6Q�T�Z�֢H�9b$��X
��J��B�׏�Hs�˳��|�<�]�ǂ`d����;ɕ��/hM�P!�|���C���)@�oL���V]�h1Ϡ��V�K0�p�&T
+�S�������d+������!�/K�wBźa2�U ���ԪA�V�;�'���L#���RН�ǐ%��x��)�lw3��<����vi��#���S	uP �RE7�d,��Ә�r�4��(&�ܫ�Q�JI׎���*O���ѹ�Ҧ��"�rP�4S�#
,߼2j��;��D�6��(*
��Y�J�׎��7�3�w��/E*vi��F���NE��`��cd�Z�A����i2�x:���p�,i��+�܂�\g��4��Li��s'�r����Lg'����ܱ�J�w�i$�QT
+�S*U�HIP]�z7�}���7��
+�/��0����ƴ�
+\%� �W�i��1�t��4dI+%^;�[j�
+��ᾛM�^�t�����S_e�n�������l�l�B�T��(i��+��Xuo�߉���$2	��z
�^A�uh����S߶�ˁ�'H�.�4�F"ë��jp)H���y|�tI+�^A�O8M#�s��J��'䆞V�	d�߻�>4u���6*�_,$�����6�͈d������F7>��Lo�O��[�~��-CUn���!�[u��<GJ�\xe
+���=Y��F,�L2�j�+M��Э�@ v�uv��[]���0#3ZB��&A�������/]i���ؐhZ�Õ�R�͘2ԥ�.i��+��/7���q{qjV"c!��E:f82%t0��@y�.�\ZA��ү�tV�F��.h�2�<1�&�d���"�%σ�����-�c�_����PXɇ����
�N�vŹ�u
%��@Z��ʌKAj6�XQː���x����<�2�����9���Ӑ�88�A2er�̣)+ȓ�*C�U�h)1�H��7����t��k��	�:��B
��5r�@Ф݉�xs1�{���[!/�m��Z!i����
�㌄SY�J�7�DJ'q�⁋bEOӫqR%O?MZ.H���n
�	i����~-ߐ[U�����-z��@Ĕ��A\�(ӈ(���U�p��\'A��Hm9�+J�I�~�8�x�d�\	a
\UJ#���&L
+�� �"�����n:^�0:�2�wN���^��^����I��3P��´�w���fA�fVS�����ˀhD�9��
Y�Hh7���?3�2�}�Nh?re%O.�`1�
+���

CŦV�j��.��K�~m��Bx���SQ�FH�5�.������u�i!���W"~@M���7�p���6��J2����՚k+��ӌKA2 �k�!�,m%ě����\f��4��#%�h��o�
�l�OJ.��"��0)�r�d:�F��XfL���݅V*%J[	�Ӏ����%��m�*�� "�@�%��P�
,"79���!/��X���S]P)��%:�
+U�HHWHK�4�2��IWŎ�Z�cÀc� �@�=��/�:�0fcZ�ŐgP���lG�F��"T
+�
�!L�6�M��Kc\f��4���:ٟ~LR	��P�[��$w�y.s��
+#�XӤU1}Be b�����2��r��BS�o�����θ���1�� ��Sл��7B
+��Q��_@nƨMѴI4ϸ���p�"��,m%�P��gq���
+a�%��V3
� �8�,U/̞��b�J��d��[?pu��p��5�;��0&s�4"o�ږ���b�[M�j��,��ׂ7YX���k�
�>��pHf��R�|E�N'���%wJ�7V_�ᗥ��O�Pvi�ć1"$� o�c��C=���/����=�NR9[_	�*]��=�ĮZ����!��
+����P
d�K�_�VaͲK*�9_}�˾��2�
+�ė}���}����<�!�V|�˶�P(�m�_R��y[�L4�K2o�Ό"������d[��(�H�H�n+���I�_�0�� �z��������k�Z�"l(R4���S4�ב"c
?���P���9�a�-�#��ڞbl8�x0�xzBNbhh怘��i@L� lCo�iH̅�����Jڐ��b�!1I��Bb*X����_)Ԇ�T_ِ��_h�<�u(F搘�{VlD�`��"#b81�
q6�È<�SD������;�Z�<r?�1�4M1�G�F�x��ڶHJ?�I�dBb��;��3�y1+m�E��d���P�!�
M�"4�/79����jcb��=���Bƭ�)&&\��'C\�
�F�, ��M12���q<q�6F��x��)�g�ո��aHl0�0"HE�t	#S���`��G�P4�-&F%��h������FÌ�����8��&
���Q4L�f��7 �>���8�7���Q8L���M�0����O`��*9(���{�D틂�NA�wl{�R�>9��
+ ��Ь4��I��,4��%�_��@�$�3�|v)���0�>8��	|�6"Ȏ�UtPA����0� ;rSPP᷷@��5UtP!�\�	[�T	G�	����
+�h4�](����3�0�r
�;�����RP�����(ўtPu覡
+�-L��st�
+�ǃ�BLBQ�
�2Z�g�Η1���a�W��ݙ�G�T3+�3��Y�
�I/������gL�QD��	&�&��	���4-R�G��cD�M0	�#Dp�I�@Dq���vL��ܯ��q�ց
+\�j���n�I�a�"�� (v.�I/���O��ߊtR��+d�'�H���M0)�#L)Sm:ȱ�V�_ksf�-D�M0	�DD�ȑ+��1N�y�N�tcD��Q����|��}kSq�-D�M���"�(�ͣ���ѡ?��ډ��'x��.K)�यu��a[	���"?�)ݰ�&�q�S>x��c�gx¨�����gV��s��M1	�3L��%t;q��B����T�M0)�3L�	@����w����v1I7�$��0�7U�a���$��	�zO�K	�D�#�u��@��|h	�߶�h/��q�!*�h(`"M̓��惩I/E$�O������.� �0zc�tSL��M*P�8N�RG`	���}�]�L��St��e�ġĉ����A(����&W�K$E5Xd�W����&F~�	�=�:��_ H�+��n�I��aJC�n�xpGe��y)��V:)�|�'_�$�]�*��^���o#�^�Hp!J{HG����48����b�g���'dJlT�j�[xm�I�&��&�`�����JN048�
����L�����"��hB�,��B9:��%�M0)�3L�*�n`�A�dr(���J�M1	r�����h�e��c�4�A���t��H1��+-�y>rv$����(���z@�P0�j�����%�1d�Ȋ���TG��U�
Uj

�ݜ (B�U"ol��;	&��a�p䀋��x
3y;FXtq�o�O���k)ԑ���TMގ�ut����;o�������
����У$���__�s��&5>U2���#�V&��y+�Mj�2%�[9�ʲ��v'\`���m�2)R�N&���vQ��9Rfn���m����k:�}�gQ�q��\ש�cv��}ܛc�q��e��>��ct�u�>�gbFi�:�c�8h�q��U����w�}�3}{��ඏ�,�8Bhʴ�A~��m� �O�Uqyk��\sN+i���~�i���'/x��6=�Uq$�븝$�o�:��o� ��7��іN�	���D�
��u���2�݂w��a
��h�A��wo!m�">Iw�kO�W�	O�A�7�i�y�Rf�A� �Z=Ї
|��Aw,ߞڪ�)�븟�&�$��(}
+Ō��|	X)�۠���]���1����������J⽯� ,�� ��/u�_1��H��U1�Й����~���\�("a�mȆ��U0��B{��}��<"]�CCU�l�mT�������wܯ�iM�ȡ�\܉�\�
+R����
��_��5m	*�3R�]ZI����AV�L��0N�"!l/X~Ai*���A��@*K������3�#Ҋ��]��
�C�ap�C�/*�$̎6�t2�������d��>����V�9c�x�?�O[�7��Cwcaդ�z�8���A�%OjLL�
yQj��@i�A���j�<�}P��ƚYS[A�J?���A�v���}�b4�r��
+����w�s�cn�.�'�XZi2���~<m�S��&<�
+��췴��\��"x+z�^�㵄�f��C���}ǃ�؄n����Ygȱ_f�AZ�H�i֎�#�[�🫁2q�2�l­"8�c(��qDȇ1лH��o�$�h+���fv�Ty�c
d�w�`b#Yi��d`����-P��a(z2�1������Y;n�j�ѱ3������%Ci���A�qđ�������f�;�Q�'k��
[緇;�ێ񀕯�T�m:��j����hՏ~;�
W+1K��k,�z��/��L��RuG��J��н�w��%֜�Ii�!����c�M��j������"��9*YSTp]Ŕ��̡_6*�q�9
ʠ,�Fm%��To����<�(z+���uEmո����J��Vl�V���>Vk���Ek/)�ݢ}u�2i_c�>�<a���G��5^���t���
+�����dr��j������Vŗ߬�*7�X篚��6�4t�#Е3xe�I�T��;��WU�b�t��e����Ү�u�����0�.{
+.�=�0����i ;ì�
k�Kz���åZ{<��0:�r[������a�
�a\UOC[�2�����4xγ�ǡ�B���I��X�(��r��۞�p��ʬ�(`�{jF���L�|bC��ȴ;H36�8��Q����G
��5k�����řd#�e�T�Y�2�:?Ó�ܪo�+�ԯǡ�A}�_�\��"�*t�r�[�'Ed������rg�
X�	rB9W��\�v�7%7����i��^ ���������FH}���
+ҟ�:�Z��/�;Q�G����)P�{�~�\XaHr�Q�\Bh\{*_��Q�1I��q��]L�`���:�V ��	�J��j2&1�#��@N�T��&/��2�-Q}�ZAB-*�! �W��!(��9b`��oߛ@��dshs+ȍ9կ��~�>�
��5@��C��Ȑ���"#7�Cve��9s��;��P4%�TbY^S�d���
+��ξ�+���
��M1�蠊��w?gs/�BB���V a�<w�/a�l�A�������me(�:X?����
+bį6�Z��7��������ްnA#���Th����h�G�~�B<x�s��:����冈�)�:��U_�Z-���}#
0��
+��k�(h��،
5��r#xEj�A�+d���AAq�'�a��(
�{9r��V���eµ�=kЏ:�p��&�X8Y�2�]�wȇvv��L)"��s!-n���+�'ѱ�5�36������U]�|x�&vG�~
�~`�yE��@��0����*�9����
+��4)��(�0��CN��4�i��q
m����&T+��f3HO�����d�m���������$���|v�y�k��gSC��lP,yF�'��~O�0���Y\w��[� ޕw�5
+#�Rt�>�6�>
��{*[ō:��� �Ç�ߝ���Di�ȅ���3�g0������i�d$��T��,�m�ʚo�͍@.�K��h�7VerU��'?3�%��/DϭZ�q���f�I�*�U�M��P�7�����[ls���߉�6x6�z(�&bq�T�Ҍ�@`i�i!����c�tDŽ�I�I~W5X?tX���k�y�"���߁�
+��eF����8
+Y�L����B�%շ��%�~�@QI�3� �tɦ	����Rhck��
�0d��2)#\G���V`V(3.K�A��rc[0��Cz�l@���/����#p+�ˑ����$=~A�$p�\RjRMGu<L�x�����u��/��@PKVȤI��
����+���i
y"���
+"P�UKŧl�8c��ь�B�����^	�b�|����/mTe�! 5=�*h��Iz6�(�d\+�����F'N
%�u����
+3������:B�^��k�@�6�h�#M[[�@�6�
eBG٭,N[J6(��k�@�T�h+�(jOq-�8$�8�%�ge��ʒ��FD?א��V]�F�DA5����2�:�
�
+U>��ĥx�L��|<v�5S�P�9�t���ס�ijs+P�/����3��H�?!�$������n~Ƴ�?c�B�LD'
+�e4���O$�bjU
+��#�C
����z�>b�GC�w��#S5��θ���g��Q#=;N;��ڨ��D�iϽ'�m<M[A>Ҵռ�MgV#X�� ,�.�"M[q-���D�8.s]g��/�Z<[��E~<�"0���C�p����rq�ݥbN�^���i�4J�P͔��8\=�F��z���,+�J�wt��V}=ƫb;6���R���ŀ�ݘ13I���1nZ�m?L���'�K�0��0���3�ݚ���G'�\��V`K�L��B(P��a���Z��a�����LaƵP�֓(&�9L��@�6��z�&2�	��6h���
yπF�E(�_�8��'+k��$t0&��U@�@q���y��VƓJ�1i��[ xW��9k�\q��qu�fb!��I��zo�
+�������شBaҠ��>pl�p�@�/%6���n������^l��Q�'ۯ�v��&F㨣,�EudyoL�
+i�mJeo,���}?�~�_#����y��z7F�r�A�2t��FyT<�@�jmsU��0��Hi�즚���Pb�ԥQ��c�j����������Ⱥ�X
�}r�`���
���K^@~l�H=�F�>�'ܵ6J���=l+��D+��e��;�x�C[_�)��Z���Lan���tl����"��z8(�C�E
�-׹��M�3����i�_��!��u�J�FȻ�5���E4Ǥ��-��n�\bE�p)3���������t�ش�(gT3��v	�<�]���^��JQH5�2f�%��nvx���ǺF�a5HW�A�P�L��ЕY\���.�:�U��u�8kM�"�8=e/�ܨU<`t�J �XҰ8��3�kw�
+�ڶ�p��B����G�y�a��yP�eR����A�
+d�&q(}�^�{,��z��:P�L��w.7��G���£���Y�ޟ/�'�@d��1_`{����dr��*�c��	d�iK���3�E J�
��a�a�`?>A�b�67)�Co-toO؃|6j4������@�GS*�y�P�2�U�f��	�3B(�ǨsYf�}G�w�C���x�Vnh
�����uw�A_�IdS���}�M��σl
+�t8;2Xo�ro�"C�5��x1
�R_A���B�f/�7˗�$�<�}X�X�C��	�U�A�¬��^�"C⇩�O�t"�����mR�{ˠ��qr��)��̼��!��}$����*�^�c�<�t���ƅ�Ӆ�L7
+J�;$��

+�_C)���k��srB���i}��ニ�<5�
����;Œ.l���D�Z��<(d�|F%����KV)$fL�щO�����C.�@�	Ds �T2a�ꢟ(d�@hN�:|��#�e�g�3�?�š�o�gܟ�Z#l7}E>��nk�0�+�� /ɹFEZ���1�F�O0�{s�냝���A9��Aa����>(d����!5/���(${{D�W����^�#���,�> �s��2��6�@M<���>YK��!��\�ML�m���EX������«��c���Q/���<2���#������˃j����ry���^������b�D/�HV:�<$2K/���tw�!f(��|�zy�W���ø��6�͹�]9�c<�UlJ��7�x�}�T^cLU7Foܷ�S
���VE���_�ƙ��m
��V�m�I����D��m���aj�ݷ:#�T�Юf���cb|�ƀ�2o��8��&��&԰�������	�xZ����Q�
�2rj[[��K�Kul��V��TA6o1�2���u���(�-�vߊHmz0��@�1�[cv��R��4�N�}��j?ۉ0�8?,�fZ5J�qW���׶{��7��F�jSO�8m�H�g��5BL�$�g��m�4b�L+�����[��ܮ���4C�7����4��qL���N����_���ZMHi�N�ڃV��o��b�`Bg)����Ueg0����U�K�nk6<=/���2�ҪR�S6�A+������[���rg–k+9�P�=h�}��]�6\�>�g*H�Jv-���Q$o�]D�藎Dž��f*yh��и'���B\��O"�D�|�*fF֑V�4��g�Z�3O$�"�o��e*]i+����٣V�,��
+oXQ�)T��4��8{Јk� �b�>X꒩��8FP�=j���|�Z�Ϧ�Y�;�k�G�X�K�H�]j��L\y���J>?�,{�
+q��X��
+fH�ZcV,�V� �"e[�r�5�H� �"T]�(�UL�bCe��B\�n�g�<֘�zbV� ���H!���.��%�5��o	. f����l���c�Z�}C=�b��}��aV��
+�L��{І$�!�M�'��Ym5
++���؃F�i�Q�F�LA��*���G�����R;�dT7��������V�;
+f���D+ĵO�h�…r�M�`�i��h�)�x�
+q��E���F&����4���ςJ�q���K
������(�fU����2��9<n$�)v
���G�y�"���c@���z�A²?6*3��ñA~�D�IM*����!R�5A,��XQ�B����]9�R�g������h���i`M-� ��C���WmAl�F���!ڦ@5�����nFY,���y0�V�k��E����ʾ����V�Ҹ�e�~���&˜��>��f�#g���i�p��oĨ�iu{l���j�Uʹ��?H��D+ĵM�*�/�"�nV�/��#���2���'BL
+�a�b�Hv3Vc���-
������&B�WA	�g�ݬ]CZufiHx�HăV�k�1��Qk@$�YK��l�|��V�k�6��6�*;dm7j���}�#��a+µM���|����f�E�*���K�HģV�k�1F�c� �^䷤�)m�z"t�
����6b��#]� �N�ELld��Ƌ	��H�]#´O��۠p�x��V���B�������Z!�m"���/�����IX���B�@�ӟ���'Bl�`�•�"�bf4�rD)��]=|G�B\L����O���]cP�Ϗ��~�ç��]}og����֧.�zl���dzK�a�7��>����߽����_�ÿ��j?vvz�A*>�pv0UH}u&;@��������~�=zܾ��&���x�Kz�A7��%D��>��@��>��O�OT�Hva�G��;{�;����?~���}��~�f�
[�l� *���C���"���t���+<q��{\��}��`��
y�㶦��
Dw��"E����ק���={��Qsy����-��o���[����_����?�ӿ�����MJ�D�V,�|lȻ@�
1�Rӝ��I�У����9\��C	Mjz3�y����'������?�����?��~��Մ�`�ʄ�&�t59��Ъ�ڲ�ч
+yW���O!��,��o���*��LIMld�h��v[Ak?�+��o��u������pm�*���J�i����?x�sSm>xzp� ݍ������L�ڋ!��@�_��)����Б'�g���w9�$���K��?~�)v���]ƻ�� ��?~RH�x���D�1~B{�
�.$R�e?~��7ف
�ٝyR}�����.�M�ow�Gr�p�����A:/&�����-�Ee��6�fε�~Q��X��\{l/

+C˨�6 H�=���w�v�lE��+�N��u��}s���ox�sm�[�_�Q/�6E=8�`]���e�9���!�7V!��NVjG�~\�����d<������D~�ɔM�ſ��	^y�L�����ݺ����	���7�@fAӺ9����ɣ<�t���I��<�E���; V����E�0�M�a�$,/��5��/�"�����wK��R��#��7.���vj����[�A��Y�#�7� m��6�����C_l=��M�l��{!AU������R+�D���
9]��9�
�A�?
+�	�0!5+:�ݳ�G{	"Am�|�=ݯ��jz�w'f_X���+�|�e������ِ,��k鰐��E
����r-�\�f��[+�����;��|�c���XFe&�����6X�|ӷ9���F���Di�R]�f}��桬�ݲ��ϛ��ke^�
yp�F��h�A�y�ı3�.���h� ,�:2�#7��"�a�}����m�`ی�$`l��zاw��6UB��p���S#(��-���oz�=�Q�5�|g'�Ʋ����'������������ ��p��%�9�@Y�X��l��D,',��k���0:^8��ӔW�Au��{���!$˿��o@�p��R�?}
+	�W2n��d��
+8ap�����o�WUJɰ����������ް�O�BGs��u]X(����qq^&x�~��:�<��l_�P�Uv0q��1A:�'��$&Cӓ�F��4�Ġ'1��Ô�k�j��$&��YL��B�hbГ�MOb�!��$&Cӓ�Z�A��38)O�����/�'1)A�bZ��Ϗn�#L���0=�'\կ���� �M�c�!M/cR�*�1蔦W1=x�~���{y��u���e���4��g|���sФ���=�sQ˜�$�.��T�K�� �(�C|�0�Q��*2�+���T?d��T��fi���4�.y�O���p�r|�N4�dW��Y���y6͏�ȗ�	u������G���D?�L_�h�βq��4?`v��!���4�6��m���|�AN�'8�W'��Ξ�s۞�G<���>��_�%�HR��>ᇬ��D?d�^�(�/����_�G�
������%��_VL?��u��+�O��2r�|�u,��`z��i��xV���K�Jc���ǜ�շ|pPo���	Ol3�R3�2��.��=f���2��t>�s������. �NEW�$K8czy
�������:��ʈ��u$�)m�I�q���:�������fa2�ɡ�6�d��b�
+�(#��>O�cL��8�a�i	tJ�`�u�0���:�:��>���:����	tLc2�h1}�u��A���1�'ֱ4�vL눠c��YG��+�����<��1��#dܺ&��A��oƤ�8az}u�u��i}��ud�Y�W����WX�_����:�x�֑ē�+�I�d��\<�������œ[Egf�f:]���l���6��A���1��m�Z\���&�t'L������<��1��c�l�v3'�>�M0�:N�^_Ga�yZc:_G(�]�g�@��	&]�	���#��>O�cLO�c�0��YG�Ƙ�:ZL_ae�u��i}��u�j��:r
�C��YG��+�����<��1��c�K�:�ؓ�1�:N�^_Ga�yZczb���H�c����8a�
+��n��i}��ud ���z�:ZL_a1/��֑Ŕ�בŔ�bJ��)@�DL�!��TCLq�bJ�G
���f:�I
+&�f3����a�yZc:�f2����NiL�����QGX}��ǘ��R��I�ʠS������u��A���1�'�1'�O?�#��icLf-����2�:��>�t��a�r�"��S�8t���kG������
�'��y�tLc2g1}����A���1�'ֱ��dֱPQ�C��YG��+�����<��1��#�E-� ��}���{p���:������먎ڲ���:�A/��/��:�8�֑đ�+�HK�zn4
U�t|=!��uDŽ�'�H�؊�RH��.
+��
#�w�❢{f��w(�
��9�=��VJ�/����Y�w���(�.�Po�3ԩ�ZhX,	
+"a�tq���:��e���e�%�jW%3���K%�FѵQã��w��2�J��f.�r;r�5s
g�6�%�;���X�M��ei��
+IA	N��r��,r�p`;�gV�P�@9Ҧ���q���I
h�8O�hDwQyG�y~_}���������%�g���<��3�SĒ��t�ч�Q0<��:2O�C��������P+��i�Q�f�^��iAk��
5�I�X�ˢ��h�="�L;"T��?俯��~��MB���B7�K��������	�y���e��O+3k��s�$q�cm=��y����� ��h>Oꝅeĥ����s8a0���b/P��Π���x��Ȁ�}�{�2�
+Z;�(����-q(W���uF
h�=����o���@«Q�2�Z��~B��� s���̳ۏ�52�]PJ��E)Z[�X2W@w�G�W�3~0eW��i!\	*�6����#�aY���_X��B�l�>eP�Z:�H<	�
+�wz��=ܳ:�1xp5�͠�ߔ����e�d+�g9BJŭ!�7aeF�љ�U�u�r���L��d��Qi�����?����{>�̷`�_;ߊ�|��
7�ǃ�o�2�v�TќE�;��X�6�+&H�a`a��[,/*7���x`8�n改�捪���l���<���t�g�����-���׎�l�0�2���2���2��qD�xeDa�e@�u���>[,�(l��(<���v��R���-�
��
�~�
+�+*[�#
+�#.��baxuDa�eD�eĵ�>����\��<����O�]P�bPX`p��ë#
+[,#��!����׍{b�4�K�`3�̭v�baxQ5�Ŭ�2�^��y���3��3�M|1��gJ���W�V�#
+�
+MS�Aӫ].ty���3��Q�ڲ����P���Ϩ2����qkL���$��u����T�U�	4�p�X������2��T(�0�+uT�'��/A&�
�{�_Ɖ�S�"�zb0�$����L���P�H�.��=W�K��Ҁq�ǡ�/1��I�e��nYª��h�̲4��e�X��.K�%�,g�e�A�Ӳ�ǝ��$�iո��_0�����]ib�	�<|r��f�b@��
+F2��@�q��l��
�i"�#J��C"\U�QE-DHFԎ@�D��v������L�@d<��tJBu;���'�#J��C"B’;���Jl��!2�v{:$
��6�� ��-$#j��S"��陈t����P��(����u�!7�

�
��=䐂|�煄D�$(HԎ@�D��
M�B��t@�w9��Q�S=�.���<���NJ�{w�O�
����YX@л������Ē����3k��8z����3�!�@�q[�ɤ+p��]�!��@��0	1��
H:���,
B�#!!��娀|�t{�~�rN"
�ǡsrJz� O1���w�}Hf�J�(��b�Tuz���PUm:>q�]"����0�� �\$��݀
+,8r���
H:nKH$Z�Ρ���$�Ȼ�t�6�������&	���Q@�Ua�л�|+"<P� ����n���EE�l�(�)Vϊ2���,ʰaň2�\�����e�$�R��(3j���(�"��T�j�(Yvl��}��Q��QJ���@�_�z�%��n�]^�8�e��;!����OK�Vi��c]�Fd�%�\둗�ыg��a�:���
��ɱ]H��C	#[�LY��M�2%AB�L��V��*U�Q8�
�뮎��?S1A7
��'�vcs���5߰�[�:O���%!HA�������8�3�)���	h� /�B�O�8�#��8%)� ־��}?�k��+!HA�ѕ:	U�WHm[J���	�[x�-�و�+��/!HA�nw>����'���Ɣ 
��H�k	�g�;ꛗGR�>A4�<�'_�L�O~���"q��H��iX�S���PC^D&����k��fͭ���/]Fu���`i7�I���3�6�n��_����h�ǻʊQ� }�B!�w��o�vn��ه��p����v�)h���I�RP���v.�~H���KC0Ψ���}.R�CË�1�]DP�-(�6��D���.�Û�����.��8�fҩ
+y���/���-���˽	�­��G�#�!٣������T*�-����H>�B�x���>.:�
+��m��x��]�u*���0	㟆�b����[)��3L�$/���*B�a�X�1;��t��K`AOU(�JNV���$�p#o�Xe��@&	����<�Q.2ԗ1��#��&�ss}��DM������my�س��wQfᛵ*|�[���ƑY���{��&�찺��
ѧc��+=�r�}��d��+U.>˅<�r��
�QA�|mPt#v(bY�ē�A�����	���g<�x��Z侮��I}��'��j?)io�'M�_�O�����4��A?i���M���=~�oZ�Y��i����Frf�o
+�4S�i��M#w�o*�u�Mk]���JR?j2w�O(b�
��FC����=Ӹ5'f�����h�<��qC�J��{�ʰ�_�̍2�T�ᴑ��2�4�nE�D�6�Z�i�yr���xZ��2�wU��E�F`����9��*���E1)h��t�l���f��2�/g��yMrE��Nn�2
P�8�6���B���$�HgˆdR`z����Η���S;��-
-��~�&���G�m���+�8^
K����(�*4C�6�
��u�ځoHa�����k��mU�
P�4鶑c�vQ9�Hm$SQL4i� ������:�OV��@\���d��
���h��B��,�r!(�T��m"P^��2�����~�YƛW�ĘD�n��}jE_/� �y��H+�zT\
+RM&�Ŕ,m$��~h��
��򰮨w�C�k���#��$��*�'`[u�H�c9`�&�NZ�	7�2 Q���i��VB���!M#�s<�1�Z�PԬK�L�jLXv!�<XOۨ�	�!�E�؍�[m���AŤ ��z�F�&m�t�#�x������0d*\�ݐx41���0@�^ei�e_2Rh?�s0L���bf�Q�h�mP�J[]&`�@�3�#.3<��"�0�n��FX@����ߑd:�S�&&y:�"�h+v�RT
+��k6�+UҨ��&
2�[l�݁;e�(>݁X�{W���Ԗ��[���VA =�
����W�(.I�8I�J���M�����L��m��r{8S�r�*|{�����hi�i~n峲X��&��b^�FWƘg�ʀh@pD/�JȒVJ�v�$X�G\�x�M�Q�Kz(�٦)g\y9е^ˮ���Oެ�
�V�Eڂ�ˀ����-J�i��[�������u�x��fHz_��2�^!��U"��
E�zDb�RT
+�fR�1U�Hh7�a3�2�*r�Uo���$
�!UU��*�qj�F}"�Ǩ��U"%��e@�Cy
]��P� ����M��)U�1�,�h�	�Ф�#f@ţ׾iU�j@�� Սi+OI�
.Ɉ�a
+nC���
��!6#.s<p�D�{�Ç@�����}�,}�1����h���F֎IIȍJĜ��
�x��Y��VB��<y��
�����6H���I �J��@bN��h9h#p����\d���ʍ�v.�
/�`7Ti#�݀
+�H:�:��VJ��R�<��M��<��7���0�
+�
$�X�Zci����rm0Ti+��t���
��;�^��N��nwAf�o���k�V�'�q
9�b��\ZE�
�
񈑯!K	�
+�,�8�f�e��K��X>P�b�Mր�'
+<��(^h����e��Ҫ?�(�"�y>PJ���
��̀���&����U|��,h6se�
:(
�m��q`��0
+Xm)��";��e@4"D��@IC��Z�|����l�Ig0^:gv�H�Mf����i���m<z.L ���5IZu��I��@x�@�nC���
(��k\&��2��A������MƱ��Ʃ?�!έ�?ɂ*�Fƪ��:�e�� �O1L��b�M�O�p���ʀ%�DO9���2H�NA��Ĕ&��(b���Ū�E�*�vW\�#F��W�����@�f�e��a�Z�T�/����1AA�QW%�(�E�g�����9��ՉE�vu���]���}�K�����;��6Ʉ���zafH�̗�0��?�q��"?Ŵ�o�(��<��5���ߵ�}qx_�����)����e�1n��}ki�_:9c���eH�1*�,�}��X#)��j��x#%Q�Ws��%�U^����)�}�F��J]^)*�n+ʒ7{���]�?�a�!Q�]E�3�*d�
+_�U�(��*�pdW��tW]yy%1A��Ui�ը�S��
+	���]u�렻
+��eW�X����G��%��U���8㪚t������rV�k����.�f?2��%pd�q8��Bp��)g�&��4��	M���	�D��'\k�''\kB?p�5�8xyO�8|���$�8o��h�<���c
+����4g���PJ�s�������i4N�$�j����9��Do�q�A=
���z���O�q�\e�q�E?�	C>�؜t�����<�Y8NS�@�Z�ȧ�8ȾL�8�����9�<Y�o=
��<��Ku�3>��Sj���q���q��;
�~�S<N�m���pL� �8e��3�}^���Ki 1�6G���@��$�o�C̳
�~�,
+�P܋����d"�8ľ�P��Bq�Y�@|%��Q(K&G��P�N@�|2��m{�8�����Q$y&�a�"qX|2�8*QE��]��&P�'
4���	�Q��(ݬ�
����۳%��
+����ī"S��JE�#��rY��oh]=�)dJ�Un�l*B�&��sAvR4m�;3��$B��!�T��I���G`� Tb�!�h�dt���""�oaReXS�&��ݞ[!�8�n,�j�0�2��K' P��t��Ҭ�'���&ц��{�œ(H�=��(���V��hD�G�Y�hڶ�z_�b��➊�\i��E6��tSL��S�ԇ��y���i7%�q�!ʒ	QH����0I7�$ȏ0yoJ���;ׄ.w� ��tSL��S�D��)8I�z�I�)M��S��
�H�AN�)&A~�ix��:]��ߤU�ۻ@�)&gr2`��Z�J�p��{�k*���Q�g��T+�X���q�Ճ򼦛 �&c�>"xʰ�A�$�%�r�e �n�I��a*��1D��IJ�4�0I7�TL��}L%d^c�e�`I�����M1	�#L�|
8&{�O��D��6�d�)&A~�)S�F
 
-

�7�^�c�gt��"o���Am���t�s�M�:2E��/�\ ����gqo�NKD[>إ�"H�,Gd��%�ø�RI�d��.>�;9f9�VȜm�"� B-�CRb�j�{~Q]��3�@]�
-����lu[Vt 
-(R��M�`%�%���PWf��,�.:�FJ��FF3�J����(@�	���`��w_�
�3]���Y���
-�g�{"�F�A�eL!��h/�K�����gO�����km*�O)�v
�
�7�-��4D��G��:F
b_n�bsZW=@}��Zܣ$���U"@@u@���withhT��v�a�qN��G�U�)�`�R�̍뷏�ܓS���O�[�kV2CJ4�kj�{h��6q��}W��D�V�kj�c��ۨ�l��Ͻ�8T%h�2�@pY��CA~�5:�@m�<� L�ܣ
��K���<lh�E���lS�b����߇�[!
1��ċ����A���y���j��w��E�󲦯K��/�?)�X_�I��0?����fe���fe��=m�J�(f�뽿�V����O��<oǂ<���_��;�~�����X�Voǂ����/�������;�E;X�:����:?��{��L����g2q뻋�e�+���,.�<�tα���`r
Pk��)��
4e�P�q3X�-=Xt_�%�+�g?�x\�A,B&�lN�_��7g�����`�N��n���(�,Hi	�Ѵd�R,�^A���7g_�A4�do
-y�y}�

-@J7<Vf������
�K���`�b�t;�m�S���Dld�uG*>vm�	@ �lXSV�у���/����(-=X�_�%�+(��C7����$�+��ۜ�
���8��ڏ�Ks�7��`ɂ���L}�/��4������"\�8b7Zxm�ލ�It�5@K�3禝VK���hs4|)�p����
�9��G�t�N�niw��jf7 'Ġ�@��{�)�d
C�}��&��B��3b����X�q�A���{X�A0[,����^!
-fA��� �c���aͯmL��D@Ś/o/��
�
�B��K��{Ae�3nk��4E��>�W��8�� �\"�ɴ��X��R��Hp�h^�%�,�X�R�-i���J�-��.��gܖx>��Fy�/^�9���O��^1S�yp'D+P��H�SZ
-���u�>,_�%�+h*ex�d�}�a]lK��;���U@��SsX��P�}�5�q�@`�Ì_֏KB�����4��~Ö )�
-�J�8�p_�A�[�Q�_����7�I��<���~��Tqh�P��k�$�yZ
-���`�R$a]A������8<ݝ�e�\����j�Tԃ�-�`�����eU+��v�e@�)��70_+5�����g��;�$<�m^n��dS��&�os��݂��;��y�3v�E��"��[�#e@bh(���l,fހ����
-�+����V\Y9
[�ɜcJ�u����0P�%��cU�d]&c�/�2�+h4:i<�����
�O
�U悢
9S�
-�����7IA%�ؐ+��̄�
iN�(T�so@�m~�m�����P/��CĨ�8�X���"��T�AN-���߰�4A��⎄�Bd��4*,)�𭠹�!����z^(9^��U�c@V��
-r���TFk�� l|��~H,��
���R�����aK��yM�k�Z���P��Ƽ�
�cWZ�2�YH�3���J�|
�5?�}�NXbZU�H��-ɌW�8T�K��{�OfbɌ���#��\�Q�.���)�STr͕�7���рJB����q'B�e@b������/�����h���5���%`6��V��h%��y?H�H�6�o���Ӏ �48s�`�y�0<Zh�X�B����`1��q�3nk��9}*��d/xL�ڒM�<B���>O�� )
�`,hބ�%�ł'ēR�+8dSyRf\!���:پ���2�ML+P��n�<��R�b�
���a�6�����/�9n��2 ��$�c)�
-q�����.z�>Q�B(��@ƕ�4�q���T��@%"���iN��'e@�-r�%�ÌP���������[I=bQ�	*�7'��M�~���]N_�����p��o�t��b��pd��o��}�ϯ������^���pX}���Wj��x��� �%n�+ �#
V�oh�8���#|,�ހ�@,�q[����aN�"w��x��  �gc��ó����ʪ1!JJ���gh��t?|"��ó�V��y�ʖ_ı8�+Ud^��r.Z
v������=(E�頶F?Ix�e�A!~�!��4}�Z���l����u~*�7XM���3]	����Z�ƞ4	߂q�y=�GV
-|�0�_�\��X52O�c��	�X�yJ��E�S���]���*���
c�R��z�+���X]�q|�X�z��J9V���X
��U{�۩�̘SuU�/�T����Te6�Te̿��*pD�bEFYa�&V� ������>f��y���C	6�� ��F1PB�3�*oy�'��s“	`��w�>O&�'bؽM�w�4�g�_}"�u�+�M�	�M�&��}���<�G��n��<�kU|�i<�]9��pg}�~���Y<�sY<�a;��c�ε�ۂ��$���$��&�ԕ���q�x�4����I<�n�%�O�0�	��ò�Y�T�1^D\����$�c\�6�i<(ƻ4�v��i<$H�4���x�,\��x.�`�xP�si<,ܝ��:�11Q�Y��&�G���4���3{(H�,��DY��#��Y����:n'�<,J�T���ryz�Д?ow��\�M.�J�G�<�oAW���a]���zq��3%�~�.ɷ�IryH���<�ߜ���ǁ���q.�S&�G5��\�֧:0l.O�BVH:��amNryT�;��i-g��2��ï�ځ��Y���e�&TJ!�p����n'�MU6.�-��4�!P�ۛ�H)�Х-��'�z���9mYU韖m�[��&V���-�ۙ�s���J��
A[�*��(��)�I����T�{�����H�ZnRb�8��d�d�[>_Pp8�)c�F����t�$2߳��o
����vwr��%@%�w��
Jl��C������o�*./���y�gsJb��m�)%!~D	T��)A��qNI�	%%~FiH�
S�����)�0]�?�T��������+��Od�R�G���D��x�s<�$Ô�?�_�b�=������'��&���%(Z�i{Ӭ�ẃ���o>�aL�?�GpCv�2{L1>a�|�_%BG	�|B4���!
�s�(����0�$ď(A߄�	����V>Q�D�	%%~F	��b�{�jԉ#ܯr_�3Ä�?�TW��2!u���2���e�vL*�b`,fq���
T0��#�3����^+�a����Ll�}Y@�)%!~H	��<�U.�bS��;F��3��0�d�Q���+3֊�\Wi8�/�ms�����%��]&����WY���,2�Pb�g����LB�����hp8�]�Ä�?���hqIx}G���e�:���Ô�?�	�+K�b|Ԃ�+g�~}����%��̫\
�$��d��uY<B?�q�����^1�"ﰝŸ�
�<d�g��QBG(���˴���d9IH��q�*�Ä�?��yY=�wT0CA�E�m�5c�
-�=�f��B;�v�����Ҩ7)�0K��RJ���
^�@��)��:�k�<�Pb⧔:V���J��G�'th���H�ҁ/�l��'
m
-���p��%&~Fi���r!�,'=b�"�4ޤ��%&~F	�� �\�t��Ei����q������]�iP��^��-
-�1[�Phc��ioc�8���lQ��z���V��Y��46����c5f���H��P��BlBZ��ZJ��qN�He��!|�l*��3\ `��.��R���[#�B[x�?�ɔTv���
�y��c�,$\H�l�-��6�V�.�A���4��q��<Om�
�'<�+	z_�J!�

-��
.ׅ�Sh�:��~�jP_>�r�xl-��`�S����)[�AnkOq|(,%Ul����=�[��w��=�ĸ�9����������g��{��mz�%�M�1DT'w��=�>Ga�c��=ǓϘ�9���BpC��x�J%�s<?�)�sw�w�/��3��.NmN� ����A��p	JH��ƹ���ڰF�T�ZY�
	k�+E���*7�*�ڎbA����eϧC›&�e���LJ�*R�0�zw�ъk�|�W[��"�|۸���"g�@ ���r|�у��u�SUy7�Y`(�6�����
-��pL��=�,0؀S��x��Mw�܇t�ʜ����Ԃ;W^��� ��7�a�AqJm�r��S�7y�Ik�l�Ke�����'n�~��� X)��8�
-���fe�^wt�ώ iK�m���"�[9�̿�i�%��	y>�����&�u��&�LA��6۸�U02faj�T��0�E,m˴<(2���1������}�X*:���n�$c��fu�$�<�X"a���!T���(�q�~�x�Ҋ`ɗ�a��"�
[A�����<���*)V��}�A�~��Ƙ�.�QK��b�pv?'Jx`��Ν���u3r� E���:h�T���հ^�����%�"� �@2�6�~�v��6�|]01���g*~
-d�R&?�~&4tZ�hcp�8���V���J��'�;�B��!�T��,�T�g��P�����ٻ!�Y�zǐP\��	j��@8�$-vIݫ�E��)���X2{�����ӊ$iF�X�f�X-R�����3fx�Z���2A��Z�Ε�bo�ܟ	���9|�-
��ׇ�wsv xƖp�{]#����c���
-D���A�l�΋��FlN�#��+�n��� �
��E��
�q.{�*��5���mo���.��6A(m�UPFjS/Ձp���b�`��>��^��ێ�.b�N��r��q`�� h�ލ��(�D��O��ڶ�;���R.�H�Z�"��������:2�YKu����fԲ���Zmk���������d�v�@��=Aʬ�kAq��>�#��4���?lׂ�Z�۵b�vj�
-�fgۘ��"��d�Z�bTPaٵ�n����v-)��f�Q�|`�V��.�b�֜Mjւ�����UB�8�l+�Z��Ykk�蚣Y��Aڬ����
�"�V�*v(��wZ
�P���q�^�L�Y�:�+^�"	��|;/gT;/k�@��p�
-�jXoE��A�o;/�&�����7?6�����2P�����H���0���4N~�h��e�ds3������/L����ٷ����e�?G�6ީY���3��_�p��0��4�eOf�a2���2�ύ�8+�
�5���+��!d�$���|@��B17��4�
-P)�!�Z����y�X�Vy�<��L��s�
-*'�Qmj;��n`�(����F(Iy��ߕ���9g��G�A�W�He/��~�!P%��~�A�\0z�|����侎�A����c������yڐ���r��
��-Iv��"�y��@'�� ��^�d�U+7.X.�)�F�x�rw(����Ր�̇�!�y�K���s���"Zs�
-�h5Ii㈪�����٫=Vِ��>�
�'lE�_��s���Q��(���(qH	m��&(Dk�1�F��e��w&H�i-sqrF��N3���O�;8!�v��|=i7���X�?|J�s~�}
/��L�$2YrUh[����
*�V�����W���8
-��fH��LKT�R�����uJ�Z;��2W�>�2d8E�g��9��y�ʕ�=����p �����-���N�������Sz���+tr�Q�9���K���V����?���e�_$(��u;5�� �&z��	��6���g��
��Ę�� '�V�9AX���CZ�}��tC�{ӕ�0�����a7�B"���1ߥU:��\�|��h7u$���k�2��A���0���A�Ͷ��T�N����Wl����������
�)SA�	�����.���A���Q�?�y�Zȡjh�ǩ��r�"BI����Aߨ5.S^(�T|���Q�y��e	Ej�rP	��
�fj9K.V�.
P�s�$B��R�����Iaܹ�d�D�(7P[;�k���Fa�'��*+���4?5�Jus��-fVāYP
-4X�t?C�r|ߡY:��4�w�K�4�����b��c�I?�
-���{���!��罠
-l���O	�c�j��*�������~M6"�kn7��lE4*=�96���=UP�^
���C���\�{��͸��
-����=�W�v��X�E�U�W�|��B�ʸ��*Hu��B!S0"#�^��0�Gov�k���7,0�eO�s~P�>*),
Z*f.!�e�@ֈ�d�F��
M�M7�:a�ͧ��&b&�b���0��q߽=�ΥWU�
OԶ�ZAÓt5M~�X��U?p�'W�=�7T�-x���D��
���w���A��@?m��^��F�qM6��õaA�h��H&H�X����r�*������^���)Bj����|�d9�0U5ǃ���`�x�\=V]ծ-$چ���h���4;��`�O^��
�[\0��/����A���h]���$�Suѧ@����R\,��R��I�A����1@7�o���J89��
�7R�����4Օ�F k��u��S����AJ/�+�����f�(o.>�"*���Ө���9?��~1��Z������,�%q=�;IV�F"Q���%r�\$�+֛D5��V%�%��z���r�2�wp�$J��6|��ʸ�SQ-���7\�z@v"]�b#>{��� ��(��?����>>�X%�J����qN
-aD��i���!-"���<X���2�!.��瀱5+w�nh9�OʭS�N���
e��{U��€�K�cV��ʡ.g���}���E3Bԕ�^��C�[�H
.����A�MH��bDS�+
-�~&���z�}�X�p(FN��qc��Aþ���cF�9y -����ڸ?���g1(V��%ng �4	��j��(ȏ�׽lr�'W:�F��"�Y�X��aE�),-��A0RD��vkՖ�X@�UH������
e\\f@
�%%�"��}hx�+�eA���#�f�?9?��*xO`�1��}�(ȹB�cE�ѱ��k�N��q0�|��灨|V�����+�e�ͨ�6�B�ޓ�+�����ejAcܽ�S�8��"���
�^��v	 �/\*$��dN��q9�	h����Ad؅9����У�6!Α=��F�H�R�ԧG ���k��P00P4���ƛ�ͶX1`ޕ�dx>�I�x; �"�V(����<��R�V��ӱc�5���ضS�K��
-��1J��f���?���y?�+x7�����MP+rP�G��BhQ����*�a�b�F=d��\a����cyR�N����A���Xq�
cPM��\�Q�&H�`��Â��(^h�\h֠)@`l�o@)J�$:����)9��/��VD(��PRPL��L��StՒ�<N]�Y�Xư�f7R�:$F��v퐰���AW�%�������S]�7FK�V��c�U�[v�a�P߼�p��b�į��J�
+��`iy��/��WG%XX��1܇cL�0��>*�Xx����%_���u��V|�H�HW�c� ��S�8��������Ob���>$�)�H�W����7P�+	AЕ��(hx�7m�x�������0pWGi�������[	+�b����5/��caq�������sR��"������?��_���A��0����<ni>������"�A�No?��ï�����?��5\2qr	�ަtr�^�'��h�t��<�y�U0���w2��g�`�վAr^�[#�`ԡ�%���)�����?�ݏs{�\�-+ݭ@��)�u_{|;���~���a1655j�bΞ��u�aP��1�@�_ԡ8^����?iah�u����ٔ���r�0z��è��ѓ
�%���9�k��>���sS�@I
�����߾���I�z�ݯ�����?������TzZ�v�H��]�!)��/�y8��|�g���<<a
M�d}�E_y�h����a�������o�����Yw�NG�/�n[��]��e�'Е��d0��e�fȇ@��S£r/~�YXk\e�@�	���A^SX��F��%yZ�>�/-�Sv��W�3����	֒?>�6.'�m����	6�Q����n֑VO���MLԥG ��{5��)w�«���L�k�F��fn&؉.sb��U�Ǜ���=<�+�}
�l��}\�kD�������l��C/b�x�@���d�@>9�����X�T�a@D�S�
-
|����}-� &=F�c��+�<�v���W�f��}����Z�-��2��}��*��3S/�@�At�R������u�q���s|Wf.#S�g���j���J�a(�jN���>o/�1��昦R��}�>�/��ya�AO�/���
����
����GF	��m]�m���
-�Z� F.�����E�
NY�	�/��%+
-��GE!<U�@$$��2��FX2߶�o���g�ː���
�A/M2�y;`�9���}��(����xx;B�+�J�З���12��(��|��_��;~o�K��eӀ�2�-B^�FA|f埱.Pl?�F�!����%��>�e@�r+�~���e��.���}�齍�����@�&���=)P���
-C̋�+\AF	�������d�[q��[ł��Q��V>�2*b������H[�$Y}#W�§����}\��~~s	��j�p�`�&A��,�*��(���&,�����,�� +�C۱��	��ca����+�ʑ@�-�|_�����
-�@Bk�~���r�s����s;��ok�����G�����dş��
-ֹ�Ȕ�z�SbL��:����&�<#���������Pc2<���GZ\���ZI����
u�{��|->E��C��}�Rͅ�.O�$%���(u�a��̓�>IIy�,%(#��W�'}����s�4X-��$�ORR�>K�b�U��>I���9J���Bu�'
}����iJe���y"�')Y�>G)@�#��>I���YJ 'n<蓔,O���6~z�q9�dx��'ߖ'_�WWwFIx
-B^��t��˔������䐣�?	�F,y[1萣�)=�.���̊���1��\��yzUT�z�����������iA�݋��ڦcΊjt)�����o_�&[�
-�M����p�_���R?�L��y�����^藄���~Yhu�P7+Oe�/��2��.�z�����"~������rq��/+�.�ϓ��ۃU~A]9\�Օ�W	U]J���?�t���~Yzu�#BҾ-�`�?�V�.�Kj��ˬ`t�~�������v��/�j�.Z��/�`�?���.�K���ˬ��3O~�/i]g�����B����]��šg�_�X�uQ�jn�n�
�`g�Ӽ��E^�
-o�x������+%_/��	'�B��ZV�l{/��0A�מVR������	&�*������*O��S�&�s���3Jǧ*�����9eM�.:J/���
-��(��"��n	rʚ�]t�^�E;���V�Q:�E�+�Vʼ�9eM�.:J/���
-��(}b�*�kw!Ǭ1!�����h&�s���3J�X�
-����u��XB����˻h'�s���3J��E(���"A�YcBf-��w�L��|��g��wly�]$ȱG�	�.:J/���
-��(}bٝ����_�w�Rz}1�+��Z���
����ZHhP�7j!�m��S�G{�r�BHO�����9_a���S�|n��CN=�BHv�Szu�~�WX}F�|CjP���"ANYB����˻h'�s���3J�1���"ANYB����˻h'�s���3J��ž�&�]��F�5&dv�Rz}�~�WX}F�|��L�1CNYB����˻h'�s���3J��Ej>��H]��溅���;��݄/������e�`%�GO1!�@G����9_a��O�"���&���[h輾��H����J��|���鼠q@'�ZO����v̐��D���Bz���O�����
-��(����7�
-CNYB����˻h'�s���3J�8�2��E���&�t��w�N��|��g��w1Aӡ`m�9�B���ҫ��&�s���3J��ő����E��Ƅ�.ZJ����
-��(��b����F3�5!���(���v?�+�>��]�v-�,�5&dv�Rz}�~�WX}F�|�9b�B3CNYB����˻h'�s���3J��EN�]|=ׄw�Rz}���Wv�U���*!���
z�d�}-$�k!i9��w� ��!��T9J/�*;���V�Q:?UJ�Z]�!��	!�EG��]��9_a���]�@(k`v� ��	!�EG��]��9_a���]����"ANYB����˻h'�s���3J�������5!���(���v?�+�>��]���S2�5&dv�Rz}�~�WX}F�x3t.v>8����d=�Ww�M��|��g�>�����M\�cƈ��BC��T�n��|B������}�g�����Ww�O���.���5xC�c���
���8������2�#qu��~W�P�����!�a=��_kr1����E���B�O���@OJ�*�6�v�Y��'q`�
�k��
��]G��8T7L��0J�m���|)G��/?��ϱ����ZT�sk�oӲ�ص��4K���.���{���
�2�<ֿL�!�Dfȇ@b(�A�(�H<��?�=�q�
-���%@��U��M�
�
t-.�4c,�!��1��J����7�6���˚݌��Ms���u��ޞ1C���f��de��9������=!���g����� ��K��}��M����hש<@
s�Fݞ��j��Z��v�V��
�=[�a����V�+�bx{Ƒԃ�3B���o���@���3��"���VY�ޡ�I��m���L=�/��o�!?�jIe@���3��g�-�'ܒ��р���gL)�C�3BG�����wux{Ɯ�}�\�>c�N�o�X�02���)(����y�>�����
-����oa�ϖ�o��@��
-�".��>[��=c���^������۩ 7��\��\c���\����ލ�;׸����J���o���a��M��1�"�#�>�
-�ޞQ�G�pцS>L��o�MB�m໩�m���T4����4h-]��j�J�>���A���3����Z{
-ˠ��|Z*������}��E�.�B��(S8��o%&��>2�
�ޞ���:gZ#�1A3�t�F��	�;�>�����u

��:�1\
S�Fm�z6
hh�?7�^p�Œb��`�wd�_+1�b�6Vɬ�Y
��|ޯ�6R�G�*�&C�+ꝧ+Ē�8AO�m�+��G�t��ip���*0nV�L��Ϩ�ar7�˨��J��ţ�zʊ�U;�3�zJ ��B?���a�}��O�Q�S�QtQ�qx_=e�Sg�Tg]Tg��WOI��	E;�	E�	�q��S�;uB�NuBQEu�}�}�UO��S�NTQ�nu_;%�SgC�TgUTg��WNY���D9�	E�	����SV;uFQNuF�Du�}�}��N�PtS����̷�?k�:��:�(�f�m�}m��N�QtS�QQ�qx_f�Sg�TgETg��׆Y��E7�E�����a�:uF�MuFQDu�}�}m��N�QtS�QQ�qx_f�Sg�TgETg��׆Y��E=�Q���Q�Ua�=u:�Pu:TGu�}�}m�uO�N5T����θ����yUp�9
�@V4�D��
-�]����knd+NE%��<C�;�U��Ģ|�*��� N��Kr�xv_#fͳC����S9�y�����kĢyfjl��L-�U&o�ӛ���HwbV<���T=%����M��W�Y�,�ȇ��S9�b>����0�B\W��DB����s\�����	��ߣB�6�
���V�.Ft���X�[u�zP�27uq*��rx��5�_w�7�d��1�-ڳ^Q����ta��U�9�8݁�\����y[����:&�Oו�7�Y��Mu�j˱̃������8ؐ��I׊��})�>��;h��' xW���X&⼨)9&�3��'�S&�̓c"Ap~tLHg��O@�Lp7�D�ZE�?��tF�t�D��=%�Di���eB@:�|:e�����2
��� �Q>
�2����?G�}gB@:�|:e��c噘
-�~;�3��'�S&���1
���vUA:�|:d�_�"�31��&{CKA2�|:e"�7�;&�
�e���(��N����q?G��)�2! �Q>
�2��_8�D*�cp�	
�2�	蔉������	
�2�	蔉2e���2�%;�3��'�S& ��_�
-{��	y�#䔃v��(�B+�΂�tB�t��X.�D���!f>�t�B�j��ܛݳ  ���=BN9S��0Yh\S�[�0YHA+��,�x���k����&r�[�i+�C!�Z���Þ�d�]+���T�J�PЇ��N�=Bx�]�Ɣ���.ϛ7��&��;(� �
2�	��5v@7�
3����CSxPЇA{gTe��k����b*x1�@�V�8C>,�,�{�qw
"}��Z��׏
-���0�}2�	�޵�@ӕH�c����σA
-���w�5i�#D��5����N��N/�	Xԓ@>�_�Þ�x�whD�,�"p�;���PA��V���-_�8��:�̥&�&�oq�#�����-ؽ����$Y�)�eM��q��Sa%\~�5�A;=�B��}�hs��
��
-�э����׫ҷM7v�b�Ʀ-��"���<䲯`kF�3�뼌��6����W���[���>��%�A"�e]?v�܄��-�?��P��v�x��RĀ�t���p�o�.��ny�}ٸNy�h�I�
�xJ�3�����6i8����G,��X��|�Z:�I#6�'M(8��+�OW�ui���A“��T�P]�����Wu?uAyҼ�#�������o��!“f/���3�=���<B"<i~�O�F��i����;
2�4℧_��~���{gQ�'�%q�S�_��������<i���yG<E��߮Ǻ�S�4�Ex�L�#��웽BY2��NY�paIS1�Xcc)�(NY�xaIs5�X�`o�	����/�3“fs�T�*�\s��,z��iL���G<�
�t��O\:
��Td>b��jU�;T)��6��AbI� ej�I��Kz�>�X���;e�$�QA� �T�Uفu�)]������&ɤO�H����P����̆z�w��z�^�6�y.-1
-�Y�
-��uMT%P�o�v�D��6��ت`��@���2���
P���D"*s���Ԫw�I/s;VMo
�����S[q�L�`�6b�˳��1,��W�54<�F8Ѳ*�6����{
-F�=K��O�;4�c���ʔ�[Vmz�dI�Ě���-����͈�������6ޓU��2oR���
����)��/���m�%�-Jj�����8�U�+�no���,��4�����%�8]��K���o_����f��O`c��_�6�;��i&��K*����T�e��@B��%k���t�2!���i��#�E߉%UEs1��h��XF4�J�bT�L@ƖH�mbK,�J[b¦{�+�*�v��D�{b'S�	
q`�Π߀�2�R/l+�g��?�[
-�S+O�M��*rFSG�����&�
-�W�AWD�a�M\�>•@�|���%����7w?������t(
�_.�?��U�X��/���妤s�\�1#�}���9��\����E���F��N���]�?��6?\�Ȗ�pe
-�+����*H)��� �R4+cA&HL����	Y �D6��^��
LbYA��a��5�+4e)"��aE��)��hЃ�Y�2X̽
%����5D4����Ĝ6ZFjհoNlcߜg�:�X� �e@6p��`1��*EZ��"-�$�lN#���`._��oa��ɶ_	"��@�tAB˂vk��e��{�߽���ƃ�@"dsrd�5�v{6)*�I�� ���`還�
=��/���P��q[�AV��L6ݜfS&v�Jٷ�L��*9�G��	-z�O(_��7�����x?bv~�U�o�wO����ǤN}��
-��FϪ`還�
=8J�/���Pɫ3nk<���洔��cw�^L��m~���j��U��	-z��(_��7 ������xa��OyOqߜݷ x17��i�6����K$���u�|,�ހ �ޟ�}���ѽ�}t����d��V�dGTD�zVK$�����|,�ހb��l�q[�AD���Už�z�v
(�ms:�c;���k�X� �e@�4��`1�#E����G�����Y�{W�n��P,t�A(�׼K$�����|,�ހ ����k<�`o�]P,���rڷp	�~�"��Q�tABˀ܋ʗ�b�
�S�s�k<��/�<��
��?�H�s�c����Ν�~�H�Pt)Bŀ\�ʑ�b�
(4
-(������}[�(�O��
]��o�q�Ne�2�_P�tAB˂vg��e��{
-eߜ}�9�=�Q�o����V)�~�̩=ª`還�
=x}�/����m�A��x�q�A���CA��B��Hӗ��a��1xx^�IS�`AH/�Ⱥ�ZϘ/���P�pt�p[����&�l�%IvY^�?^�Dx*��	we΄ӟ`A����
����
��R$aތC�p�K<H&��JDl��{(���1�E
�D�B�*Z����`�@��!8RD�xr�7��°�T�N��� �%Ӎ�M�Kt
-�P�}^��}�1F�9Z����b�����LH��`���r�(�:
-���T���l"�c�?j��� ��
����X���X���g����P4+F�(H�2f31��[�{��Vw���2���!���B�-,I@��
-@x�J<
-��b��>E�@��I)Hc#2d�|�I8�a�X������E��-��:��A!֡!� }n8�k�{��	�)L�Q��o�Q��gT<P�E��A�;��Y2վ���Qx�5<�+&b��s��	�
+s9#�P��G�bI���R�Ĉ��ʮ*_�E�����In:���\�Uu,��<�L�+��
-�YKG�5z�|=��J{4�0E��j�()�m~����%X�
ά�s�;��蚃̡+�^��P������8+7&{,��Xa�9k~Ű���R���H� �K��{��	l:�ƃ���NJ���X���ȕ� �ݜ#O4)�G���cA��1nQ��%�����8v�3_���+�=��q_�A�z][�
-H��O�q$u�D�S�41I���cAq宪{Xq�Yu�$���ut�+��)��η-�~`x���⶞�6/�rc�9��WL���1{,��X�w��\��Kes���dF��|	�r������5�����^�2�ծu@͢E ��/1Q8ȀW2y,��d"���(��0�Xh���+|)�po@���݌�oo�M��b]
P�-O�T"ą?���V.�W-�<�4_5�Hqd��RJ�q2���L	�rn@�G��4���ݗ��- 02�12�E��UA�
k~���w!�o�-���Q�V�soA�g��xs�G�
�ナ�AA.�!�4W�c}��wA4���=%�|�B��pe��s��d?�[��M��H�Z�[�ࢁ�ř�	�W�"�Mx#b����i)Hf
�MW�6��Rk�lnm��$A���X�����
�IW^����a�
-l��),�t�o�(t��1+a�j�n+��L�V�]�����N40���d���A�TR��
-�&H�\��7$��D�m~xE�O�3kL�ӌ����)6�
-�#6��W魏Dr��-�AX?�
r�}T�J���u�`���]��:���)AD����K�P�^뎋	W��%q��H���f2�[LJR���_���D���C����_�f��9`u��k8�9ab���r��@�Ͷ'졬�x0�	�T7���J�TM��n�N���*�~�2����������Vቈ���&�ֹL��e��e�o�g2Wz�g,�x�g�[s�l~�4#�y\+�>S�3q�����i�V���6��j#��6��j#��6��j#8������6}�Ok#��m���4��̒��p’�Hb�\��
KRaI|�6B��Eh��0n��F��ӛmi�J!$�4	��������2��F(�'kK#�|X!��1_!���4��}i��K#�H_�|���P�w�X8��0?S�i�F@���F`5�8�U����ی�uZA��h}V��J$Hh�
���o-���+�p��>tmw�y��'ۛ	���M��|�:��Pi���J꛶Jk��U�ы��:��@��)� �Q��unVr�M�����H }�I8����)Ja�Z�Ϊ$��o�$�
�Jd�c"]��gU��`�$�
�JˆTYT���}�{�E��a�$�
�HB�/��'s�H[\L�5œI�W��� ���-�J�6��"	j:*�� ���		ړ��.5��d�$��JBZ�VIH��w�=�s���%�y-w��5�ݤDֳթ�xb�Z=&�,�����N�p7)��._�ec�����������~Z���YQS�MJh?�w&�i"��ѣr�
-t�jtP��mb��I�̗˓�7�h�x���d`��]���f��BoRb�)�B��l�:���Q�����
-�Q�{�ps�
-'Y����V�b�̾� ZK�MJd@.�jA����c���
=w;�
Jl��;Sii����m�.�A:�
-�ia
-�u���:�Pb�g��]�Q����sJ<�Pb�g��]�xJ-����3���%x=���g6\�JD��P�y?��ϬM�JL����18J��O,�G:L�����������0C�h��gq;}~�?��3���%x���F���of(1�#J=O�Z�Џ	�(C�I��TL�R(��9���%&~F)2w��*B$WN�_|�GBL����5o9K��:G�x�!Ĵ�嫣�	B�²���^�Z�p2�Pb�g��U�@�+5�
-�%Vܣ��%&~F�^�L
R�Wn`�n��3��Q�a�?�Ԯ�<q�����_��of(1�3J��@�c�=�W���!�%&~Hi�N�J>��3����m�2J)�#B�9'��J����{6b��`����&tN�A���٭sd��aBI��Q���z��ڛ:ю�!UG1�|DgDr	`���ê�����F&����qѰX���D�f8������a�?�4c\�U�,b=V���ʜ�m�2Ä�?��i%pV.�eM�Vݬ�ҕaBI��Qפa�S�o��ۨ��=31SJB��ROX�y��ĦX=<	����:�0����(����
��s/d%,d�����0&�����۳u6뭈ڷú�:L(	�SB������q�^ic�)�0C���Rjh2-Q�zq�'��4̆�i٥a�?��p��;���	�����.cf(1�SJ
w<N
�b]f��[h8w_^3L)	�CJ
w������)������%&~J�4/�E���Ќ���	��]f(1�SJM�-U�̷����K�m9U�JL��R];!W��dr��
-��]�-�4�Pb⧔*�x�V���|�������0�$�-���RLLl�T�y�x�:�3����)�uD��cHq
��R؂Tc"J>&D d�Ww��4��~h�;|�Ș�`e
-��w������Vt_S�g��6?�#	�X���{t�A�eڱ'l�O�B�(�tB~�4`t��&�K�g�
)���C���i��I&
jg��
�;//ӕ5N��h�����TN2�"�I���IE�Jr\�ދW�md�k�f�r\)�ўVNN��
-��.%C>���i��M>U}���K�C�G�ɽg̈2�u*W���
-���i�\�^Ok��9��1��Z.�7��:�)�������<��O����k˜
-+��T
-;��:/�����gX�J��	,�Ж~���P�23�6��e�vWgN� y�<�_�|j�bV�!�:�g]�t�}�A	�ϘF�z�)�θ<�����3�����
-�θ�_�z^����;��
-�θ�_Az�d��2c�K��%�I'��ݯ�#�^d�/��T�����KCW3��")����3��w2TɌ`U� ������u;�D /c	�L�0�~���?�2�I��
-R��p 6"�-�-<_lR�_>猤�m��Wc
�s���>S��\(�F
-1c�}�A��A�
-F��-���:&�Ɂ$<�v��F�J���^��׹/7
-5�"}Q����`
1�������H�s��$�a��8�L���*�qT�(9�c�eJ\n�WJ���	�2��!��Y�,ʺ�xx���:�e�д�G���Zԏ�BH(�=<(��Mx?�; Z/Y�U����>젬`�Ge
-��
-N{�8,X�?�xx�b�T��Y��`�?��q?L�O/HR�qw�ޔlq���Z
�K��N�W���k��Bs#`<5(��",\�W��2����
��Ҙ�g� �•sE
a,S�axP
��B�~�Gk��2�!���V�-�G	���O�%U�D)�X�ޏ�q�ky�ųTv��ܸޝ�&XZox�@�T�:��h��\���U
kj�T�nx�����6HDS�V�T,ԧrN���zNk��M�{�#�T�e,�eV����"Img\��=_���c�Z��p xR����e�D��i�
-�F�f,��0���Ӂ�!�;#ϙ����la�0��� 9��g���n��x� �J�.?��t 6�f����D[	4�	��^� x�Z�[^!<�-��ok�`���;�ޟ�U����,���԰�XE5ඁ�g���cy("�X�י7vF��*d2��ݟ��B���^Š
pV!E�ǔJ��q����1�x����I�)
��
-F⧸��
(F,&&-�5��˲VƮ+mN��>ְb��ͺ\ӊ̺=PmBc�m5����R:��늰�v]N7v���I���ʿb�]b���.u��P]"�C��T
�P�r�-ԙt��槿p�=��Bvv�]H=!Ovk�(ɨawU�EvKM��1�t
--�n��D�v� u:�h�M`���E
Z+.�1�.�`Hk]���\�[p99e����cbZ�
�F����Z�����a��ヌzA����"ot���c}��Ѕ�G�g�^���|�KG1�6�yP�vs?.t���q�D����z�jR��������\PM�Gc�ޏ���~t~X�I��[]�s?b��G�Rpz?�^�~��-���J'X.��%zAW�I������/�^L�,�KwD�y����T�9�
-8�s� d��\��8V�J��D1� ���X���A?��6��G�`���/�������=��_57�m:-L�;�(Vf���ڸ?�e(y@�sޗ���-�I�e���T��8�����d�q
-���K�2����}S��$��rƹ;�6�mdtS�~������j��T�ǟ�Gk�ɪS�6������|ؙ���m�G<g�{�[�V�%���^��HB�t��[+�ɊsԖK��*����AOٺ/��������K(���[]��?�P7�i7Y6<\۲��R7�w���fJ��e��=�~r�?v�����e�;QK�C�j�J����k�S�J�c�S�_����&�q_�b��=`/2�*|����?��_1��~9Z�N=_-2�*����w���^�W��o���殠��UCH����%��w/c�j�p*��1�_-0#l_����n׋�\��A���۶RǷ�[��]T�QA%ГΒ�u�HJ~F��b?���E��+�MIm����^��b�Ah-[�-Sa���Ad[j��m��6�崃$���p+^u����G�b�
-sBkc���*<Ȫ��P-[ÏW�m�yHa�oD�ٻ&���-H5+Y6x��G��OTR�T�Q��Q��.�j4��T3�T�X����H�����gG��z�={�����AWTj�g�"��6b��xq����!�_���3ײe�M*�+B���
-kƆ�),G�Ê׻/l��~
p��U٣���X!�c�r�hv�o�bABJ��E�|�St����Q��>5�@��+�cWIm��_54T��Ejf
-n������"v_,���-X�s���Y �����,�H�<�o�6���i� j�;R;���0F�7�+*��x,��y�$(��$�<.f�:o8#��6��T<�ŪW�2̂ؽ-�6�z�f�j�z��һ�K1��U�,��R�B��LkPbq�C��T0��]��:��$,��<VH����ASQ�C�F,�T�R�q}h�IӘ���R����,>�l[�Ш�؈��q�>?�]����2;�=C
��,4B�\�[�z�h�=�P��xo�)��!��W�l�Z��E�_�㊼^A�������a1�K��f����+hï�d��E*\-GA��gJ�¡� -YYj��X�E�)źڻ�/��~pNo�_>��,�>jDž>���~bK�r�
-�
�;�F9�W{
-�!�����q<@�B�C��J�_Bkg���g�­���N6ۮ�P͟@�H��d��$��·v5I,��Zc�)bs�ś����7H��>�י��d�ձ�Q�nɟQ;��A��"M)�?�O���[�� c�4/8����z��7ߊB�b]��pBkc��!g$�?��'g!�����們����ʉ��$����y��A��͏
>ѵ����H���������A�M	��Q�Dv,y>ԕ"OQ	� A������-�$Q�6h����v4�'ې�Z��V@��x#�����`�Ɓ��ɫ�j�Z)f��U��Ш�Mw��V��W��`롾����7WT� `a�θhł�	VCZ����j`�Y?��]�1ܖߘ.��
-�D�(�P�J\�IA��`a�N�g[D1���5�H��V�C��L��Z;��/Y|ł��e'#נwW�P`۝b��%�	V�j�>x
-\����i��Tab���6[,��c.�ڹ?hkɅ�{��}J�WW�qi����z�-��8b�����~����B��*p�~�0o�@���Aݯ��������-���ˁ�ܶmP�+\�T9�
-K_�;w�D��X��i����8i��A�L���ź�=�g��$����J�M�{E�
']�d
-��539�Gdg��
-c-��c��Ok�� z�v�W���/8�ûkԦ~w8��b�J|	V���Z��;ѡ�8���ًOf�:��/��1���ظ>ݬB����i~���V8A8�X<V�{7��q�`��h�Pp��s_E!�!ڧ�7��q�Ji���=$��;��KC�a+$�Y���'C`��V���F���JP�E���QLƔ�	'��G�U:�ѫKX`)���+ ��@�`d��R���V���/A�P�"b.n��Q��)�fkx|,V>�y�� |�bInh��
�S�K�Үs�
-Ǽ��Ѹ��8 q�
t-�ۅ�
-����I>M�W��EAކ���Ao!Z)p/TZ
-rQ=EBl�hT]��gI��
(t��nP��>�=yn�=A-l8g��6���˲u$p�Sy�� �E-5	Z��E	��䇍��J���
ik-D�����Xm�m��ܕ��� ��*�S����A .$k4�[�](	
-]%?l�¸	.�n1k�:��{#	7�+�m8eo(y�"���Dw
-
����{>VotŁ�,-d�A��Z@�l���n�-�l5�5*�E��Jk�� ��P�=d�`�r�(��ԥu(d\����(jF(�ᥐ�*d���p��dBZ�G�D�����I9�
--c��	j��ȅ��� ;�+RTwɌ�
��G!� d�*��2@
�h���
�s!���%C����
#�r@ 	�d��M��.4�����4H, f�6��p��X��p$�B)y��/:����R]�,�\�g�'t���d�9�a��[��y��vb������	.,R]�gG�s~�лh�O�c����9�>lP�ԑ<�<[}�eb�z�xء�3�]��^�����	*�9,N:1�<��]2怬���]�V�a�v!�	OV��〴շa}	���I"u���	%i!��veâ�K��~��~	h�R���AǛ����)i�ﱘ2(��BfvT�mȉ�8��
�P��
O;]t�kI
-��XB�o��3���W8�gK������o����~�����Z�C���?������?�7�}5���Ԏ*�gD|���
^��ۏ?��������{
����Y� s���>�RW�w�r��@��������??'����@���o0�` �o��ۏ�'���8w'�Vpk��6.�:�oP��L�+�\7E�����/?L���s�G[���q(�=f�P��3�"�>�zX|r�Y|���GZ	p��z6��ո��'�� �0�+r�d�ɥ}}�����>>�m��������}�oo�������������~-��&�`>������!(�QV��>�|��L�k/�&Bm�-M�4"}��x�e��N�q��?����_?�����ֽ�{�<{�K{�+�F��@&ר�庍	L��ŵ���	�C!��e�@��=�v`(C�x�Ք����UNnK�r8-�%:�6�/+ȉ
#M3'&�srg!�ĵ�}����Z��R��Z=��`H�Z�\K�X��2J ���t�4j��^K�;8��\�MU�o�Z.���j91S��e�[M���[����s|=n��q1瓂�uo	��b�v���kx���!
���^L�|�b��N?v��"�qٸ�a@��j�1���d�7qWA��Au���BI�꾡�&�*�����}�U0��~�fo/�M���A����D���5g��!���u�'w���|����*!TP���m+h�Ӫ�2��wxyKX]�
#�7��`����}�]I�W!On.d-�P�)B���%.S�b����r���G��Ⱦs��U���g� m�V�+Y����O�!2�
-�^���$H̷��ε-���/f���7#���]z�	�M��~�}���7#BK�4�ɫ
��{5b^�X�هb����~�k��������� �:�ܢ�V��9���^��jj7A\V�!%���%�>��!ߧ���^�'�7���v��xJ �ͼ�z�@��P�SB�@~��$�(�� �`�v�S���H^=����2��}#�wGM��\ߣ>]�7�2�[������.w�`Zs�7=�����ܝ$��I��V4�R�6qL��P��h��?2�:T7/����WrX	j���I��_�@���!��X�YqUl-��*�J;��2\|�?���O���y!nu�@�/B/����"ap���w�~����yp�*���4q!8��?E�'�����?����������c���)�
���O?��z
��endstream
+P��J��U��T�i!����+��>�'���r��	F|��y��&�}p�\�RԶ��tcL������@�S�
+ٟ3�H7�$ȏ09��sͩ�~��jd���i�n�I��a���!
+h.���[��i��� ?��'�с��%
Rý3�
C�)&A~�	���y��H�87�;��n��q�!*	��!5�0\�и�]j�)�L7�$ȏ0�N� g-��C�֌&�>���&F~�)]
�����\�$e�vSL��S�ˮJ<\A5
+%��̦{���b�G��߹�?d��B)��
ʏ�n�{���b�g��0Ȁ�MA�J*nD���ME�/�,���Q�g��2g̪�o]�Dz��I�a�n#?�T�7|KOja�A�l�Av+�x�"���꓍2���aN(<��ܤ�b�����O\C��J�3��J�#$�Q���xm�����b-�E閿��	���V�4ܓ7`^ݶHx��y~I�$VGk2cT�O���b*��l8�J�#���I�G�4%N��K�+�y���M=J���0��$;�<������W C�*F!�8:��^��{�`� �ڸ �tL9_~�b�ۢ$Lم�6���W:e��x�;[�����aq��!�Ӈ�X@�6nKF�����ֿ��Ӳ��ث�że�.�<
+��0�eG��so�٩��\�.FÜ���O��8gt(0�����M|�.��j6q�|纉�bg?o���cf�U���j�o7��r
��3���=\+�%{.XL؏{tu�°a��"[���^�[���j��P�Y$���k��H�֛eHH! ��W�!�����}�Pe��iIC%�"�z��x�+�L��0{G�\>N�N[�F%P֎u�<�r��J�}i%#�
��贆�!�N�RZQ����p�sҠ�h�} ��\Q�*R��]ǃ=�����jr���p+�p�v<H�C�p�*��xT��>0���t��u��:,�$y��NJ�WGi]�����{�k�W!�
�w�s3�۠�"��w��4���`&IWe�i����9F)�1�8�e͋�/��B{��}ǃ���߶�����V��f����
XL�@��X�P�<���VZzd�H�
&���
�B�����J���A��Jc�˙���eT�h��1"�n��<)�	K�'�_S:ϪiN���;�4@��(�gx���F�!mՈ-����)��24j�-iU�Mkǃ��H*�pѢ�B�]f�Uf�b�xl^I��/���7%�I`nQ[�BAQkǃ�I�	�4�Ꭸ2��(�
+���u<���Cb0��*�+������#�9�ԩG#�&NZ�,�S��h�@��RЋ:���˧s+�[����Q��Ԩ�����������ͻ� �}
+qo#Cza��܅���A�i�\@1j��? ��#:�
���k��0ڦKJηt��P9�|���'	I[�1�3;n��̡;�|kJ�6�_Ԧ]|�^��Q��P����
Ն���vҪBPJ�@�q{��'Fz�:u�R�������Dk��
�	��5L����2�N�U�(Z���������n���o�]kC��_m�ߨ���=���
��P����&�Z[%��:n��9��A�UЇ6��*�k#���k���XnՄY��<��E�t�{�/�r��g�^���[H�8��X�U�8y���Z�!�����a��pvU|e�V�Ԗ���t�ih����:ko��͊/ͤ$�/8�(��ť�Y�5��S�m�1N���メ��ZT�V5_��%L��
+ECެ�f��T���������N���%�0��x�{Ą
�d`l�����꿨��K�˾���>�z`�]��� t�IX=𵤤�ű"��#2�3�Z4��#���z��#�͉�Ŝѹ�5�
�"�5��DF�ȜO���<��qb�Ky��yh����@*{
+o~{�|��s_>�%�σ#Y̜�c�t*��0��`pP�@@e�:�H��́��Fs �����	| ������`Ȼ@�h�8��g�Ze�{+��>JP2ل2�����ݱ4ʎ�a�{�q�+%�kE�"���
+��=�U��/�f��ځ�;P�~�HJ����
�g}!�!̭�ַ�\bU �!αB
+��<�W�,�U`��Z�?(rP�2"G�䫂��4�8�@R�I+-8�eB�%�ʊmG��eM��7���ʅSM������,ˑԊ>Hvyr�)8�6d�s��a5e>�f��э��׈��Ŧ��d�h!��NA����d��T���# �c������dLG�
��P���v[�[N�B� m+O~1�B���#V."�I�!~�ι�M��ɇ��ljT�V��"_��B1κa�YA��/?�J��R���K����@�f�415�#=V�j+�o@A>�9���7\`�8S5��̭<U�Q\3��2��{2�@�~L�(&�fm�|I$��U�x>��̇�	�����u��\�E͜��p�D�.b�%����W�ĒF�ʂ��u�
+�2���%�M�:��yI�/�%H�܉��h#���k&����r�D���Ջc�7A�'�Z�YiG�6|5� v&2�D����P�=͍W�RT���Εb��P�t!���I�T�5�V�.��s�&��B�k��q��TK�R.��\��ނg�����)4ɓ��KH��TZ�ҏ,�d#�F9οS�dž
%���$�ÒV	<���-���2�g��� �Kk?ե6`���=�js+��1+��0����e&)͌�I�������g\+��ϋë*
+9]���N�h�^�bA^��U�	)�ʄ�$�Oʳ�W񇭙�#��h��B���5�9�ɟ1M}Q�$�KNDP��6�JdD5��(�!��E6|�L��RA ���F�~+������]��bd��AA��� T��V��c;8���A���3��Ne�e&��@�:�9p�uG���q�ǂ�#�<Va��.��g$�V��ڪ�@��r�Z�	�ռ��ٽ70��T����A
+�<��
+(�~�!Tg@�D��v*7�|�:���X��v�ڢ����ϭ|�b܄j�z��:�b�_E����W�k���P��d������R6t�3��Fw�8�~�ܶ�gT+��
}�4�'��#D���x$�_���2���ܔ1/d&<ERO�i|;Y<�
+�o�j�� �|�!r��0�
�@&)����K� S�^213r
�D9KPu8����1��D��'���‹c�*U1"Ф�M����
+��Q�O'N��2W��(���J��B����E��Z�?H�8�S?c���2i���iD���M��H/�����u��~��,�1	��G�kZ��K�L��|�TK��$wOUAV�om\��fh�@��
y�4Z���@��Q)����#Az�:7�q�Q����x
+�,�%/�Bٗ4�(*��O
ӶU��(��|2[	SE�B܃���������7����g�0A��@1qU��0��b"�m�D�1�x:�_ّa��j�y"��OG[���P�B��k΅L��*�x*��Q�dgrl?-�Y�ʓ@a@��s]b�!���y6c���}΍�c[�iKq��8aO��!#���4�Ұ��E���*��}��\_D,�����z�v.4�F�8p�j&}�g�+G�����i���h2�"�$�UDg�	���`�
"�]����
+�'7��$Q\��RuMW�h�H�QIM���6��
/-?�j�&d@M���S�.�(���7r���Qɦ���Mq����k�;�Bʐ�Z�gìH�w1���k�ł<ڤ�lL��o���G����
��<�9�;����h�DB�A�н��_^���@@��2ٴzU�a��D�)�2�Z��n0�&������I���
+}���C�A5�|�0v����o�av'�1��m
h�
���5�*
�x�A#'�ZH^2�$&d�
3��9p�j�}�Y.`��.��{u�2XQ!�CB �EйQ�٘~4G�.�yuD�AR�:�(�;C���4�C����|��PC��p���Q1M��4̭��i:������/�}�U��S�ѩ���ŵP�?m����?�i�%�*h�)IT
+-�	ԗ�U�	َe��:�$�����B�A?8�N
��4)(QXD��s��Өz��#1B3N3�<�󰀆�Mm%�<PS����CA�Ҕf�B����Ks��<�ŵP�?m��ـ6�
+�Z49u�3� �]�[y��
9�B`����ң^�z9|s3����Fo6A�R�=�0I|�G_�I�w�@��S_�ᓖ�!tiUi6�#M�pFt4�,��䃢ء7.U���V9p�j!~rv%���v� ���-�ߣ
{^]o�}�5և���������W�:������ß>���]…to@o�EG������o���~��?�����w��`t|�Ok����p�E�`;�AMa��������c�#��R
u�t�|�n ��!
"�j�~���~�K���;����w�ӯ���}����ӟ��0�������#+a%�\��O,G�&��� ��~�}��*��GC�������h��5)�_�_tj_�������i������?�����u��z�׿�������+7:��
� 6w\���b1�]!pK����6�]��(�G�T���""D�Ԧ��ot��C͇N�������?�����?�*���hUc�ⱺ�1߹1�aO��G�u[ȻB��è{	dύ��s+jS����{�E��	�Ȋ�s,d���
�)���YwJ�.�"�]˦qY��}�.Íh]���$B�R��@N"T-R��;����s}�'Q ϟD>d�犕��$�<�י�t:��7?����d���]����lO���x��մ����t9n^U=8�`Qi���y2�
+$2xI/�<&�e Ə��:�[P�䆯���7?���n���>���|���.;	A��|��aKZ���|�#ͫJ��3����4"ĜO(W?4��K /Q�`~&8zTOo�����|�r�<���~��,'�)u2���
+��_6�����X���~����&���i��ב2X�&B�iq�՞V���:|'�u�>�k
+1Ȳ�b�0$��l+H��P���&`}��Ad@<�řP�(ӊI���FT3�2�_�?
+�ԉC���q^S��W���wpex�,��V^T=�2 �cp�zA �\`J�^��%�����*������T�Ƈ�XDk(8�`<�O������`'��0�x�����>��~��ow^睎�o��~X����.n����5�(����1\볽=bn�(c�����Qϩ��
���Xm�<�/���+x��e�&+H~����2pꞩ�����x۶���p!�[ՙ*)�A�W@7~=v1q詼=�yA��F��o�3�b8q>{�@#nzjG��	Fj?"sQ=0��Wv7��m��9�(W��a�g�k���}�^>tr��,�]�Fp��tM}��o�d�����O�F�Y_F������o\J
+\��!�ٟ�?�yP5���U���>�Gx�#�A@~�Y�j���� ����&C�$���|�c.c�|-�����ݞ�e��&��$&��IL}��3Mz���,����8�Ġ'1���TS�h��AOb24=�Ƀm�hГ���g1%r(441�IL��'1-���w�	C�Sx�M�W�k;�#U���C�z�� Py��0"���*%�oo䐠�<x�~�M�{y��Y���N����Z|��s�� �e�:|�ׂ�������t}�����&q+u�?�P�����7E$�W����~ȍM3}f�9�Z
~�eg����w6�9���	�`޹y�����g<��G<�˳���%/;�t�5?�C����<s��k޵�����=�凜��l����5�����[>��G�����P��g��l���޻�\�#�����R2P����k x�`�
/F��2l|������{;����J%��EeF��`\�'�q��?-���CH����0��Ͼ�	�E�o!��D��~�J�@�ک|�0�{q=l����e�,�WD���R`�tL¥�a��1���9F)i�bLWY�[7F�
�?1ڟA�x!h�(94�$�ܭ�2�O���
+�������RD�;��=�Y�~���|�省���c �)D�@��M�~���|�瘁�*i*��:�L	=��h��_'��sB�{h��:�L)�7h��_'��spƹ7�A��	"e�C�&
z���d>�s��1yX�ȠC{� zD�1Т��N�3<��:�{tH� R:Do2Р��N�3<�C�2�m�<3�!z�������6�>a�Ml�^�&�;��6�3j�\��֊9�/*�θ���4yD�&��/�:�����	��}t��D�@��=Z�~���|�省`��1�@��	"e�C�&
z���d>��3�-+��|�2Fdh��@E�|��gx^` �'��[�S���A�.��[�e�`9g\��*�#Щ/�)��7�g��_'��|˞�:��ZD�2P��_'��X
+�D7,�/�2Fdh��@E�|��gx^` G��N#���e����I�x�0�&6D�k��8=�\�Ц'�)�y!��,9Do�%��/�:���%({Ԃg`�t�3��a�E�.�_�u2��9g`�|���2A�t��d�A�|��gx^``]5�tJ#2���e����N�3</0���g �N)cD��ѻT�~���|�省56J7�4��)�7h��_'��XV�f��Be��(cD��ѻT�~���|���UH�1�Qm�3��a�E�.�_�u2��y���n�nD�0�"z���O��;d��m�X�����)�\⪇���V
��\�:� ����y�z���d>�s~����Σ2A��1"�@��]*z���d>�s�@��}�:�L)�7h��_'���Y���@��1"�@��]*z���d>�s�����8��Ag�)"a�G�-z���d>��s����:��ZD�2P��_'���=�tJ#2���e����N�3</0�(6���S��a�E�.�_�u2��9g��
+�Nkeny�o1�wξ}���U�Oi�׵�������=���:W*�
g ���5`bJ���r�E_�*1auڲuc¥�zV
���p*WZ���w��/|�K>��YAP�r::UE�g�;
�MKX"S2R�h+p����iܒl�^*2�\\Y!��*�<�8ē�g�^�f�v{iu3�����.����.���7W���l���3%w<2�
��4�
M�~��s��~�_{��V�,���g�F�!TQ�3�P��rv�J�A��OtmҾ�"DZ^ɮX&�2tZ5�'��h5�}��K-��{��ͭX�yXq+>L��b]}݊P�+$�b
}�5���Ļ+6(�ن]��ye�-衧r��0���&��WP[έ���i�_q�xwE���boa�	�"�!�ݭ�0���@\}��N����¾PA������n/(���#4�
�6�xp2�6��ϋv͠}���y+	�"a1	����f*�f@~�������"�P�j�8uv*����]��m���m�+jh&�?��8���viu�5�}����ֱ�|HvK�]9V[��A���+ʧ�@����|B��s�\f�f	;�6���ᅖ�-#��}E_���گz���t�Oo�2w9>�*�3�,
;��ݭ�o��?Ӷ�L���n��w7ܰ�]ƶ�gBKmP!z��W�G���׳B���%'Wc�����GdEZtE�Pt�}�m�E�]Q������0��"∬�B��R	EV|�x{EGdEZ�J(��>��"∮(B�����xŇ���GdEZ�������2��#�|��Y��رr�>��j"���P��X�Ԫ0�Z�0��"�HY-�Ă ��U#��q�}�Ed�:�X�=����w�v9D�'t�V�}���E��
�+��R���R�UV!��0�/�N|�Qwe�B�5I^�L"�0�}w�;}�⋎��d�'�a��a%b���g?�dS������Έ��L����v���h藾�z��9�_e����,@#����2��@�Vˁy	7	n^��
3~��Y0��2,`�"�'���X=X�� ��+9ه!/�>S�m�h0�~��^�����^'>
�ě�P�>G���2�uƥ ]Q&>
Q
+�=�6jK��dE��tHD��0���N�#BA��N|:%bގ��K��2�	萈�q4GĀ������������x��T�nW}�5�x�LD2�	H&���{h�[�.&Z�/	%pA�)T�d�P������|N�&�a�[\T1�G\@׼'a�%��d�]Y��~���!�v�bЗ���L|≷��iٌ��O
.�K-�//
+p<���n�t���gh~sV&m�󶷦�/���@���=Bx�]9oj��F�MU���-�/����O@<��j�����!͋����,�
+$�Ь��<����m��ޡM@�
OE _�����' ��c���O�f�22�Y�,=X��F�����I�T�Ӆ}�M}�IX�lL�zS1�|w��=5�e+��9��U�����Bi+��y��2��k��<�Or��*?ǯ�s2#��$K�a��ˌ������� ��K�g��J}�
/K��k=J�ڟ9I� 
��!��@�$��2��p��9�_(�ɯ~ka���Zʫ��ծ{�Bh@��6�<"���
7�D�I��'4�<���4�3��)I��H$/�	I5���H�%�xH��HIƍzDҀ���7���rs�ϼ�@R�����vz�W����/	H�ss��-g��Ȗ΃;��z��}�m�jėD��i7�����O[�
8-��C
+�9&V����{CH(�YW������
*׷�d������%h�Z����˿.��Ot~�d	�,��u9���~����8���Kٗ���t�|��4�ht����>G��.I}�M?�g^g8
+
E~
�Z�Mm��)�eq�VSQ�������Γ'\@�7��	Hi��Q��e�]��0�<�
����6 v��𧤒T�Y~BC��8�0�`4o�atO�}�r_�"MM�U�)_�{�T��`�t�\?oID�uQq@�-c��~�����@A`������рF�a�U�\m��*�UȈo>n�[���"�����e4�
+�&�0���N��2����^mp@
^��R{%��s�+T�T��[�K�y����֨�~���֗��Ϡ���k���\$���k9X�ϵ�l.�`^���ɭ�_k�
�1�k5�
�����kUl�j~����-�]e�9���V�}+���o����TBѫq�3�A�>zUD���.�y�P�c{j%��l}P��jq�x����מ#3�0ŠRЃzhȒQJ���H.��a��S��Ǜ�5~��"	�yL�]<�@�<�S��(ِ�RЃ�j�QJ��:��昳��(|6>$K��k����Y|��#�jc�JXh��棃��X�N1)�(ˤ*Q:�	7x��[����*}�����-��+*�G�$$�fx��U�9(����{��`7��R�Q����t�(&�@��܂����g���U��]�����H����:�aǀ���@o� �ɑA��b�#R�	�+�C)�AJ����f��7w߭_��s=A �QLwDg��.\�aj)3<kx�ul���Ro c2B���J��"2�
+�����]o����.�q�
+��}�c����r@g��UP�3�*|�����?tܐu����	%�
Q�t��>���wx�
:����<t�F�/t��7
=�U�A	m�X�&�����#��@D~�g�}�*%�|��[p��}��|ӈR���䀂|����uP��Q�
+'
���C��2Jҳ��M��3B�QJ������{<pgj}�"Vl���	�E�����ukMP6SPcӒH�:Jb���Ķ�)A��1B���^B�޶��R,���t��:�Ϛ���
���]�Qȷ�J"3���;dE�����ʀ��)�O��QB���zk݊�|��?���7?Ad!'�S�"��ŀ�n;(�<$VDQ�hT�PZT–����u�(D��Y�ض�o��fHf(ȕ�Vz9�s�A��n�'��
$G�Uu�TZ�G�^n��
�"D� �\!b��ն� ��RFŤ�Z9�{
+y�'S)2���c��w(���%�ˀxE(���ˌb�-���f�m���Or"{%(�c(Ț &}�ƐC��IÊ�0��[Tۅ��
e/�KA�`�da�t��n@d�6�m�ϙ)�V�1����e�3��c��F_͍*a	ft��	G����.��GY:J�7�B�+�[�͛����sy��tU�\�
���������M�[�Σ-�-KG%��WT
+��"逆($����̬�m�6_�A�,1_j����&
+)j�8�ܨ�	D;T����u�p�x]�	�t�(�^A�]ٯ���6s�\{�e|�$�(x!�@�+��nP�~<ު�Cj$s��1 ^l�h(8+E:J�6 ������3eJ��
+97=�ӇV�m�L����(HX��O�/C�b��!�9ҫCd@�\-
�L�E�[}�i�mo?N��r�[g�ߌ���0�����F}
��"�װ�s�u6$LI��N�TG|�r �G�lΆ,�Ib*��?�����5fN�;���/�����\�y>��@h��<T���#]K)��ㅍh�l�Ԝ�=]�q�X%;����0��ز?ѧ�%��x�I��$��KX(����WB+�=
+e{�C��c�`˜�G���ڣP�il��p�,t��7������a�4(��a�?n�������#�&��y��!�������0?M�ޘ�߁��G�9��yy��_�䯋E���"�o�ȇ��.��Ab���P԰�)���.6����t�Oc�c���k6v�bܸ�]�w���^�����Y?�X���X?K@s�-
��m��0��.҃s�8?�5~<).s�Hf`�H�a���2�H(fڳ�Ez^M�<��ы�I]=)����|%x1���������!֍�&�|����^��^�O�Y��(E3I����'�]�A�؈������L�F�]&b��vq�"O���CD*&��
��5G��,]��E8�b�d�@���D���$���E�x�b�yv�6��Ԓn�5v�,�(2�Q�"NbA `�6�$x��;�("�Y���$>xL��?M�H�
^��,xq\e/#�����;��J6Y�p
TV3��&��W���L%)�~+�<�El�#�}����"�Ϸ2�EB@�X�>�
J\U��
�jD濇HT�F����n7�=CIS�0��D"J�=L��L��7�\��#�a�xI�Y*	mN��{�DW*$�P<u��BR뗩c����]w0�=P��LI�v�c�J/�&ix�Oy�J�=L�+�/B\�`f��[��=���*&� Aq�Z�cbe5R�Q_!���Y����A�=S��D.�s��RD��Q�qر'i��?\M�[��LL��S�����5$�������NSL��|P�d"3'\�	�����d�b�g���� �uy[s7��O��i�I��a���
0�2rĕ��xe�bb�G��T�$�k�a:��C�m���4�ĸ���8�*�E�Z��>����i��q�!��SE���<Ò�9|�~
+�NcL��Q���M
���E,�p�LSL���ek��(5.p�ϸ�A1�� ?��f��Vm��^&���_�۟K3M1	�3L�Kc�q������_�4�$ȏ0��t�vI��F1&����Ti��D�1�P1�"}P�c������?�a�i�I��a����v���E�q�V�Dx�d�4����0���n����#�
�V0��&�����:���18l0K��T4o��I�����&ePp 8�,M�$�~�v��������n�<��Ҧ"|a[�t`��i��Q�!���R�oX��Q�N���'J�)&�}�h@��l�IJ
`n^V�ḇI�)&A~�	�AK
�PE
S8B��n;�4�d��a¯5��d
+��V�����$�� ?��p<B�>�
K���V|e�������O���
+�sA1/�8�3z�||��S>"'~%>��M��{�8�����)??�}������֜�z6v�:��@;v��]`��Ny0.aІ����?�$����f�q��'�7=�d�iq 	jT��
>>�^d���N���r�S���,��z��k׹ �c��9�E�7�����g�{�1���S���PT;˞��A��T��P�Ͻ�&��#�(����E�Ku{w�Z�NT�x>{����9Q�b�͉�R��De�<�.�8�Q�a;Q�l�Ց�#g��#5����LAt�5���$g
+�՝�
+��z�����t��b7�%��Q,����0��L����hs�'
+��c��}�t�T�`����+��y$���]�
b��BA����������yԫ�ods�t$��;�Ļ�X�~^���m�!��ͺ�_:�z�Y[6�썍����Q��&�NޜO~���O�u�j��� ���0�~�����D6��r"!�/�GN�P0�������@y=};Q?)�^P%�0�m�u?wo?4�4���i⸢�d�������5�Ί)d+�aPj���2
+��Hr�n'�-��gN!�|K��DL~�v?O	O!��*��X�a��Q|�&dF%
+$�pv��S��Q��"Ėćy)G��ېKF������o��*���o�x*Y���~��
ߐ/���"2�ă��NYH����xQ*�<
+�݂x����zQG)ʈz!r��������)R�F��y��vU'�� ��O;H�H(�tHč�Ư��2�Ҙ�}�A�AAq	Dӎ>�N
"�� �T���^LK�W��_��XyPGM
/zλ��Xj*6Z�QH�-�*c�ۆ���/���`3����1NJY�m� �xw�i���<�����pr����)�^���+B�/,@9��~�F)A"�먁ɇy���:/�y�e|T��O���K���~D0�,�C5�S@�a��S���	���Z"Ɋ�Od����^�^��!Cu��yh@57F*�>�GI顸v�ܯ���D�'9=OlFT������a
+=P��Q�)��(����
_�:��/u�TßB~�D�ϙ�
n
��]�7
�4��6���|�h���->X�WX�j��	!}�4|hTs%����V��4|HQ
�i����� ��D�j�e2pIȪ�D�l���ʎ]�H����]'o[��
+�O3�L	&Ӏ�Y�m�����
+���X�CJUm���+�F����{D�b�9��l�#�uG��T���B��V�}hј��''Dű�#�7#�pp't��R!=�s�1�z��l(d�x�&�>��|R-s>�{�����H��9�U���L�z��	ٚ�Ny������"%-��/��:���n��%�*':ͯi[K
��
ȗ��D��wP�&��jz�d�գ��/���Kk�۵r�ዞJv��l����j'�~��ƩT`�[&f8h�C�/�G%�2��P�	����P����*��w�\�=ัk��u� �{d?�����z �~'K�a���N-��Q���,T*��;�h
��H�ql�
�u�ދ{Wx�V|0đ��ݨ��pm�߷)�;��$(0�(�D*��E%Ӡ�@�l��Ԯ�Ե�f4��'"��N�|Tь������N�}�f2E��G��cp��lbY����(^��QP�2����,$
72�R�)[`��
�S	ݏ+N����_�p2[Y�gkPBW!_��k�9�iH���i
��G"�+ـ�䝩ߟ����(�zTo�w��~��]���
�
J}�e��Ό���1\"b�&?���<`��;�\���Vb!aJ�����!���lQm���:0��b!�6\�S�5 ��b@ɉ�
+�h-\!X3:]ӄ~�
����]$c������f��0m�߷r_�Ł����P	�r
]� �\�����r�����.~0���Vñ��E����YG�%�:Gh?��G2r�
@u���!r�������@E��A-Sh�nX"��&[_eꋫ̕����kôQ~`��ܥ�bDo`_T���a�+�܍���q�X)t�]:�CE�D'+�q]S~�
��n��x�
�F�A�����S�.nG����}Q&��0";
+��Ml�$�n���??- ��]l��%�[\�-~;s��VPw��C.)��ѣ�
+w�U�A��fޠ�y��`m��H�܊V��q˟(�訆�]�k#���r�I�PR
7$lV�S�<�N�w:j�=d�	+�J�TW�ϫ�J(;����)�(z꨼��F���'p��F��!'Y
[jĀz���I�U=(q�L��j�]�)�<5���mڸ-����S"�h����)�i(�� ��*�%�u2����΁.�fɡ�jba�И7jE��:�ڵm��
�����k�*a�An�2���B����W���
+�:5�U��Nl�G��
+���Y_'~~�{���#�Ƚ�K������pm�Uk+�r��<�� �X�֊��U�v:j~_�16���<z�@��C��zGoª ��Au����
�F��m�����uJ]O�8cW�Ϊ��R��҅���_�ib�(���~.*��k%3`��:"���W����	ɔBí���B��Lh_��э��������C�~�@	kb�
+{�T(zsE9�mԵ������~2��H�i?r���UjASZMaͨ���)�f�D�}d�@m�PcE�M��mH\���~���8�\��\@��]k��!�Q�|��*�9wH�Z
~^����Uc�E�@�+ݏ�;������R�//���x]
Y�sEt��������64S��(c����)��;VІ'*g;h�
+����;��BC� �Y_�WgK�_���5�j:�8��a?c�:� ,
+�����j�O(�-�2�A �G��S}��0Z*�L�T�A�U0����"�G-�Q �u�2l_u*S4�V�3�2���nW�����'��-1N>8+g�=	��!q��<bp����h�T
�SHd�k��b��?E>^��w,UiG: �k�� : a�
+�F#@SS�s��³ C�� �A~ڼ��\8D~�Ig
+ �^�:�HQ�K���(̷��6���'@��
xQ0��A֡U�$FЎ�]5�Z��g'6�p*�xeU�u�ԝK�p�n���Q%c������
r�F�*�s�x:9��Ǩ�T�Q�D�l�),`�B��*��7�u$):�fG%�eT���\���
��X�cP��^g�@�1	�%A�̨��:2��us���/������{�1_��QP��QЀ�y\;�w
+��2q,��
+�����U��"�vTݘ�&��: �y�̃�^eE
7a�~��]yu�+cPy�o�����E�T��
+�~�O�z�Wo�mTE����o��3Ա|7�W�=�b��%���"V�7�6�o��(a��v��r=��\\�c $�3��sܼ�Aw
Z `��������i_�1�����e`6\�vwu}�%E���e1�߇��L�*�����9�kq����|��~���?�cq͇�����d����b��?,J��-�����O����o���{M�?�5?�k��z�4���#y�[��W���e�^8y�6C/�����0
��|馜:?�������0Y���o�/`�g(P�f~��r�Ə��O��~�B�qX���,Vg�j`��w����g�����'|�����_��0D�:�����lɇqk;O���a�oH���[��)���������T�
+A����ށ?������u}��_����_����R���s���|���ؠ���d�%.�������Q�p	*�g�������à���MW��Ƕ<�����_��/�/��?+s���7�2��6�Y�~�Кbl|7V��F��gȗB dn��<�
w�ޞP�}R�jW�f����QԑrH��i]�������7_��$x
+`z>�x�����?�I!�w�waY�w���<^�e���'�$�8�#��v��Z��N /^<�R+ ���G w�2U&~��/���������po@
|���0�]�+L��>���y#A���I�'7�_�loA��-f�7O!/�<n�
)�˥U }
+y�2�1���'��|L���Y>��E91
��&B���?��^7q�c#���7�gؓ�2��&��)��D��M�ēD�8K!o�����w
+���޻�,t��V�/Ō	���u��f������ �*���Aߍ��������n6��N�f���\�J�U�w�BV#O���H�
+=��r��j��d�S���tP@DXT@J�n@�
�hݴ���-��t�۴�"!KG	�f"V�]�a�����Vh�p���>@RVr�}�����
+��6�����Js��߇��ZK����P���
+#�Y
+�
�݆^�v{z�~�!���P
+�h��U2�QT�ͨ�9d%��Ά~�j����v�~�s
���X���Ӻ+��-[��p}7�B��^v���x�3j��L=>�I�Jk5�C��(��l�g)�U���w��4��� �Pi�Q2������.s�)D��p:���q�.�|�[AR�;7<�
.]KUq/�/d%�U�L�A��A�E���W/�l�u�J�®�y�K��3�TF�!�X�ltAj��v^��jKa�9W����т�!�p�Q�D�-��]1�)#p��>�\]�cĸ����kEZ����)��HW��<ɏ��?��׍h�'�<	2?!�(�c���b���P���_�����y��y��+x0���h������0�eLyޯ�}�4	�ELJӫ��.:��"&CӋ�f|X��"&CӋ�  ?%G�^�dhz
S���gIb�kx���@ ��	bЋ�I/bjy��Z��"&CӋ��� $@��"&C�k�j�؃TiЋ���W1��_�}V�0�^���������0	M�!�=[L:��mLB֯j�iz��T�i�a"�)M�bz"]�����#J~�����y��w%���F�9hR4�m�`���N�i���? "�T矛���H�g;��t�v��.����r*����
��p�ߒ���'қG����.����[:�ۻ�R��f������^q��o����)�}����T���
M����.n�������s��oi?��
+�u�K�����>u��o�So��"����e:�5�����[:���L������M~K�;��7���7	���1����MU�l�����'46��o�򩨇%
+�|�c���R��C�	}��|Qy�߀�:V�
�+����� G3�Y	����+������LP��+g��~�Z�	��)�rC�ȉrx�;P�_�u"��9>LP7�W�=R����{��� �)�s&衒	tJ�`R&:Lo2Ѡ�V|�Ч����V��b�ȠC��0�cz������>�t��UԹ9&�6��Lt��d�A����O1�38�ݛȠS��2�az������>�t�DhؒW�0�A��$L���c�E����O1�3�\�Md�)m�I��0��D�~[�
B�b:g�x��������ӛL���do0Q��߀6R:6Lo(��s��td,s`�~(��܇�A��PLr�<���E����O1��źo�N���I��1��D�~[�
B�b:g"�{V�^e"�NiL�D��M&�ۊo��L�J醉\���6�d�h1��DE����O1����3��RFx
�w(��r���9�b��ȵr�@��(�I��0��@�~[�
B�bz��к6{&"�6�d�h1��DE����O1��Dh���B�Ƙ-�w���� �)���!a��o�	-�w���E���DQ:~�H��0��t@�q��x�y&�_�)�rC0�r��<R����>�t~�rKXt�0AǴ1&�D��]&*�m�7}�霉%����:�M0)�7�h�o+�A�SL/0��ϰ1��?Qe�۴1&�D��]&*�m�7}��&�U�1qP��C��a���.����>�t�D�H��G�S��2�az������>��5�3L�v��1&�D��]&*�m�7}��&b�}�D�Ƙ-�w���� �)��ș��o�-�w���%���DU=ާ�U����6\���^P>���O�A��Lz��7�A����O1��>Vk�D�Ƙ-�w���� �)�s&�?}`
�NiL�D��M&�ۊo��L�	�&"�6�d�h1��DE����O131��`�Qa"�iSL�D��=&Z�ۊo��L�N��3AǴ1&�D��]&*�m�7}��&b�t�Dn�~Hc2L���e���V|�Ч�^`"��tLD�1m��0�bz���~[�
B�b:g�I�e&��,�Lܒ��b����m�|����azC�X���n�y>�s���xr?�H\/+�D����Q_��ZaU�5�¥
k����<�����5��<�
�
�W������a�t�����_�
�o%t���B����ɴ�@&[Z�9���>�"��9vR�5��Ʌ
�N�s��	4�n'�����I�
+
���
省Es+S��B��Yy<G!wJ�����}^��������rc�F!y�6�nC��p�� QW��CV���$���_���*�.8�s�E_�˥mo�&��o1��>��

���_��w�`��՚Ң����M����H!+�-��Ak��!ۼ�N� �-�+�Ƞ�����>���i�Z�__[�>�DO�����W���í8/§�O�y�ö�m����p�[��u�o1S�^�&�_Q+|��P��<��]�}���r�~Ahh�9��巸O��bϜy�+�k��җ��y��)���v��p���b��q�xE�[݊�Zf�~��&�^��L���]�־��q�x�^V�c�b�I�����p݂���W�	���e�
[�6����Ԗ܊�z�����o�>���c����e5�6����c�wA-BCз��>����>��"F^pV������bX�w�	u>�y��!�vL;(��>?��]��у���W��~�S�ū~��)�����y��	;A,�����>��s�{P�6���"�� /z(�qZzNK)q ?��z�@���`�;,��t�^�G�m]9�A��{-j������,bг9�|[�tMJ{�?����3R�f&A���յ�T>�{j��~<K~�tw�N�/���p����NV������t o�xTN�z��v��
�[M�x�B^VOY�Fî�����!�������")���j��JuQYp�w=�;͂���Y5n�+��wꂢ�ꂢ��ۼ��ک�rjdM�,�M��+��id�T�2���6��z�uꂢ��Y5n�k��u�Y7�E����Wd�SWd��,Ȋ�Yp�w_Sd��,Ⱥ��(����O��"���"�fA�Z�n��k��u�Y7�E����Wd�SWd��,Ȋ�Yp�w_Sd��,X�k�����O��"k����fEVD͊����"k�fŲ_lSTV�'�_��N]QtS�"+�f�m�}M��N�b�o�*���>����uꊢ��Y5+n響�v�I7�U���y�d�&��tS9�0R������"��׈��)����o�y�d��j�T9%��n��_��+��w�D��"�
+�b��<�wN�lSN
b%��/���uV�Zݔ@V<9mU�]���4�:�nJ �V��tUrs�4շ
+]�A]�K�z8(�5�	�j�KAۧ�hz��c���H�U�*fR��j4��)�NJ�j���j�<Fr�ʉiS�^S,��՜f�+�o���Ky��V80��dX�Џ,H)�‚6q{���p`����P?ѕC�j����
+y]W�x}(:�d��2�kЕy��v[w��c2ļ�bq)HԉO@�DL�s�D�M��`�Y�'>
�
��!���DHW��O@�D�'��C�^!�AfE��tJD��e���Y$a&B@��L|:&⢲'b�p,D0Ȭ���N��/Tw4��,�
�<�rLA��u$����y��)9^�1"�b�25! ]Q&>
��b(D���y��)�#��(�%o��!��L{:&���)	s�#{dV�O@�D�(�F&b5�v40DדiO@�$4�>
+	�K���AfE��tJD�b�d"Z��BCt=��tLB��0���Q�Y�'>
��c��BD����M��z2�	蘄I��|�S���y��)#�m������}���<���d�]"ː��{p��@��ôL|��w���ȰN:g}���&�O@2�.M�s���OQ���B��Df=Bh�];Cdiq� ��y��A_�
���' �x��I|�$���%./���,(���L|�w-�ũ��]&�� /�	L�_v�O�KDCi1�m�h�0��@_��2����J"�[C��"?�t}Y�T�Ѹ���x�e@Qc���͎ukdh#b�S%�p�?�;7��JlN�M������6���56��汍a\�
sld��c52��Z���S��TJ����.p����F�2���-���H�e�ڕcpS�gp%��28��5�X�M�\,�+�T��
+	L�sx�K����p�Fq�!}���3����?	`!^�����?p/NL@y�e]�V[M�_n;>���]�
+��ݴ�|��.�Y��:�4٨��$��4�4|�E���!/��1i`��$iG4�y��Sȍ⠏h2�L�f��4?H��i޴�59�I�;�&�=8�)ⅱ4�)��F�&�i��3��Q�ZvN>�s>� �I�hJ�\voA^I}�ٚ6��i��3�&���S��9�L���$YG4�P�%[��
�S�L,
+Ӥyg4���j�yjP^�M�"4I*�Me��p4�)a_�|2
-L�&[��4�4<�*�����ļM��qDS
�%2�����ˏh2Q1L�fl���t��2�ɧ�c7#4IN�Mm���4��p�ek#k�&��8�	|�Yo��Ҥ�7B����� '
J�+�&p62	�g�%@S\}>4sd��5�sG�G������~�:eA�^o�{��?���Bw�
+@P��,Ae9��m��ͣ���XU�Y�=��@�"�7J�t��/(�I������ѻ�R\@e���� ����.0�V��VtP��V�;́鑙-�L�Z7�l�ѡ��‡�y��gY2(��:�P�y���ׁu�erK��j�gi4c���[�>IR�*���Rݍ�}�hq(
3{�G
��]<�IUU�e���>[��,����4���됖�
+�cò�e�:1f�{��t�g΂j��{��b�����j���H�%PB��A�c~��w�\��X4Q�n�.�0��Ch>᷻��<��l䙠�R.���}~���2�
��YUv3��������Dpc��m
+R+#Ǽ+cE��2�cd��>RN�p���>k�&F�#t����r����R�f����B��O�߀^��*���

�'�
�u45����#��j�e�m�З���yG(l����e�oh�5?�������x���=��xq7��?}(����6<���z�R���z����������)���z����ʯ'�ͯW�l~�yKѰ,�^�]����‘�+dH��yZĩa�!��62��R��L���G��`�@e9���|վM���eF��r\�ۣ
]:J�WP��
+���ǃ�GIU'�d8j�7��*�p.��'��Y����(ޏ�e@�]\��AB�� `���b6�qk��S���f@_�B�b5_q��d��I�Q�!�e@�}�Х��zͯĕ���D��#����n�_�JI�:*�נE8�:Jv��h�0Q:D�VД�r��m�;Ym�:�L
7l�ٜ	T�L��@�����>n�nHp��0t�(�^A��Tf�=��v�G�F�3x��Sc�*�-�Q�r	]|��R%�Q\��L�,$�+hx�s��� ��s�2a��}�?7�se�*�tԨ\�CA�.��(ݐ�2��wc��QB���P�_c��A�q��j̜4����˳@�Lh:j��7��_k&UGɆ�
�N$C������5��x��<�W�tG{����nZ���M)��)(�Q:J�������2T�(�]A��tn�d`�YǬɠ��s�{�������}�-
+���
).ڝj�.%�+������ Y|�=���������@����h�n4���^(�Q�Fe �o�P���v5��e�m�i탼rš�2ƙ-�^��d6�Q�QD�
�ϭ����
).ڝ��.%�+(����ǃ����q���7w���m�b�
���f��Q���4T�(�݀��Ã<��
+kjdQV��{E��-BGM-:�
�(3J6��hw��t�Po@"bˊ�2.r�*sK����=�@�k�ʨy$��չ���z:J7$�h���t�Po@us�>�� s"�WTrn��=��OL�
��4h�66P�di�,]2<�B���y)Gq����1:�ڶ��l�@��P@j_Nh9
[�U��;�F����1%J�{���@��qY�x�Yy�.3��� ��e�m�Y&A����͏�ŚY�"[�g�(`�Oy�R�=�=(a�>y�[v�H=��W��(&ނ����_�+M�>~J,�"��y�Y�;��v�����QE2i��^.Ҫ���_�.3����FR�.�wx��9�����X���Ơ
Y��<��i�keʲ%C����c �P�҂�dF1�$�utC���9B��
26���ޢ��\C���?b����
���O���7�G�A��
i����|a�� ��BP������-E�T�AV
�lw�a.��L
7?F+�	h����I�%"��8o�$���J��
�k�`Zp��A.~Rm�F�v,�sl�}��0?�ϑQ��:�2��H���d�d(.Ɋ�S��KG1�����m� �+Q�i�`UYQ#$��:� �S#��܂$5���?�ɨ\�\��R�d^�{f��AB�
�<�n;<H=KDV*\v�$IA��W���)�dT����D0/��
+eX�6\
+����Х��z��7�o� #.�JPaM�Fm��ϸ��`��Ԉ��Sǀ�;9$�g�/�A��$��Z���*L���
i����A�^�����
+�A��A���9S%�9w7*a�C;oT�2�`���(H�L�`�t�n@(E����
f�d�s��;)}��CU�����v�Ac�=(��B�9�Q��9\
+��!�P���t3eh������,�3R֊jBY� .�q��� ͠�u#ͬQ1�DИ�����
+��2If�m'^K�1n��͕e6]d�FbL��B\,D,�����NgG���f�cD!�.ΤT\
+�5�O��AB��w-�]p��}ִ�B�
+�Ҕ�Tꖸ� �S����1DGA�Q܏N���G�𨂮�ˀ$�GԔ�.3���Q�6+�{�͜e6�+l�S<T
+q�1��xQ:l̇6� 7{�<7�`e�jdT
�;\
+�KB+�����v3/,��]p��}�L���fJQ���KG��A.L}��>ܨ:���3
+t,��ɨ(`Lq)HV�ɌJ����D�͊�o3̦�
+�,��R
+���
S5�>YjΘ�oFQ!V�"ieF�����d��їҥ��z3j���-���q��i�@9��Ł��OC	�reB	�'z4�Pl8I��"�Nݷ�����X�k�
n0���O]‹�,��"RG�R�)ds��k��~�&<ُ���Ay�{���OT���h`J�V��hPA(�
+�υ^8$�A[���IE
��I�#2P��c
^�?CS>u�ꩲ-nαg
�lv-������U9Vz�������oN�V�W\!��uyѣV�����5��=j)�O��Z.�Y��=kS0'iG���̕~��U��eR��YK$}���Qs��V�L4���I�ף�L�G
lU�	�'�b�|eK��)�6�PȿW[��j�^m�߫-�{����`i�WUm
s�]��L6Ϊl��A��+��$�b$�覲�Z8!��Zh�kk-���vU�(�ބ�������B��vSk�D��Z	���D{Sk�b�<[k�d��Z�+�@��f��
+���Z$���ZX���G
+��Z��][k� e�(�Rv�t�<��pq]1�绝hmT��q�橪��&��k��Ze�ւę�`��~��-��m2�N�ݽ-�+�Њ�n����j�R�M��r���
�2�E�����	�Zm
UO[m����j�EF��]��m�-���-�:|Vm
�\���B�V����i!	�ᵶ��'��=��������怓jT�<>,d��S���[L�5FU[�W\-Fl��1���-Zm�L�ڂXCΪ-���DA5���H�2��jb�9��m-�p����[ ۏ-� 栳rPZ:�j���W��jd{���uVm
r�ku�::�nb���E�/�$U{�=LbF��o6�p�M�%l�D�7��L6�b�q�0�or�~8�jn�T'���	�TP7W{�=LbF�|8Hih ���"��u���1G���F�.�s�v����b��2~|>��C�a3*|5�EQ#~��@�@P��uTM�A�&���܂����/oG�Y̿*���E�&6$�kPYl�-��.�~�;v����#��z�I��1�%�7:
+*T�����B��@�s�����8�����I�5B���^>�C�ͦiܶ7N�`D#n����4EĨ����B>��h��`��X�Ź
+�h�.2�!�i��Q�!��������ų�hgx�6���?�C2M1�3DЪ=�����q~�d�"bԇ�HP<���Y$��Gx2��8���H�:C���>D�¿�3�:�9������F*��"5ER�F=0��4���b��#}���x��D��չ��\�����.�+��w�>�e1�3D�I����q���p	"�0�4����aj$�/cb��B(��\:�$�4���b��y��
+ T�֜�{�x�����0u����n�P�{:d����1a�
+�a-�wZ��J���"��>C4�ș\9dAR��!�"�CD$�/�?>'�A�cG�i�f01�#Lb�(+������;��y1�� ?��
+9�Wed�@�8�K�{�ND���,�, �W�J:���4�$��0AH�J�]�Ѥ�1/�&�����+VO���CC�����NSL������yӴ�5(9fޣ��)�f1�CL)�� ��[P��p]yL����I�)&A~�	K�B�hc�(^!H��I�)&A~�ij6��1�l���
٨���y��è͍,�f�~�ˬ��
+���f)�#h�
�o�6�^�x�������!�Y�>D�:F�70lG�'��E
-E�����t�`R�g�bGsf��k��U�S�F���I�)&A~�	��`+`mG��Uήi�m�2M1	�CLq �K�to�)��oe����1A� �
+�����sHh)�k*�i��q"�
wHW�<�^"f'B�_����4���bj�
)�K�/B(� �@f	Em��$�ĕ�r@�I�p����	].��4f��Ƅ+N]"-Xﳭ&|���������Æ���%���+ϛs];�LР��~B���녃Q|GB(B	t�a�^��
���7rʨ��'��*.�6"M�旈��5���@a,L��F
�B?�(J�kT�
�����8夂�m��\,��6�%3�U�l�I�*�=K9y���[��l�u.X����~�6��hOk�۔�FGڄ�t��+g������H�1̙͜�ҹ%���l�3��*�P��I�P֜9��rȒ��zd{�jzd#gI鑭�;�P
+KU�y��l�q���%�D�y��5r$}vrT �x
+�&G� �W�֐��\�}>?h��L	����a
+�����|G)��+���W!�A��>��z��>�^�P?��1��i�KRNj��x���_~{2H����_�qA^/R��Y�ǘ������#�8���C�j��m��פ���(��,�c�r~���1|��%��3ri���g�_�E��jL�W*�Af9?�~
ڸ*H��(��~�h���g�_�aQ6�z����Q!V4�?L�_*�%~A
+U�_f��m�*�&�^c@:(jT�?�2
+�݁h�A��D�	�RP�~"U�:8|=�;("���V;�Ő�EF���W�2i�+sf�-��a*R\D"+^Ł.�6v��ef�A%/W�0#q�(S�r�xPI2�k��P�"��Y��A�8��8�<c&>��c�<�o��(C�g(8�:�yX0	�+࿑��(�25��Y�[#;�57(^�3�y�ľ'��+�@xas�w2�4��
+�J�U��C���_RaO��y�t�|�xP[�bf(����;��2 ����>�d[ż#�ǀ�xqE8�5t�d�'B�X��J�M�P�b���)��f�k��wA45�"U�tT��$��ă�]�Jab
7.��:���x�ă�X+\b�3|@��{DUTT<� dt �xPm���qњ*ղ2���J��8u�C(=�ՖU!��:�v���O;�����Ge{yE�ݪ�<j�L��>��PG� D�bU��'����2�+���*���"��t���@�f2�)�j�6(��
��9@nj���i����rt������z��!���a����W�Z>��3_z�:�d��!���m�u{9(3�����:z����@)0,��g�_���zp2\T�*߬�1�� 8��c��n/�.�3&�8�<W���/,Żͺ��Q[���zJ)ӑ����yw����C"�
T�,��̨|�k�a�W��"��i��'U��ը-;����\1�z��=-Y��8;�o�(ق+�Y��6�ٞw�,��8[;��Q�,���7Y�����qִ7e�l��Օ̋Px���Y(k�;XT�qv���x��}d�,�ޟ�'���N5lhb
��R�oB��s��W-4	�Y��"���`��N�u3 ��Z����k[!�<�B�`�]Wj
+<��}�U���#)ġ�o:0�ladW�fq6����(�Ǎ/��]}�'
��Đ[!��d�5Ih0پ��3ׄ�[wMp��&�8m�	yM�5�e�&�e�\��a�3�$�5ׄZ��{2�2��'���{���ޓ:��{�q�{
2��',��5���M��1�d�˸f�I��EsO��Qw�D:x�{Rަo�I*�:1n�L��񩛄!�����<��KI]}d)q#�����m&C��Zg�ϓvo�NC;[�Iko?9b�F4C(g�"�(?�Z[�emy��n3���fnq'���s�&V����������"wP`���u7<��h��l�I�P��m�Ŝ�6�q#1!u\��6$�i�
�/;DC��F�A��BF@�3�
������-��QP��m���
+��~�En�@���	�F�AY�G�[����f�5��՗�6�qy=!up�ݐ��=���~�7o�6���V*�&{������S�a/ϙ������N&5J�ِ���?9�T���yl�6��V��ʞ}�
����;G�������LH�dݐ��=�߹��Ž�wa'���+��=Ci��w�kնL4�aV�ڃL'���g�J��'��+C8�� ��>��ڨ����.����r��
+B*���A�s�l����Œm�$���ͪ���R��яj��

+��������w��V�B�+�~�d��4h
+�5l�Ʈ�挆�(Ż�1qr���!x\��T��]����z[`w�7$�AS��6F�/��>��-���*%��2nTk�6����V��BI��@���� &*,�J���׸��ʃ�V�Dn16I��agF3�f�Yu�ղ��L7���-����ۮ�j�a/�eǹX���`�L`5�qj����6=�
+����ѦP����ګF�����E��tT���j���������0����])�!+��1�Q��a]\Œ��:��9�{�l.d]�&
7�
+,�������N3b��\���l$O��tHA�scf����.�E��#`��s�;c����e�,X\����� �+`��j�I���C1���.���KO���ť8��Ҩ_��P�u���B-;���صS�ڈ���:��Dž^�^��*�k���p;]>�<��_�t?�ysqF��s��h!3�E��lS֖��4��.,.O��`L1T.�R�S9�̸�#*�i�]�Q%p�W
el�el�=sX��O5]C��A_=	ܠ�eI�����9*�`�g�6wSqrH}��˨����	r�e����Yk���ҧ�c�F7
+�:\�� iLY��)t��IA_��e�^�Ck�Ҩv�Lt�7��gF�K[Sj8�x��E�).8�S�s}�.@0��>��g��ō�iT���Upe�P�A��&���F_�"�m5�T"���(*Fqy�b�8��!%�h��U9��X�����O�*G�|o'���%�k��1��s-oc.JrD��H��C��/����]΄a+<<�u�k&]�1���
7mP4&��*��=��S��(��,�\�F]�ͣ�tDBq�2~�
�(�[3}�� �@��>t�dP��R�b�ŧ��sV�����uS�F����MP<��X
F����{"e�_�Dᗣ�y+�����x?q$:���I�x����0ni&�R$Բ͵mT��dA��~���b�/؃���F�JIN"��
+��R'*0$s8����(��+��L.R�?]t�������WPT��x4#�:�`sIߘV]`c�-�̣ &�j����06�f#�J\����Mg�.�6*�Ϡ�6�b�"UBo�R&�kG7Vs����*\_AS�F�tNP> �"έ��B0�Q���F�AX���$���΃��7��LNf��h 3�F��8=�k4�Q��#?*��%� 0�p�ց�S��8r�ق�-�`,�
+�'S��m)3a�z
�����N���������F؊j�� ��	��Ny�gL�ω��N�K)� �.Z���~6M���D���]�MH��g`��nFE�!���  2Qo��T�8J#5��c�%�
+��(sP8���X���~����]����6�[W+���̄�{Goh[�kP���*�DY�2
+�TB��V־n�r`!Z(�Iq=��I�Mt��Q	��
�����PL��yV�HTX�@.D��`�mHG���Bͪ��	�`)��a�4�0"�&0�a�3*ѯ��6��T3� i	�[��E��A�R˘�ܨ��~"��k$r
[�jr������P��j����{Zpm���b�K�
�0��A_6��N�p;j��c�W1r�D�A�������C�4�ǃ%nU�1�@b�pm���u[�1Ζ�\?4o^�6���<�З���َ��b�1W!�����B�F:�X!�ݰ3�չ#��ک��^��>�`�Q�YP��
K�h����9�[F����y�2����b�W�Yhĝ|AH�BelqZ.�(���ڈ�����y��t*���/��1�p�����f��ְ.�Ԭq]��*�"&ڋ�Lq����:�5�6��G6�-�%��aЗ���U�,*$!�
+ฉ�6�c�K���
c{�Pj��
?��X��������P�
+|��x@�/{�0ĭ�9k}DdT	j���~
+�)ר@���ul��뙞-��a�
Eq,����A�q]	�^(��`����]� �#]:�`������)=w�8�(��Xtס��WX�5n�Qʲ�ڨ��mJ>�����B��-�
+H� ���O���+�y��%p�B_#���Տ�H�k�������
+��@	]_r��ؐf�0�Ŏ*�+�N�N��@%����(�-����A1�u��*>�F��m����Xek�����L����\GA^�/h'��Ȑ`2(�LgK���P��g�'����Rf��x\;���)0$xaב�B�"xk��A�nP���v���_�x]�-���w���<S�[����2�����<��w^���p��w�%��) �<?�Ka�`�ZQGA������;�����
+���P���'00��.�\u���]XL�.=g~]?⊕�?���)G�?'�t|}��93\�5�����������1I�/p���?�4W�~�
+I��c~J�d8>���O����o���{M���'~L��L���H����[��͓J��W���e�^�7��/��S���0
,�S+��B�������0�T����,���#�e^���_���O��~�BĄq�)�4Ec�X`Z�et,��P��9�w�	�g}mX0
+���8c���b7�׷���Xf�V����v���o�z�E���kug�:*a��?���������w�������K�Ք��nuH�:l�>%���%����L}�bFⳬ������.��Q��]�k�.xZ�w����������������yB�7yz�*Ύ���Ck�l�?�eEa3�K!��k4�
wR��Q:a��p���  ��7�;��Y��.'$@�L��������|��Vղ��?���NȞ��2�.���w{�b.��dJ�%�W�_-0�$w�b/8x���<�;_?�&9�e9#�����~�nO����@�\����!�&:���
����������͓�����E�plm���
f}P��j�����d������;m97�7����І=A���B�`_;w�[	��#�[ɠ�[	.�1�P������j��
+y�^IJ��-H�7e\����
����VoV�o2'����]Spզ��}g�kqR�1���?�/��1��j�$��I��-]y,�\R
����P�V�?
+
+��0��+�
+*���GK(�ݳ��Ɋ�R\��A�b��(3�I� �
a�6��?���69�G{) �'��a��})���\���x(*�:��e��C�*�4Ӈ�!�P@D�ղy)�|�
��9�����W�Cj3����u�.���(����2��bT�J�mD<� b���:�P��g+��x�y���>���̝ߵ������(V�B��z|8*Dוj���
q�aEk�,��,c�LQ�}U�Ϋvt���(�Vx��������qU�/�p�x	���� ���@�&��Y�������(�o R�U�\�A�B=�ЭH!/[���Fg��–E�2H��jK��h���1�k��TW���s�6	�y�Ke������f2*�ۍ�vP����F�}��	�k�������?�����>��#@��<��:�PN$��
1/d�����ˏ�����
NcJ�| |�Ϟ2(����_������g��Z	ts;��5�p@By����_��%����~��
��y�endstream
 endobj
 6 0 obj
-56118
+55376
 endobj
 4 0 obj
-<</Type/Page/MediaBox [0 0 1168 944]
-/Parent 3 0 R
+<</Type/Page/MediaBox [0 0 612 792]
+/Rotate 0/Parent 3 0 R
 /Resources<</ProcSet[/PDF /Text]
-/ExtGState 12 0 R
-/Font 13 0 R
+/ExtGState 10 0 R
+/Font 11 0 R
 >>
 /Contents 5 0 R
 >>
@@ -286,107 +276,46 @@
 endobj
 1 0 obj
 <</Type /Catalog /Pages 3 0 R
-/Metadata 17 0 R
+/Metadata 13 0 R
 >>
 endobj
 7 0 obj
 <</Type/ExtGState
 /OPM 1>>endobj
-12 0 obj
+10 0 obj
 <</R7
 7 0 R>>
 endobj
-13 0 obj
-<</R8
-8 0 R/R10
-10 0 R>>
+11 0 obj
+<</R9
+9 0 R/R8
+8 0 R>>
+endobj
+9 0 obj
+<</BaseFont/Times-Roman/Type/Font
+/Subtype/Type1>>
 endobj
 8 0 obj
-<</BaseFont/TNUPAB+Helvetica/FontDescriptor 9 0 R/Type/Font
-/FirstChar 32/LastChar 116/Widths[
-278 0 0 0 0 0 0 0 333 333 0 0 0 584 278 0
-556 556 556 556 556 556 556 556 556 556 0 0 0 584 0 0
-0 667 667 0 0 667 0 778 0 0 0 0 556 0 722 0
-0 0 722 667 611 0 0 944 0 0 0 278 0 278 0 0
-0 556 0 0 556 556 0 0 0 222 0 0 0 833 0 0
-0 0 0 500 278]
-/Encoding 16 0 R/Subtype/Type1>>
+<</BaseFont/Helvetica/Type/Font
+/Encoding 12 0 R/Subtype/Type1>>
 endobj
-16 0 obj
-<</Type/Encoding/BaseEncoding/WinAnsiEncoding/Differences[
+12 0 obj
+<</Type/Encoding/Differences[
 45/minus]>>
 endobj
-10 0 obj
-<</BaseFont/SRDTQI+Times-Roman/FontDescriptor 11 0 R/Type/Font
-/FirstChar 32/LastChar 100/Widths[
-250 0 0 0 0 0 0 0 0 333 0 0 0 0 0 0
-0 500 500 500 500 0 0 0 0 0 0 0 0 0 0 0
-0 0 0 667 0 0 0 0 0 0 0 0 0 889 0 0
-0 0 0 556 0 0 0 0 0 0 0 0 0 0 0 0
-0 444 500 444 500]
-/Encoding/WinAnsiEncoding/Subtype/Type1>>
-endobj
-9 0 obj
-<</Type/FontDescriptor/FontName/TNUPAB+Helvetica/FontBBox[0 -212 929 741]/Flags 4
-/Ascent 741
-/CapHeight 741
-/Descent -212
-/ItalicAngle 0
-/StemV 139
-/MissingWidth 278
-/CharSet(/A/B/E/G/L/N/R/S/T/W/a/bracketleft/bracketright/d/e/eight/equal/five/four/i/m/minus/nine/one/parenleft/parenright/period/s/seven/six/space/t/three/two/zero)/FontFile3 14 0 R>>
-endobj
-14 0 obj
-<</Filter/FlateDecode
-/Subtype/Type1C/Length 2760>>stream
-x�UUTS��1��Hk�+
-�D�
-��WEA��G
-���@�D@@���*��ZѪA������A�S?TE�
L���ժ}g҉]�"�ﭷ�]���=sf�s�>ã,�Q<�*X��V�Sg.؞������$��m� G�z2Y�E����E�7���S|/������
)I�j�㲈h'gg��������Vo��l�"3%)U6�d+�i�*E�z�l>g�T�$ʒ�ғ3e	r�B>�-*A�X'LQ����e��;�<��ܧr/����LYdBj�,T�H�R&d��"EQ��2��	��pEDJ�RU�����tٌ�>~�S���pus��	�5�ZJ9R˨y�T*��FR�T�EyS��LJL}@��(ʖ�Q��1�%�,���K͡ޣFR"j"�N����<*y�ac������'��X�Z�Y�`��;���&�Bh%�$�"<͸2��z捥������3˯-�VVP�,lL�P1�j����S!�}H��i�I% �4)z��N�C��ֲ$�k������DF�0�m�o:F����.�����4�kȐ��Z����ӗ��PcN��G���C�h#��BЉ����9�B�H�Y�>'#7u{4gL��r���ɭG3�����P�'��Y���+3�f�6�D�FW\h.�[1������u����hq���
-k�6ϣm�Nu;vi����3=�`6�U��dw��o��9���js�\��cbc��[�(:�-�rp���+OzѼ�!F��~��?��t����R���1ϖ7߭H]Z(�1Q�`���D�P�|t�b�)�,��94�<���>^�J��!U�������S5���zp$�d6�@��q3�
"�Q�8�1�wTvܗ�L\�m�\݊�4��v��m+~	{q1�
g����etT��FS�e��E�u��M�I�t_��c�
nT��b�vQ������:��]_������1)���	;74K�,�L�T�+����RuB���5i1�,!J��[��X�m�bݖ�e
-bĹ.w�y����u��|�W�2/�BE���2d�(m��5g�LY�)�>DQ�x����Hj�xOY�aC:�P#��Jc+����s�JÕ����A�ڥ�8Ts4�czh��o�o��M�f�R:�1�l��c=��&
zƒ�R�������L`��l�	�q���d$�d���.�
��]O�6�5�ش@�{d��d���4i�HlLz�2`�G�
�7ﰴCp3x���`�Y���&�[XԹ�b^u���
N�IS���|�d<L��f���3hu`\R0�B+K����~2��)lf�\o�A��)�{ڕ�k\Ԥ�hs߬
N��¶st�Lt�懠�_��ƀ��N.�~l�@>X�V����Jw�K�v �G$���Hc���,N�'���|�]��3��rG�
dg����������[3��ݴIe1cB�)R��/�����Fxn��C;6��l>88u_.^/G2ڣ6�Y�.��~ͬYa��ىʬԜ[#_��HrM��ON���V\"�>�'	�H��kj+��o�&�y��8��n��ݳt]�U���uρ��R �����������2ٳ�Mg�����9�m\$kZE-�sz }��p���=�>�r���iE����gz�B�pp��	[�����8V���P��@Z�~e(�&��k�ILy� �k�4�3��Y�O0�&ӹ�8n�@�"���A��|�����v�����z�lI��J���G�~�R+���+	U	Uч��;
-^'_����k>c�w_��������5"��F��ȵ�C��Ӣ��U�ۈ��R�<��v���ۊ����te�`�>~��Ҩi�q_�rm.bߚC�*�Z��V7�7=��'�O?!��s���v`3�����~�y��@��S��QM���+��֮�(f�J�I�����w.���A���0�%s0�M��*DH�#�Bh�`I
�$���4=��Ғn�a���(�(A�Sݏ���������0�9q՝���K���?�쁲�����5L
��326&q�j��bp�?����.~��냳���9lf�=B!?�H���B�Ed��5�U��\��� ���F"X������g/�-tV~ ��:�7�۸��cQ�,���'�7�R�;�K
~��]��||h0�T/,���H��f�7�r� � ��x�
2�����~��^S�=�d[ϕV���DDFz���Ҥ+%�W�䉋��Ȩ�� ��~`%�
ԑxݧ�!|�>��06��?����smRRo!~e�9sƢHw�E׺�o\5H�Ώ�­v^U�`�a:{�0��BZt�ꧦ��4z,��%4ɯ���q:��2�H��~W��n]��|��<	��U՛���eu���y��yO�������.�.���«ǹ|\����Kh1���Ǧ
���[��;�؆�D��h"!/�K�
-�	�����g�`3�6��w��O�a�
��g0��o$���m��<B!d2�2Kiq����(�K�<	��I�S��/�3!|����a!��C�����W�Mx ��p�!�/>��۪���k��5"_����k����P�χ2�Ѣ�5�+��.��m�D.0Eb���_�~���_\�?����$��X1��5�9DAT�ӧ��C���t���B�)f�PIx9yd�F&Th�.��ӄ��Z����/��{��AQ���׷
-endstream
-endobj
-11 0 obj
-<</Type/FontDescriptor/FontName/SRDTQI+Times-Roman/FontBBox[0 -161 863 683]/Flags 131104
-/Ascent 683
-/CapHeight 676
-/Descent -161
-/ItalicAngle 0
-/StemV 129
-/MissingWidth 500
-/XHeight 460
-/CharSet(/C/M/S/a/b/c/d/four/one/parenright/space/three/two)/FontFile3 15 0 R>>
-endobj
-15 0 obj
-<</Filter/FlateDecode
-/Subtype/Type1C/Length 1578>>stream
-x�eS[TS�=����Z���\�h����mA�Z�H��J�)�b�"	�@ȃH��,i� �(	/QDEm�������U��;j[��������я����k�1�\c�'� I20M�Q�Dȴy���E&�d0)`W�~���.$�TR��\�K�'���sq�3E�e���Z]y�JYP*Y��,c�/��WeELL�$��OD��(Q)�$��_
-�V�Q��J���j�*O�T��
-J$�;;g���jE�d�J������e��QQ+"���d�&W_"�C�$Y#�Jd
-�^-/�;BDP�<7o�έ+_Z%Y�� ��x"��$�U���G	��C|�1�0��2r" .`��Ny8�#����a��}˭^扇<��#�t��޻��v��gi�j�tn��VoIKܢ�6"�W$�d����
s��3W���	oh�!T
-[�;������~�
~
-?wqܐ�
�i]��I��(�Ą�_���ޙ/a��#4Ym5@�խ^1Πa�樥G?�Õ(b}���m���tw9j�k���j�Ј��<c}Eo��i6r��j�Bo��`�-��\�w�_	Z2�;�a'����!?�.�+u��`+�j�@��4\�A^��}��ӟ��������	k��]ն�Т*��n8��F@�&�\<�N��ﺍC���]�Cxr�2�(J����8��R�I1�t��f��%{�(f�f'*Kd���nc����;�-{���NmGy'��ru_H]���Q�+��Ѿk��[��������/#�oA��q\$&�L�c��2�p&��h[��T����
��V�DL
-
�--���ͦ��3u����Ye��kZl�
�<O�kY���9��~�a�G�	��cf��ʛ5hڙ9GȾil�GᇕB>�m��k��>@ʪ�3b�*]S�m*�L2��i�p:�T�+f�hŀ�9KG�\v;�U8�{�8��$��m�{ʍŕE���n㹘;v�ƹ�m�b>s�:�w3��<9����0[}�Boo�=&����D�����°�c�UT�.�C�z�bN�5�xn�����%hS��
+��1?ST��g�]<��u�Pk[X3���U�g�y�<a���֓��>gC&ŋ.ɽ�1:��Ч#�)O����nOA����
��:����-^(��ϗU�߁P�����o��
7CyejqZ�>/_T���:kB<?
L�wQ�&n{䚕bv#�ʵ1��~V� ��'���-ŵ��	��
-/C������2؈��6��{�E�S��'��P��˩[��GţÇ/��y�蘱��P�	�O������;I�g�
-�"�β[�f�ސ������#9R�EY\,�h���Kf�
n~��s㑛�N�<`��,|�I��_̤r��	6�<�±�y즫B�����\>~���}K�$Ξ���D�����O�����_?x^�×��ݕ1`3�ܖ�y�gS�:��Ѻd�T��O�CCs�u�O����׿|vS�J�ov8�:�w��d)Ϧ`WU��n�[��k�m��0���yH�n&ݍ�ܼ�9���w��"��
���
-endstream
-endobj
-17 0 obj
+13 0 obj
 <</Type/Metadata
-/Subtype/XML/Length 1337>>stream
+/Subtype/XML/Length 1365>>stream
 <?xpacket begin='' id='W5M0MpCehiHzreSzNTczkc9d'?>
 <?adobe-xap-filters esc="CRLF"?>
 <x:xmpmeta xmlns:x='adobe:ns:meta/' x:xmptk='XMP toolkit 2.9.1-13, framework 1.6'>
 <rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:iX='http://ns.adobe.com/iX/1.0/'>
-<rdf:Description rdf:about='d96dc2a8-d8ec-11ec-0000-53720f285e69' xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 8.71'/>
-<rdf:Description rdf:about='d96dc2a8-d8ec-11ec-0000-53720f285e69' xmlns:xmp='http://ns.adobe.com/xap/1.0/'><xmp:ModifyDate>2012-05-18T12:00:30+02:00</xmp:ModifyDate>
-<xmp:CreateDate>2012-05-18T12:00:30+02:00</xmp:CreateDate>
-<xmp:CreatorTool>fig2dev Version 3.2 Patchlevel 5a</xmp:CreatorTool></rdf:Description>
-<rdf:Description rdf:about='d96dc2a8-d8ec-11ec-0000-53720f285e69' xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='d96dc2a8-d8ec-11ec-0000-53720f285e69'/>
-<rdf:Description rdf:about='d96dc2a8-d8ec-11ec-0000-53720f285e69' xmlns:dc='http://purl.org/dc/elements/1.1/' dc:format='application/pdf'><dc:title><rdf:Alt><rdf:li xml:lang='x-default'>MCS_1_4.fig</rdf:li></rdf:Alt></dc:title></rdf:Description>
+<rdf:Description rdf:about='uuid:8eb0f84f-e0fd-11ed-0000-ead738332b4d' xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 9.05'/>
+<rdf:Description rdf:about='uuid:8eb0f84f-e0fd-11ed-0000-ead738332b4d' xmlns:xmp='http://ns.adobe.com/xap/1.0/'><xmp:ModifyDate>2013-04-19T13:05:13+02:00</xmp:ModifyDate>
+<xmp:CreateDate>2013-04-19T13:05:13+02:00</xmp:CreateDate>
+<xmp:CreatorTool>fig2dev Version 3.2 Patchlevel 5d</xmp:CreatorTool></rdf:Description>
+<rdf:Description rdf:about='uuid:8eb0f84f-e0fd-11ed-0000-ead738332b4d' xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='uuid:8eb0f84f-e0fd-11ed-0000-ead738332b4d'/>
+<rdf:Description rdf:about='uuid:8eb0f84f-e0fd-11ed-0000-ead738332b4d' xmlns:dc='http://purl.org/dc/elements/1.1/' dc:format='application/pdf'><dc:title><rdf:Alt><rdf:li xml:lang='x-default'>blerMcs1_4.fig</rdf:li></rdf:Alt></dc:title></rdf:Description>
 </rdf:RDF>
 </x:xmpmeta>
                                                                         
@@ -395,35 +324,31 @@
 endstream
 endobj
 2 0 obj
-<</Producer(GPL Ghostscript 8.71)
-/CreationDate(D:20120518120030+02'00')
-/ModDate(D:20120518120030+02'00')
-/Title(MCS_1_4.fig)
-/Creator(fig2dev Version 3.2 Patchlevel 5a)>>endobj
+<</Producer(GPL Ghostscript 9.05)
+/CreationDate(D:20130419130513+02'00')
+/ModDate(D:20130419130513+02'00')
+/Title(blerMcs1_4.fig)
+/Creator(fig2dev Version 3.2 Patchlevel 5d)>>endobj
 xref
-0 18
+0 14
 0000000000 65535 f 
-0000056435 00000 n 
-0000063976 00000 n 
-0000056376 00000 n 
-0000056224 00000 n 
+0000055701 00000 n 
+0000057522 00000 n 
+0000055642 00000 n 
+0000055482 00000 n 
 0000000015 00000 n 
-0000056203 00000 n 
-0000056500 00000 n 
-0000056612 00000 n 
-0000057404 00000 n 
-0000057083 00000 n 
-0000060616 00000 n 
-0000056541 00000 n 
-0000056571 00000 n 
-0000057771 00000 n 
-0000060899 00000 n 
-0000056996 00000 n 
-0000062562 00000 n 
+0000055461 00000 n 
+0000055766 00000 n 
+0000055942 00000 n 
+0000055876 00000 n 
+0000055807 00000 n 
+0000055837 00000 n 
+0000056022 00000 n 
+0000056080 00000 n 
 trailer
-<< /Size 18 /Root 1 0 R /Info 2 0 R
-/ID [<B13DB1220C68F04FDD754A7CC3EE758A><B13DB1220C68F04FDD754A7CC3EE758A>]
+<< /Size 14 /Root 1 0 R /Info 2 0 R
+/ID [<958B8046062D7A95DDA040CF121968B5><958B8046062D7A95DDA040CF121968B5>]
 >>
 startxref
-64163
+57712
 %%EOF
diff -Naur ns-3.17/src/lte/doc/source/figures/MCS_1_4.png ns-3.18/src/lte/doc/source/figures/MCS_1_4.png
--- ns-3.17/src/lte/doc/source/figures/MCS_1_4.png	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/lte/doc/source/figures/MCS_1_4.png	2013-10-26 07:07:30.119364395 -0700
@@ -1,254 +1,337 @@
 �PNG
 
-
IHDR�/�7	pHYsMM
�έNtEXtSoftwareGPL Ghostscript 8.71?h4 IDATx��钮(@q��+;?즑Ͱ=�n�|�,����y���j
���� 	f3@�f�$��I0�
�`6$�lH���� 	f3@�f�$��I0�
�`6$�lH���� 	f3@�f�$��I0�
�`6$�lH�9��8�q<xL�%,�"i����0�^9vLJ�cǤt���b6Za`���F��2j��Q!@�DRH�*@��
`�5ݏ�6�,��iI�))�Q�WG�.��x��|���q�-u�(hQ�����3<v�
-GءyL��1�Z������������7��tRQ<?~&)9=�¤:���N��8��<C˹$����	�(�D[g<�������wXJ�tt��6]�(��Q�Q]
-�ە�
#��u��
�y���?�l��.���gS����
�@��
.�`a�v���h�����
�$XǤ��t&5?�Ҥ��3�؆D_�r^n6�§�A��SP�Щ
�$e���
`-{��V�g1�}���O��T��_�bR
-�~�v*�&���
`4�mv�D]��I_˄���4�G2
-������+�F����i�����T�`_��N���-H!Q��
-�/QûFw@�V0��������7��G����ݙ���;k!z5
�@�����ʹ�Ѕk����L9����]����$�r	��~�3�⬐O݉�����4*o�� �*v~��l<I`	�~���-�� �{F��C�܋�āWa�J\{�:���6���@��jT������%�����NZ�X�[���ޢ��'@A�*���I;?����d��fW
G��u-ߴ=�G��Ec�����(���E���QA�����T>�Τ�縻�>�>i���
�kx�hs�f����mγu��qad�������r�?�2�W�>�����R�����6w�,�R�KYtUQ�)�z�Z=��?�mu��R]E���U�j�$��w�N���`���F���;��e���
-~R�5!��L&��H��/��ve!�%y�:�FH�1��+��l����ɉ� 뙎z]_l&@�n{�q>Na�&V��r��W���lO����,�79v�&�xTa�`��lI*֘�׌�/I�^�+�n&�VN�I�m�
����O�6_���tz?�^��w>�c�B
�+y
2?2���?%�2����S
����d�E��D��QE�!�R��$XQ� /C4bJx��El�G՜J'��%��:�[&�t�~�҇
�O��F�*2��"��0J*�	�ny
2w3�/L�,���>PJsWT�0�LS!�w@�H��e
�M<���֣�m�)MW�T^�G�=�慌��-�wOD�}|�T"M�AYG9���ݲ����؝]G�[P>7@�x�V��ic�|O�H\�gv�B<7A�4�֑�V™�P9�g��/!S����ބ�h����[����<�Q��_+¯b_���I��lZ�)o/
��ė����:VY�o��3�
`#2M��1����m�o��S���o��5h:�_���a�q���&n�(���(�
x���D�Lދ������x��[�"T[�E�T�.�Ni�oF�}�Mh'U����V{
-�1�"j]_�2��om�8<
>��8^R��&^�BKov�x�[��B�x�`���]G�[�wnd�L�Hͧ�I�^8�`44ԟ�Wv�rT�u���G}��]4��������GG��}m�b���%���vb��
-.:�k(W^�û�X�
-�fu蟽����5W�y�A4���]��7}Ū@B���g�S�P3j�p��:y�y�%߂�j#��fu蟷�	S���s�#3S�ʓ�������K��~Vj%��5Myv�l���oI��6�����C�fnoT�4�_k��vЈ�$NX�oA��pW�"c�1ȏ@/h	@p�y�qm��6����0;a�\ؔ�6�E�Z	f��d��y�g�Y�>�`�6D(��]��i��j�q��
4�?T�1��RM�q��c�0�����ܰ�ye��b��]��,��M�^Q�H�L����[j�,^iQ��X�;���C^�,��W.��^/"|�;j�"$)�J<�Y)/�B��=�:OsG�Y�ڄ1�c��?e(�xG�M���SŲ]���J�y%��S8��k�KŪ������Y-��X��v���2�t���P
�g��C#r�����[��w<�购:�~p4,e�F����	hE�Lq�</�9�@$t*���<�����4�aMjmדS;ϣў��F>:I@�С掚L�:��<*�� �k���?�������2������`%�5�?�Q���Gb�0t*lʣ��S8:�lx=�ܣ��&��<������fu�_+�)	�SrU�&%�[Q���%<"r/���J8�lǾ�վ��N�g���s�2"X7unst�w��vE�3Z�SmV��������]��b?'-��ҩ��~<��S����PH�X
�g��C/�:7&_�
��4�LR����P�;�%���3� �Ή�:~�P$���ZōnZz�%�Lؑ��oju�%:_,��3����F,�T\��*̍��fjE�8��ŌX~��Xz+5\��!�</�)�E�����B�,����:�2�k����-�W�Q���]w��vQJ�WD٥(:FI�2��z�r=*�4;6�Qz�T���o��·�{�>�g��h�\ٺ�Ґ�InYbr������]]|�z��G�9��x
-��Ǐ��;j�K�7��*5󁚃x}S�]��:���C��z��$�˥ p�I��
�Ze-\Y-I��fB%lG���Ńql���~_�MZ�G�V���@QR�Fo *j~��p�sj���]'��� �>:ڬ�5		s���^�v��N�"�I�N�|�y�58
-����`;������
-����m]&���R�j��=�ӟDZ����>�j������f����"cm�i���U�)��
o?k��
�9s���+ݚ+CE"]F�Cӷ�$����Ѝ�ޛβ��ZJi8����,ԗ�`(T�ߌL/�2]���F��{�����	��<�
�����l胧N�t�IjEOE�Oj��D�0�c��1M�Si�"b�u��uF�����E>M/��ιeWxE����OsH�
3�#�/�Y���CBK�ݼ�����u�w���G��ZΓ=�T�v�K��~V�Jn�w9�n�Q�Y�È7�,��:�j�R:���
ح#q�ޓf"奜o�yha׭�Z�w7PH��Ft�舱����@g&r���V5G�v+\�}�Pf�V۪�ن@C�Yx�БG�Sُ�<�XZU+�i4@�S��Z��],./n�@�}yF�
�Ѩo���p���s:*F8M8���q�mmd��~��if�P����=M�-��UZ����ʩ�1���I3�g(^��Ny�A��=��څɘ��MC�Q��n45�=|�����q\�ܵ
���;��M��EF7��腌��8�s�h���Za�����Ù��?�co�գ���EϷF�"��u���jOa�xC��x�Wn)�T���)$�<��+�<#�>�Nf�&��;b����Ϗ���[�����Sꕋg�0��������\��n�̜�Ts�<^��mݸ�@%lG���Ńql���~_ɍX�GeE���z� �R4�1�
#�[A}��
$}�-���N����͚�_����ɞ��:.K���`38t?�B�+AB���g���F,��Ǧ	[J~��yE����s��b�.&�9���:}��Z���\�Q��wW��M��s�_�H�У
�c}���Pͯ�
-�()�G۵��I�ȅ�pعt�]��P
��3��ѻ�D�)����E�D�t�~*r�7���s;4�S�Z�H�S��?R;q:���.*�����n0�
����	�%�
-�K�Y�C������A�d+�_y�hjٔ)�5�$u���<�!�Xb����`6�C�sHXGtXX�i�;��OU���D�<���|�.H�A������4���jm�_����wo�8��S�����ӳGX�6M���uZ�lV��U�H�ѿ"ܙ�83��(r������r��&G�hK�T�v�K��~V�Jn�	��2V�����vN啱��[������_�E��R0�
��0�9��Jh?gԶ�tj�"�ǐ�5(���X�7��h�2^���=.
-K%�8�.�z��:\`���H-Q�E��-��M�vU:s�6�dB�u_7b�o�sۜ��o��a�]�l�A�th�GV>K\�.+�CWL��h�j�3�z`�
g��9_y���V��>{��c���h"6���oܢ��E`6�C����B2�<�!{�\%��(��a稲,��e�g%�0�~	
�c��j_�M��폞�gD�����^��	/��C�DC��^\S~_|jM~)rFn�
-�m3���i�n�$-v�4ԟ�W�	����q�"vGn��Ί�k;��n�U�i*�h`>�/�o#�����8.'��jʸ�R��B�B2џS�4��S��D}��}Ͽ�fM.DyA�>�g��hSU�2����04q�+M�TǙ��J<?f[�gmH��zt��|.a�[�V��u5~6����x����w5�[8�ur�Z���z!�-�..�������L!D�7�闡��,�z��\]�u�����Ǟ�/��Y�u�cQix�<��}���6C[;��sv�(
-P]�	�p�tF������0�.j��X�Nxj<��&�I��2�wL���;[�/����Khgfmy�)��J�����?G�{�Hs!|��[7YC�o����X��y������b����l�C��)�w��:J�¾s@'���3�Z&Z����YO��������IY]҇7AC�Yx�0�m{�9¤�}N��A��ùܙ���t2F��+yv��6�641aX�Ef�UQ"��Z.rO�5�%�g/}\��}]�ԑW}�e�zy5�����u�,
���p�u*�<��(�J�_���q[Et�ф�Ţ��)'�o���۩��Ϲd����	f3��
-�A�j�f�;�I���j�lp�J���^g*!�E�X�*�qo��+5�ܞn���W���oݑ�Z�}�lV_B;���qr�8E:���0���I�|��nizV^	
^Ü���#;D��Y�=G�=:&����]�������i��훔Dw�K*��$��v#�h�?��q�4�}E�̅.�J6�'^�ף]�n;�I�a`Z��ٷ�g�`8¥P�t*����ۥ̙�_#o3{�n�1@o����[jNY��%����A���d7
-ϩ�K��̧9F�
׌
�s-��U���[]N�x����Ķ%C��r0����6�Kx!_)d�G��(rH�0ޜ�8�ڣ�y��
-�ѕ�
�wټi� 蠵͍�x|�k�z4�Z=��0�i�W����]��Q�~_0�
z2j�5��63e�Z'z�T��9��rPi�=O*���8����T�I{�<�s��c��nD�Lv]��¾+�a�6��#��-����B)}�L��A�̖-�f�~4ԟ�W3�g���؛J����̆�#�$�A�ۤ5敂�b;�m�m�L����X�(�6��\ѽ���x�3�y�����2�L�Nr��C�u_u���N������q\S(݉����-�%%�0J�Kt���u���Dw�������/r��	D)�r8�0�x5���I����O�x&�8��S��ڟݘxF^^u��զ��bI%�/~{�,f[v%o��=7@�x	ED.Jx,=�1V��ߡ�氣��«)�..L�/�+��P���W��ԙ�f�P��*�9�x[g�׵0=�Œ7���n�e�����f�lZ�T���n}��Ó�{
vy���Y�+!�Ghio{�3j�nt^����wH�|���m�0�����O�2=��Spc;�a���XJk������L�nZF�{��Ÿuovk���`�k�rwKiW��Md
-����a�,pv��e��W���B�>x=���iԻe�Sz�'n�ג�2
`&�~�#������f*�k�����+�q`6�C�sHX�dS�0�u�F�Ό�UH�S�iT����k��G�ym-P[	
^Ƹ�vD�)
{]1s;s$U{^a'���z�v�6���Z���jzk���Y,WhG[�6nEZ��n[��*�Z�������m���jo�4��f�����'�g$�v��o��h
���� e���1���y��=?q��/�X��T�����|;��C^��[��.Z*�i��.=��p�8�\T\^�{�[�/�V�N�S������q���OX�X�
-�OW‹��S&N�:�
����Z���n��0h ��,G�CmC������n�[�uy9��??������1$��>�>��-I3U;n���\n�.`6�C�*$l'�0\x#Y�����㈏ٖ����zH{K�1��]�*�_	
,[7Y{	�8-�;
�|�E�
򖳒׵W���Z�}�lV���
-HX�7?Y��]���]qj�4���+ٺɪ>sJ�f&������佀3��T^[�yXf3�l�-x��%���pnwEW��2G��S��3�]��Y�(�s�f;�۬t��K�lP�����y��*)I��1Jc�S��#o'2���z�f3�$R�ۛ�+��1b�V.��==k���)�u�8��p.��a�=ܑ4c��"0�ա�?ꧮ2��Q�����O�N���J�_B������WrS+��}�=��;�]����J~�����ع�������fu�_���B�˖��w�v�_K[z���<�A�s�1ΙWl6b9ODI%̠_B������WrS+�0ҥ;�r(њ3�3�z�D�6�+է
-���aon���f3�:�4����M/�ӡ;.s���{���ޡ;
��v��翮�{�8O�s��M=)=
����׶�F��y<�
-1��m�?�i���.�ω��
�	O�|�7���n7/�`*R��N҂����j��.�:�&a6dhY7di\-�JU
�X�[�f��)��`�-@�fu�_叄�������
�y_�HA���`��Y%�/!�v��Y�+�i^�@��MJ�U/�Z�2�}.P�l꺼���l�?�}�lV��U�HX���=�xE��X�=��Z�k��%���V�_�K��~V�Jn�	��y*J�~���)Y��ߞ���r�y�/`�v_>j6�q�i�������M�Q���(����J����b�uaճ8ID}�E��;&�;�ׄG��LQۣV����D�b뀼mi���4'�x�)�����R�oj�N�T����,g��3���~S�V(�w;��+��O
k8��i-� X�~�0���<q+��M�"�=P
�g���|2�!�������"�ߑ�Zr�R�'��}���6LbV�0�yn������,ɷ���y�խ�����)u �d�a��3���G0�ա�V`���CFx$C*V��F�`{�Ɵ4��أʬ{ũHጀ��UX	=�K��~V�Jn:	�j�mT���)��s�h�ƒ����s�#���:���?�}�u���}���Dg ��_����3=��H$��E{�W� 6���2ކ(4k���,�zX�\G�K!���Ϣ��ՙ�Y񃲎N�Ϭ�������3�0���A��jiRIgs�C�[�A3����^Fxr
>�������cj��������>x�������lPM�<m��a�d������Nl�q�4�@7صW��3-�V�R�Hٷ�2;igd�W�������4�<�=���є�G�����+�r��_fl��	
��y����0��٬������{�?P��
�T
�-W����M�l�],���� IDATd�5s��<��J�_B������Wr3F��I����-��sX˧Iw,�pg��k�+K^[������]�[�{t�w�c�>?�������cc�L��{�h���n���
�g���Zz);7����t��jlet���i�$Qh��ٷ�g�`0A��6�E�t����SS׺7}¥G���&h�ׁ���_�ݜ���_��H���&���tr�d�qY�M	�q����1;�j1�i���Zm��;�/��0�󲺍.݈[�lf��F�V��:f�ǽ>�#���q��A�
-|�fu�_叄]Ȝ��aΓ	p���3��+�_	�K��~V�Jnz�xHa_�_�����Z�x���uFx�����`6�C�*y$�&�c�L�mlE
vo�OsX�Bl�Y�+� !�����Wr3E�qs���KT��Ή�J~��������[����0�%�IcP�}���V�FK��7���M��^�3�:�x�N-���x�.e�
�f��<N@*����n9�DŽkRs��Y7���.ǡCc�,�4�
-�WY�f�*��(���n�f3����F?�Iɱ�G+K�tʸ�<z�����]�/�~fg�f��%����п�	W�ަG|�\Z�c�n�fk�{�nn�Yp���WB�lǾ�վ��Y������I���D������ߔ�ޞu���ͽ� R���`6�C�*$la��a��9s��ۦ���q3�מ\E:���<=��Jx�_B������Wr3qc��C(���3�w^�RR%�Y7���'����`6@nf��st��|.˙�M��Q9*���ss�o�#�s�6=��������~�f�ᤏ�x0�	�NX�<mSӿL��
^M�Q۩��A�:�x�3�S�����`6����oi�'7��t�|�`	k�&�
GkIo��{����E��_f�:���@�"2�_��]J‹^�ͧ��S�5�23����~	
�c��j_��D��x����U�m�p{���2���Ͻ��k�lV��U�H����YS�����s��h�;
-��+�~	
�c��j_��H��-e��y��/p�Cf�.A�ʘ�.�з���/�V�r~Z��4����q:'
Y��(3ɫ�����mP�?C[zD��0�2l���;������Do�C��@�%0_�߁�f�)�6�����2��v-��Es��|�ە!������zV�_��K���`6�&ژ�n�3�w�Zx�ab)N�R�4j|�0�*�N���N�Ze�%����˃Wm�v���%`6�C�������n��ЭK%��غ�Z"|�<�+��
-7��TH�f�:���G��6�L!�j����T���z�5�!���M�7�_8�dr�w����=�<�q��U|�:�/���hoT�N�K�E��i�^��J$��BK���
`��0�*y�&�^�b�C�z)��K�x��z���i�3���X�&G��=�,�p����n<W7��^�z5-��F�B-3�W�J>a6o�nD9��.
-_DŽ�}�M{��J8�Z����:4��M���6���<����Z/�ͺ(�.-��%�_°��\�'���Khg�2�u�T;j0�I�N���M�Eh-B���VgE��VG�ǯ�
s���r������p��V�"`6�C�*$l�o�Ya.�m}P\�
-�����ӍH�J!���j��L�]ܵ�¯],�
-���%tL�6���;�oeo����p~�~(DCs���I�n
-�:-�t�'�w�h���8/��%��K�{�F66�=�l~]/�q��,��Ӽ�5��Ô�;'j��=r	�%�����h�o�V�Q}뾞/i��!�g�[R�c�1ؚ��fO�^F�0��/��*̪*�e��Ty�p����
 WЙ�zTI'�^fat��ԭ�dt�U��dto��{м����—Ў�2G�=�Y'x��,��8g׮pS��6 c�t����X���[�%���2>j6�E/@���(�L6U���vd@�`&�Z�<!S�r�+������ι�f�X��[�3����Jv]��0S�,��`��w��ߍu�:���'�xE���O��^Zu������;����\$��&s�w�r��/�-�To�]���w�����b,���;f[��'G�J����C=�q\#���ט��
-��f]�h"?�vا�'갌2M��/^�hu���ޝ:-0�?�x�]�v�xc"&��~F]:'u�z�+�p��#�
?����ȿg���^l�À���w�^�'�{���
�c�����
-�F�~��U�ΩA�	����x�8�{���ۢs�8M��X ��m_�>�o�]7�w-��fg
��y��ě4@GF�=�+T�[�f?�EU����W�6�`�����Z�&�Ǭ�D��A��e���G���2��x0L��9���,gק0"Gy���/�+�(����x���Go1�_Y[�D���0�g1@���6�L�w��K�a�q�<��m0j�
-_�5�}�X�����e�T8u9��T*��Tt��t������;���Q����V�{^�7Q^�84F1F���gQ.�yG�gI߳�Rt�	mr�r�`����<�'*|[�mKc���M���Y����x������~��V��{"��~G��ɧP�j��~�I���<��U��{q�c׭�Z8���
6�6���޼�po���[����t��/��bf�T��h�
-ȡ��,׫ߺk�>��1��w��u�������?�A��%�A�zzf�;ZȾ�}�ͯDeB�R�V�&l7=�^�(���3�3�������N]]�?�&�
�;��q�P��Ц����d��F_���'K�u�{w��6W��w���?�G�fU�}�r��	;~�����Hm��7b>���Y��|�2��霎��x��� �t$�)Wޭq���-����V���@/���Q�ټ��}�=��
�u��wQ���RJ�n���u����RY�;{�$
v�j���).�2SȌ.�L1[6_�n9O0;�TN�NJY�G��L���)G(�h����cۤ�͡�i�D$(e���aǡF�9�7��u���l����f�HŞ���ԩ���7K�͉"�����D���`m��T�Zg��#���&�C��>̩[�)dhO�7p��=�ҳC�r�>�O���:��H����s�W���U�
-���߿���za|p����@�N	��"��q�f�&��{)Gd��i���E��V8�J�9S_¿��q�H��Tj�b��I{~�sޞ�%͎���+�?���tl��b��>YWԪ�С�xJí#g�N�����C��u���,�ZQqn/�g���:�K�kB?ʥA�j���fx!j��p[�l�)v�aY�Un�˻F��{9�����V|
X�휿�����q7�믷�-�?S�R�G����} ����UJ�K�
~�˕�.�W=���<�#��X�����{����f���]
/��:��}��W)��-��A�5jQ?�6������\���!����	����M+�l��r��%?�4<��Z-ōÜ�.���w�ݝ�'N�r�Go�Dҗ���Zн"�3y�L	K%�-.;ۺG�>�Kv=�������
-����,�	#S��m��$�]�F
�y;�A�5`(���C�[�@0a�y3��錻:���Z�Q�7�����un��i1�HRM|�y���-���&i����XUa��[:�
���W�xM��4��zY���_��:|ث�y���U	2��ژ�r7p-��g�`�+��l'�Y�	�����
-##?��W..G��'�{�e��9�٠5P3��~���g�%X%O�+�n|
�6/&�Þ����𔻮?ޔԝ���us�{�,�eV�}�3xQSУ�6��:�����������G���_&�~�0�Mlݚ��
-���N�'R�Ms�߸�=�;��Eż7�Ϳ����1�$L�,7�[uif�0���5j唂
-3�ȣ�F	��ȼaa.Q��Y�����Z��~��3�I��?ۧ�{�չ�R��x�h��Z��/���讍�����?S2H:�>#Q�3�Q׌�7D��=qKj-��mϻ��쩌*��:�{j���I>��x'�x�&�'�#)�SH�w��s��C���t��w�u�w�rcy׽O�N��������%�m�Q���c~
����}��;�I^0aRS�{?6�?�5j~c�����������6
,Ǻs�u2�(*����t�qD~��&��
-;��1V�V2�I����D�d����uT����z0ڼ�z�<�����с]Zqg�����7��!�<sB/�Q;�#�^��h����Gj��'����y�����"�r�9�7
���<���.y
-n����+yy��)���8���$����t�7
1G���e��������a�WB���h}���{Zkv��vs��™<�{e��J�}zDէ����������u�{`-[^�W<�r�H�f��>�	�������R\�~O4���.y
��'�%�o�L0�?
-�k�����F�/��3��O)�gO#\��W�W�մ�&}���k־;o���U�7`5��o��9�^���M�H|cy��`�)Pa�:�
@H��noƇ�=M�FՀ����I�`~棁0�
@+�Ä�7�K�����WM��D��f��d���fx!��ܮh+�[^_ç�E�_�E�-�8�:B9�%�<�qL����\�3k��+QԚ�K�H�r�w���a�c���(Clٍ�;`6��ǯK����ͥ%J~�������[���3κ�To[;a.)�9Xv���\���ſ祉,��A�?�h�fP�M}����(ޕ��ajEY���'��4��oo�����	)�(�Kk����;�[ݳW��X?;�/��,&�����W�l�~5�Z�*n�6�������&|p��ͧ����W�?�W�u��/
-,I�Q�wp������ݺ��5�T;&U��K�l��ݒ�K�$?`J���m\\��PI���ƨ�̏�_��lEW���11��3֛η��y�x8}t%�L�'�D�Rul���2=�S�
���cO���ۙ�}��]���{���z0�܇Ƿ�u=iY�}�
-�
-�)f�Oh�҇J���X^V/>UH��Q
-�ko����m���*ט����?]\���q�L��xx�È�����5�@��CV���b������R�w�o��9Ϝҝ_c]kU��v[x�n�G��u���e�h&X�`Tp��<�<߶�O�<�yOs�~��1�P�j�&!T�u8�|��YZ�Q$	������f�V�wݍ�J�d��wHi(�������h�����q��F��$�����5L�Iݒ���
Y3I�O����\�(wt��w=��������1{)��uU
�%��p�3UH>�a�q��&JH�L���?�pqSxQ�HT�� Lm�z۱��:�j�5	��m�+�����^��o�R0��Z=
��9�����7�3�C��?�sR�UŒL���b�����UQ7	����	���
�=C;����Bo�)4��Yc���bak�n����M��V�[�M���3}��?<M��
Uƫ4qtpX�M:x)�QkvT�_�
4}޶|&˞Z`*׷;aUs����E'd������*-!��;��ѽ�a�
(����Y�4�Fΰ�f�@�5�ޕkb����`�B:��ѕ?�>:
���gx)�u+SˣR�/ܶ3���3���oݢ��FΤ4[5�@���*2����;�[U'Vr�<0�k��Î�=�&���O�i��F
?��j�F����=��{�oc���w�4W
-=�߮�R�γF���"��+R����L��"�!�^]�����tp%Q�#˗S�f��,%T�U��ɢ��c��߮N)fyjC��~��,t~+��'c�<)����+�4�i��eK0{݊ձ��&`~}�|�T�O���
-�nj��^���}O�H!~��dy�A�G�Z8���}kg�4�9xs�S�%��d�)G�ȣE	��?ݓ+s�l,�P������Rq�i��zT�o,|��P��C�,���='�(eo����j�C�M����mo�%��P��?K���I>���$ÕB�$/�җ{�ß��̧Х椔`X��hP�vEʷ
n��/�;�:�F�n��Ȗ������ȡ�U<[�N�:sGV��Yt9��O��Ki~�X/���
>��|�M���wK��
-��x�#��B=���t�x�R)J^���7Uh�K)�I��aj`�փ��J�|ݠ�h:�J:L��^s=����Z��
�q}+|10
-O+�Jb��p�*��9R�V� Tq*�2i�U`6���e
�ɟ&��H	��>GS�^�x?Fy�@
(k؝�:�O��"��^'�40��,0�k�~*G��	������D��0A�#��^�g���iW�[hdrk�Y���:��(|�цF��4�p���<���r�]WYO^fs1���ѿdb��ՙ<��`�ѴW\m9�Z����R�����L��.V$&.�3�N�b*�L�xжn�&�7���������-�t�)i;���
�u�w�d�����B����ݿ�&�r�b{׋,��@�>����߁���c$j9��@;�'?�Z������ӵ6s�q��k�͓��Ö��S�a��s�C
W�i�ۋ��
-�97����k��:�5.����:Z�Gl[�0Vfl
˹?=��cޑ�׮g;��>j���±�)iɫЁ��
-����-��8�\�Ľ���h��Zн"�3i��c�R�7��5�5�C��$�u�i�3��[���
|$�Յy��\
��FYb�J�/:z;szkk��"�W�T$�����G=F����]u`G�����IS���u��k��P��)�4��
硯����ѕ�/�ڌ�&JHM�'���#������kۈi�VP�%�:a���]�8�'8o�ED��������_}J:|ث�y����H�"#a_��Yuf��6.��|Ň�����W���s[;��3
�!�����ȵ�μ���Z&�L� \5��#�ª�,԰:W*��gl��[�
-������ca0O�y1�9ϏazQ�fŌ5ؚT�l�ϫSr�2��¥I)���vڞM�%R�:��ɳ{S���	��w�MF򧘴HG��{�u�-�S�s�
����Z6ч-t`wɫ.�׻����Xۺ%��t�[0���X�8vw!���A�A��i�;u�<*��u.\D��Nov'Y�@��f�9^�'Cj��{��k�z�����<�ު-�E��R�H*�LF[G	��=�,�2�Wt�E��(Ĺ�_�
��Gl�fy}�Q�`uQ>���g��^^
�=��;Q�#�3���g~ϑ��
/��3�7��qf
-����뒸�~��]ĻKf4⽟�{V�[���C��ji�b7�M��8�y��������G5N��ނ�s1�f{��V�"y܂r�{F��t9G��d�u*p�K��Ƈ֟.8Em̵Q�y��p:3���yE��M'dNa�ů&���J�0�Azo�<�ET��(��Q�6}*�˜2e3��Zܰ
.չ��W�!	��O(�q�_*��VH���i�9��YZ:��P�z�$��T��J��`>�
-�uxk���_cT�̔�;�dQJ���9�p����û�����L����
)�`�3�kݽ5�Z�G�3}��T}3�.� ��!�y~�̲A����=�L5'+���5���l��\��
_��Kx��`]]���_*�Ut�^�۝��'�ބ���).U2cb�uM���`6��������U�B�s�רAgK�'�9��$[�t
���]y���/�n�����(3��:`
-��L�Ur��ٱ����ôUx%���}� >
�q������[��zi��tN�2��@�r�ci'$�x(���~�uC�٬P
�@kf��f ���T���G����΂��#*a���0
UP��}d�S$���Z��*�u�U� K�T���蚤.�U�W�,�c����Q�["�n	���CgT�\A_d�5�E��.��s;�M$�g&��L�;�FC���m��S� IDATeQ�'i���X%ۅ?̹���
,��_���l�hn�-;�p�G{�96���fIiX�b��/x=[(�:�S��C���W��Kk����z�0G65�:�!��h���U���_d
��<Ϭ��tM�֌�îhUBe�i���6�)e��I™]=�"ﾸ ������'Qu�}v�(�DR��
��7Ԭ�u�ָ�S�H4�g��Lܰ���a�^���L]r�+>��j��:�%��UD�mBn
-fs��*��1�rU�m�r�1O}�Zӽ"���(<�Y+�gU�#��
-)M���mf4�Q������sېl������
U�@?�N�0�c���R1���]�G���Q+�8J9jۈ��݈���;�wX���cB_.�>+X�Q�r��q��D2��;K��,tjQ:I[�[	�YZ�Q����ߋ,�
-=���TO�F�Y��i�-u�&�%��+XE~�ܸJH�L&5I;����*��(3|__��]��D.���^����.���R^t���
u���P��|+��#>6s�>���:����]��є�$����w��,Z\P6����&��v�0�1���t�
g�*}�������_C�3Ua;��5�����
�A��Q��^bTL=�W0A�+�ڿ��3�n��t��e6o�v����������\Y�s��3�Wݮ�3'��q�ѽ"�o�33�ֶ���
-Z�Z�GJY�4{�YN��M�pVQ���{dVv�"��8i��y�P��C�O�����$z���H��)v>z�0"v��o\�z�T�U2Y0������PS��
>��cj^�ܕ��BbUm��T
-n���ռg��y�׽r��7+K��h�2./?7��[πs���	�O�����d*r`��Cw�܁mS��z�W�:��S��,-�i�MFMβ\o��`���z�Ex3۵��/4�"��L:�0��'�,R
��۽��D-�?�îڑw5��X�9�_�ٽ��Ex�EbtGwIR�'8Ʋ�]�R�Lʵ����ޭM�w�8��z���X�d��5����ܥ� I9��g��~K���ȥs����@�_�����+����,�T�`Q�I(W��E�T	fk��Z]ER��n�*�5%G�oGJ}�K�k�[��꛸�r�۩ﯧp����ݙ�[�sxL�Q������I��9&�7�P��V�?Y�����Y̶�sq�9���&I����.�#J�Q
"�ⱚ������Ӭ�(p+����g=^�-��ڪZ>�����m�.zG��$)*�f������߅�V����	w��B%ML�=	_�*�]��$���}[퓴ײ�;}����j.zB�T�[� ���XV���-�5����^s�q��h��.�\ՠ�߇.�y���Xn3/@'�nK�|�Z�փ�Om5.
�
p��_|c�����{�
��}�^�.�S
-���9[>�p���9OZ��%�'ԣ�M�/�_ge@�
-��]��{/�=5;�<��r�C�`����쬁nS��
‚٥�u���׋���#"@;(hP�����S���r�����|��UD����#�E��l�Y�8		�t���m-'��g��-W箼
-E�7��������
-?�G�.����Yj�D�$m;�e$ܓ�U����-D?0�'<t�oO����$�g�|AA���y�]�#�x���{����(���'|r�I�JHx1n����bM}��u��d�b�g�g��;����pt��/��2N)ZS�ax7/�P
G�@� ފa�ܙl>d�f�up��bD�Z�$57JJ�ڻv0?�f��3�yw��v�|�ǽT� Q�b�uHV	$��3J�;~B�$��rMi�?\%Z:������*���Ð��
��,����`HQ35�)�_�K$�TfR�L	�K֕m�
�V$V�gK��ͧj�hva��H˵v#����7΋n�a���I�CJ~�8u�Ͷlݎ�Q�.m��=+�K't6���)�{J�����x��9�bv��o/��|�Rem�)&W�+�L9\-�,q��,V��L��bK�<}��Ա��R�̒4�-��
/���މ*��&ףp3)�d|S-��v�P�.�y����G(��V��^������ �O�I|��N\S4y��P��:@#_n�S��p�������D�+rD��]�7�?h��I�������F���r��w�e6��
-�h��7�+T��/�N
����}QF�[����G}e/`!��W�E���aE���Yc��R��@aS���_�c�GwU��y�9����\
-�R�Ϳ<֎�ʸZ7�a9��!���R3_n��_4�'0����z����9z���T�p�U>eؒ�+��D�q�?b�E>��Fd]�%�F�;�����̕��7���3y�A�lOo$�5�	�򤄿��pɛ�O�������*��8�uqû�̯��X׳��ɮ�.]��e�	�;��~�V�;=�y��K݊e����Tp���8�o��1Z��W酁(�6/&:�9�v��s��)�ޕ0�"���:�54�f������մ���X��x�,�뉭�2г@+��/��.���Gϋލ��}w����[R�*��`Z��T�MIU!����"���<�R5��.I�hm�D
D�=ͧXU_ٍH�Ӌ����L�|�_#3��F�
-f��8�1�kP���3�A�;݁IڟDϰ0T���n��5�J�V�|��5�v�L����6369�8�ft�<�ql�I���M�f�GA�y�׮N���d_w��jl��9�R}T��?l�]��rV�x��~B�fx!��ғޯǚ����Hɣ�Օ��9X0UJ_��T�#|��-�oxvͮ�����̺��0����V.�r�̓�����aεc����_ge����j�fUX�r��L��.�?����.�`=¦I�J�a��B�y�����,���ޛ�=_��m��4=qrve�/���Ed>?�����d&�h�AKL�؋pޣ���|�'<]����LE;iw�v�J�ݼ�̠-��vlT��s�Y�51��L���m-�]
-��EIE�_?�v����=��1J�w|Tǻ>��#�<ύ�E���Һ�RZz�Y�p�b�ôT�T�b:�����]/,��c�?Mó�
oI�<��olV�В�Ӯ�
-0Lɳ7S"��3쁸W��Üv.���m̭$G���~�����O�(����|�.u>lO/z)�Z3�G�u��h�w�By�%��N�V�{��K�/X�����'O-E���0�<�G[+򅰶J�e��3Q.���l�Ԟ�ߥ�3��pS���z�w��
;Q�=���<�rV	�ծ����{�H��s4[>e� ~=%��K�';D�Y�JQ�)�IړH��Re&�Yȡִ��
-��EQ��#�f���"��`�'�T`(�i�R�.n(a��~Gx7�29��ɲ�\b\��w�ζ��p�"�ѯ�r@�S��ب��q��Q�y��m�T�nD�,V����_�_��WS1�L�7���5#�Z��� ὮB�o�0�w���tg��?<���M���|3����`�-�]yQ�����jg��O]��`=�Q�h0�n��3��B1��%��.J
-��<����r��u�+�\�?����0����
-�c�*�7'f��{�M���O�r���[��hʦ���A"
��1y��M#sZW�@�����^���:��7#Ч�`C;�U+ws�I͚����S郜�PBl��j
�x��ۖ3f�bR���aܻ���n�V�sE,R���rx%�ʱ5�a�������_�<O�����B�V,��5����UTE�7#$��^Ќ���u�������Ӻ�H�q��jv���F��Z���j	G���c��/���K�z@U����
`8#jxj&W~
�댝8�M��+�h
-y1��"O_?��X���]������UU��;�Y�D�CP֑��f�FR�sڋ�"q`[�uw��|ի�OQ5=/�g���8u[���6eNrT«%O��jE�֩������������nS�F���]�P+��7-��J�Q$U6��N��
�N�_�l&����G;'�9�Q�?�_��U����i>��h�,ｶK�3i����$"�M���4�����y�֦�N�v�r���ZsOv�|c����|ԯ�Qk�E\�:5�dc�����S��.��?&X����v]�)�<�:
IBU�\q/����j�f=�5N�4{�����n���MK�
�B��T"���?���������G���ه�����V����#�Ӱa�L;�΂�H�S`P���(�ړt��Ze4�hW�a�.�)`6��>��w
-<H�Z���P�Ծb����P��5;�
�У*�S�
-7����`���x��y�0�J�8�u���/d�S�mKnZ��Sf��.��_�I��wW(m��"��(���joK��6�:����Uz�1��g���k�
��Қ!�׃�;��#�z��h~Sg;�ۦV�v��f��HKgC����3�h3�Rn��m���@+��5
@%G�w�4�h��?�Q����
�‡!���|�B�.�⫑۟
-�l��"q�B�_���;���8�[�
-W�
-������^��XA��v4\^P�9����r3j{�1ziJOB�~�Xa$���v@��#tⱫ�E(��G��<��>�#9�g4J*����w��B��r
y�p�z���wT���+��G;�����;Y���:��Z��^��ʍ���主��q��*�K���J�B��������6O"�)�B%ڨ����Ì�>�+���^�)ᣉ�D�e^oֹ0zm��
-p
-%�$�����V��{����:�y����p>�������(��:�;˟屉��s�s���#���)��|���L�;Ӷ���
�͛��K��Q�=����S����� ���^N��.ה�؊�$�pY��-������%��1�+�ё�C�~ʖ�k�E�6���~V�Î��ˁ����\תH���
��Sފkn�i�}����Mh�&�z�+����)Mw%T&�L�����6�C#��p�궀Ü�Q�b"��ݺF}y~��Ť�<G�H�3���3]g�v��*�6Q
>�F�̥HYg����Z^?!��na$+��x�Q�9���b��Ur���Ϳ<���>�j[4�,9u+#G��Z�зr	��g
-%\���E
괡�!�:�T����B��&m�e�Z��6u�*�݈~��s�h�c��f|G}��yy�i��6Ax[h{}[C�lֈ܁�z����.���PHU�W�����Fj��_�|��lY���􏦽TZ4PlS"-�
�E���0a�M���O6�
��~hD��)�j�/���[�ў��X�bKz�����m
�y1Qg��c����$���;�ku�5�;B#���lʷ��z�n�8�F�<�l�J���T,��-tlK��q]+g�-:��^��%6��\;�d��}�5��)�ލf��/I��"��s���{�v0F��f(;p"�BLDn9�1.�6��ʠ6�>�-��L(�:�<��>0�?ʻ]���z%�oT��>ƕ��i�uE,�������9L(�b����������z"��u�f3�����)1�����
��+���t:?�8a�ѯ|�
�F��ؤM&�2�mJ�O��ʼ_�q�Z�}�l���UI��0�l���8�L_7��X]\����wrۓ5r1p� ��p���ߚ&��S��	��f���cqI�Z�*��=R@��f0���B�fM���W�$�#�9~���L��],M-�x��h�����	����K�
Wت�`������\�w?Y.�7�1�'�Q��%j�ľ��:���Q�����)�~
$����#n�Y&)�0��/*�m7�
�s�b{��mc�����4^7ٺ�y4���V0		�٣{���#P��~�pmT���6��jVY��AoE�lf��l�0���K�4V�K�qoD�N	�%�.^���%<�?�=G]ݱ�����R"0��j{O3��i����%��^A�z}����]#F���+|M
-E�<����j+�W�*�l"h��h��
-;3�y�ٜ�;�<S����Q/x>�Й(�)�վ��O�|)k�֨��,՞J�Rag���ڄ鐥)����}��c_%ԧ�凞k��n1���2ڬ��Ӵ�a�Xzn9/��Q^����l�̃��c�騌�)H4qT
�t���C�ݻM٠�����K�
-p���ר���[IM�REj^Xt<Y�k�J�za�f�e��_�ּޖ���P?���樧�uJ�!�]��6��S��qQ͚ ��[4qh��sE�NJ�3�^ƻ��ʿ�<ᷢ�QR���`/R
-:���h�g]���V(e�gJ#�V�B�95�;LZx.����I�w�l�ڗ����U���Lj��q���z��0Ltp�1GW�~gk2�'x��뿼��������W��J	�G�T�WС�X7p��"w~ɱ&��̆,]�&L_���+}�Qw��/|�P��<��ʓZ��P뺢j���5�_��fsf��l�d���U�a�[���M_<_
���S,����+$L㟥ܵ�����ގPA�Z�^N%�z
�SE����t��-)��I_?kkQt2mI���3�<)�� �[N�>�^ll6����R�j8:�K��iP��:x;C�۞NtQ�%@&U ��I�,3����D�iV��
-��N���L��N�}�E��Фv<���T����"y�)��%<K��橄:�R������7L�՚n�n��E/�P���f���m�8Mgp���+Q-��qr��\��=���9Lr�7�l���|d���5��槄M�?{�T��)`K�k�[Y�?/qK���W��+M�G强o�i��[E��|�G�Xi{kZ͑k�%�1��9�;|��q�D���8<����O����B�^?l�>���4Y���,�B3����%���c���{ũ�:�L�����t1R�,��z�L���a�������+�H�@�wf���{Z�h�-|
-�0_��Ph�F��˅��=�͗1<����vdy}].�B�\xˏ0A�1{w)�)Ę�W�@Q[����w	#���
4PА|��E}���t���핈!A"�F�#�%f��z{6�rI�oC݁��V[���H��e�i���9p�	3��K���
2��b&�I��)R�J�M^
-2�d�-��l�
��pfέ)�Y���zTb-礎��Իl����AA�gY۪�T+���m���ߵ��<U/M��Ja[y�h3��dZ�|��{���c�A�1�Im��Ԥ�=:TZK5�V�J�l-�����[s�ߋ�x���3&���%���^��(�b�Ƿ��YL¿0���D���
�ź�܋a�hܺߒL͘�mly�n�'�]<s�h���tg�J��M�z<hC�x�aoj���E���]5r{kzij��o�-k��<��ψ�g�ne�����܃k���NڶɌ��v#�_�+I�43e���x�:F�ǎ,)��b�¡`'�#���\�0���8b;���̽����w�Y� ��2E��_`sc�
=�i��o�s�ӣY��_���b��G����7a[�6�u0�<�#��X���ލFtÄף��	F�	�æ_ㅲ�TJ�W�<m!�
-
-`G�g.z���6g,m+�Hnq�����ӛRND�}g��԰B��tw}�uc�-�6"�߭�a{�W�Q&��θأz]�7���.㽋ph߯)���gI����vԅyj����jfj[��Uy=��B~�Q�3��mc���d�:O��U�yo\eY�Λ�a�$h�.$��$��vi��N�d����r�f��ޞ����9,�%�d�Z����&���;g�H53�l~0�yt?��a��L��H�,[��y�iըe{��q�~�J���#�y���h��%MD�-�dv�4?~���"UL.�XY����f%�]�
s`m�b�_�K��u���.W��������V\���e\�y������V��JK.��������K(Ci���CS[ߴE��ڀBv�)e�K~���+zm
fr�*M!�)�#^�Vt�^�eԫ<��`^�a�W�%�F��{�lQz���/�*�촨�Y�V��Gl6u*7������kbM����ק IDAT��&o��2�S�fgG�R�Cv�aD�)�|=s��H�•p��m�gq��Z�o{�t^�%���a���0�M��X�|�Ezs���f1:�U�}��������5�R��z&��aj�~��ښ'�—y��4��{j��K�L|e
�G���)�%ۅH�+]q
�8�_o���M:I�
�y1Q�tJ����R�ʙDJդ�]h9�{��*Z�H�ŭw��t
����
�|���k�6�s[j����d�u)����M]ת�����Fv��۝�_q��]�4[3�qS�~��G#�i��4�zJ��]��	��+���_�ߔ�Kx�8H~h&6e=oi�$�+!�������CO�}.y>�x;��*0���h��҂��oz�q(��+x�B�bԪ�_��n,��0I���'
v�/H���&����j>����r5�o���(�x��+�;,���hF�>u�����9'�Q�?�(�0��eZ�ht�Q<��~a����:�/�-��3
����Z*L<�E��P�B�*/M�8�����b�(��V�jm�����8~:�5n����m,G׍��6�
-	��9�j@�|e

-����%�:	3ڤ����Q4���h;�٫�Ei��9og��s��XG�X��c/�,�n��/T�0D�/���C���e�Ve����i�Pm��ձ�_;�oٮ�-LҮ�`��b���%T.����)�I5U;��-g�o^NơS�oO�
Qwf�2j����%xEac�u�.9�^��e����W�k��m����gR�ؽ.�J��;�2�{�}�7*Ԑ���y��t^2@H��Q���U�%ko�
-ݽ��~L���9G#�����)��݋�?0���}ء��a�����^�s]�}A?��c���[f�����x8=�ee\ҏ��Q�q�z������'�k]g�7��<����F�BAo
��44ȃ����ڪ��q,�^�@�G��纶�=M��
-��܇@3��_�6����$����c��T�謱L���)`,T�����f���`4X�69>�┤�:�=�u�u}�z�R�]}��3NC�}޲�̈́{q
N�Q�	s����qt6L@�O���7$j��>��M^d<��u��o�~��
�W����>j°�0���`��
-�Rꍾ�ɇ�N,׬q����%T.�&�;O۴i �6�i����^�"�`¦˶����*�"��8��Y�ѯ�Bl*���h�!�m�Ž��ʼ��`<�����uM~����ʅ�LQ������L3�k�
-�_ƫ�4�6�ʳQ'	�J�J������2i~*���8&L�1�G���C:��L�Jg1���xQ�3�o��9r��s��^�ǒ�Rwl�z�T���b���`���a̟A�ų(��.�\��\N-I�i���
���չx�|��
-p��R�
-�M��F��w�)xW���aF��ԓ���k�%)tO�c�R)ϕ�B[e�����ޕ���.l�v&IJM������}�i�u\/�D<�&v�w�����*��Q�Tv<b+�Ë^.��ç���"��Mlq�唹E�>�i˫��&|O�T���c������P"�*J+ޜ�:�s��T�U��y�f��޷�`��3�u�h�O9��S0w�q�Q�uʟ�O!9�#��A*�P�xf����Nu�TK8�g��-|%�1$�k͎�LPVW�%�+|��
-��$�J����(���VyLF����H8�)=�r����
�K��#К�"Z򻼍M�M8ȼ�sl	fs�V���r
�#�p.~_�Y
�d0�k�����w�+�+�E�3Yfs1TS��_�D)6�*<
-
-P�S�[|��`0/�^�����%T.�#��C]�7�`>JZ��s���1�T�o�hJ�M��`�
/D�:�	'�����&��Y]ڟ-C�}���z��)%��%���(�5���)^�8�X��߮ڸ�n'�;�l�D/e�)�
-5�ۜW�a�_���q��<�D�a�$57�gB�
<����m��ޭLH��r�.��|
-&iO�<O{����)�n��R�H-�����\�c
-7��o����#Q\�(�-��R%�(��Q{�L݆��{8FihKG�ftt>V^��Z;����c
-Osɤ ��xљ���=�Jex��-
)��P�,f[��n�^ؒ?��a�\��0o&ID�&]D���G�<��MMXT�[;B��YB%eoDBw	�4M�	X\'mR6��\�
-}�=Nk���B�\/��`l0Ow�W6(�|�T�ط�`��/�z��2��ӣ&�xF�<��O��,��@	��>]��@B�א�
��M��61�����Ѓ�֬��ِ����Vm��Z�}�l^LT�5�5���/�@	{����tFRc{����������7�Zj���F�~�f���N�y�j��������c�����5q�.��S: O���̯F���gL����R�0�5��ę�ѩ+!aj��u���ᮃ�9��\�wqc���<��wN��0wxj�t�"�e�e}�8)���`6/&���k7� 5M�,j�^5�$z�b��<�`ы,���i�w��������"��E��S�P�^^���t�~c^����3H��|��l]b���[�����Ja���VC��O�\B��$�~	
�Ʉo�e����c���k
%�6&ë:,s�js�����h�W���
ka_��>�)��.�Bm���Іp5��58���0��*���Os��>Jlu%bT��/D�N	�%T.�A�����RSͿ�֭�+�w/��Ͽ��Z^Y�0��bpc�mR���s�%�|���#��1�w�Zi��\Z��3�	�IX�"��(� =�,u���F
�<���],Ə�J6W�QExI�-2��)������oy{��7@Y�`�.N�pu���H��F�������/�1�����vW�\/��������^����F�-�����-��g�ڄ�r���
-�錕V%7��oa
-�si
-s��F$�$��/4��.*$Ӆ�K��sط�`K0�	�ڂCl�D�\�E�&v�{)xw���:ڷB��)�v!��|$:�H�̡Bw�x�8�Ӟ3�@g�w㢻�8�.ly��7e���M`6�hW�)�r��KJ轖�Y+/3ڷ��)�n}���N_�zf_��W�%�H-��%egB�:��JM:Mޮu�I��3@5l�=zAK�l�����H��&�M-��Ʈ��>1l�嬿5i�p��X
�G�@	)wf��	�mt�8L3�Z�`�𙅝/`��l���5
-ޏ�!����a�jK�l���$~���=��%>�|j�"���0�k�~tJ�w=�{�8
���r	��g���%p�T�ɓ�[��JG�ϩy�a�[�uk6U��4]_���~�)
-�J�l^Ljӑh�nt����
��E��q����EI�	p1_)啵23,����UTE�7�S�a�U�`6� ��UG�[b*G��qM�umо��vcj&W~
����fr�	ÇWJ���/#�b٬��f)U2h�/35�[UU�6wS�5wq]��k�~a�%I�q��3B��I����S��Z��7�,����݊��l]÷~_0�E�j�Q�q~��
V�v��x�SQN��a��5i4�)�v(C��x�܎�����l]b����x���%P��{�^�Ntc��hh��2h�P9/�-9F�q�h>Kx(����]:����ٷ��o��q�?m�Fo�5Ku0I�+,��,`k���cS�6����6����̞��Κlgk]��P
-f3����&��f[��)�W�(C�9�lo�B�B��
/�§�V���НЀ�v)=0�;3�M$s���wT�0�����8�5Tz����Z�}a����{���D1B�!�=K�(��5�ȣ�Q����������u�`�o�&b�Cf��p�τ�KhccUwkt�)xhO^z�Ԕ��$qīKaw��6��W]M�ԥڇ}�=�nt��h,���:�`4Xcy����,awh>K/��.C�wu"��RWRj=�8���g�?x���A���z0I{��r�GoE	=7��|�r�52�;I�j/@>���f	G���_��%��D�(����yjL2.i9]�&�8z�MG��֯�W�����$��HY�vRY�$��h{=��(���.����R���;�t��Cu�X.�a���G��J� ��#�]�j�����C�M�
-#��3�hR�l�`�6�.�Ƶ����¯bk���y1��S�0��z�W�j)R�ѵN�����R>�p]��	@
-f�/��D��:m�����ϒ�)k;qڪ��V^E��Y��=�C���[�٬���{m�BG���<�|�+r�,-���0���=$�<�)���-z+z�e
��Ǒm��Tx
��������D}�E�`��^�釿�
TAS��e(�:D'[���|
-��T��J������z_�ܰ�m�tkt��oeB�F
-]غ"!<��
T�@��0@�r0��0�/��ւ���B�	�f)�}��z#�	
 �q��?���-¯����������l=
-����`!��O�u{�����\nl
��
 �2lݑ�Z�}a'���u4�cO�pOx��Ţ��w��w�d���h�Ҍ�ɜd	�Y0�+)�Ħ�2v� 5�W��g��
-|���=��;u�b�Q���w������V�6���
<��]��A�&�y�V�������n0����5�V."cuEJ1�,�;%(�P�x	
��P_��(C5��}�.�X=~qo�+ag��^�����ѕ���W��P
-��ŴL�{|��u��.�ǫ���|��3�f���;�GH�1I����/�^b>X�n�{��)�$�)SW��[�Yl�nx��]�;��ٰG���M�Y��+��Ax���?4��:Ml��qitW�zj8�����\���J��h;�Fj�v���#ԉсhI.�LiEWA�C;|�K�l^LTi�Y�6_I�r(E���uT�~fQϵ����	ϙ�(�S����
-	{���C�>6A�d�l��):h,O*��	5������Ñ���a�Nά�ʓ��a3�,j���F�c�&.U��n*ۡ�.:ب������*� a�KP��A��z�"��m���+����H�J�����CIkf���۟�۫��_����;i��f�W�������^2?t|ޏ�py�̙��oy�nH�����(��D�ϗ[(��.�[.����0��[��.���t)��X���j��|�^�<+utJ#W'��3�����^�
��E���v�1�|{;S<���9�Eꬻx�'L��P�K�Q	�$>:��:����߿��q,��F%W���ȠAB�m�g9����o�[}�T~�v��+��+g�փ��J�z���&�+�dV���1^�	�;�m.fӆo��[.�T
��]�o���2��[�h]����3H���� 3T��5��L��g@�Ul-��`6KAo���m�*� a�K A[kV$�6�@�Ul-��`6
�`6������Y�Z4�L��b�﨨�3`�*��263�k�l�e=cYnpF�c���Լ��z�.�
	�͓����ta������~L_��Z�<!�%T.�A��`_•���G<�'�FM�#8�4����e���gSx!����������z���ފ�����K?�+zT
�׽0Q��g=��P.�r��@��7��ͫ�ua��o�n_�ճ�Ѧ�����!�*Ja�y3�VwG�;(�Ey����$�p��[m�V��0��ˣ�yv/��#�w]�.$�W-J0外�I����3\��`6/&::�v���y�G�Oؚ"e������^A�g��*x���ˣA8ч]m�y�K���u�$\����3H��(!�;�Ava,���n��Y�Q���֭¯��f��؍�k�4:�{_׵��D����3H����hkI"�tR�g�fd�ފ^|Y�{�gA�U <��ټ��[�c�v�G@#l���T��J��������8:��5�	�}
P
-P}��
��l.fS�s�kY��Z��@����3H���A��[�f�
-��R0�ᅨ��(�P�x	{�_B��U~��[3�_�C)��5��
>[������5�x`D���Sf����n��[lvߒS~B�w`�^H�	}�b{���	���!jo5�N��᥂�`'QF�+)=ܢ���+�^�u]��[�?
K����3H��H�w��iU>4;�5�7G��w����%�l&�L�n�-Z�]䌂�@x(�9GGel�`��d��iJ��BE[�M������WS�\B��$�~	
\��}��
u�O�$m]��w7���q���'��c&}�֑X�֭¯����)�ӫإ�k��F#z���~��3�6�[XR��x���9�U���N��!��?4�V�ئ�;�6w'��N���Pvh�{�C_���uH�dTی3[w�:S
�����Լ�0}ȃټ���΁]7�{��G�N,G���)R֮�Y�>��������0}ȃ���`X�&V��Gﵹ+���0���V�}��W.�r��@��E��?�ya�/�N����IE�y�*��W�֭¯��f��إ�ks7��Ps׵Q3��)Q.�r��@��](=��ܿ��/Ebc?�SI���^O%��F��]䌂�@x(���
-e�q?�R﵍b-[a⦢�w�Շ;j!����'���'�)���o�R=�+��{��!�N�����o
�h��.n2-�z!Jt�1���j
fб�R�N�l�f��O=�� ��.:������������@�Ul-��|�l�U�<�^�x��x������P	A	]�bFà|^�L`�I��C���!�2��R�(c����6�����Z66�]Kخ����
-W��������	I���l�tjjkh������v�ʯkf�1�}%���fs�u�~ե_B�^�m�D�D=u�3�gk�u
-ڠ�
�Φ����͛�*�׃������?��@(h؝����8�
�������f���d�`��,<IR	���jE5�Π�e��S��e�4Z��$��e�G���*!�@���"U9����	|�W�)��9�k�}[J~!�3������(E��F�.�I'�uU�D]�FhT�a��#��O�.|=�c�J}q?������E~�v��qʠ�AγWo!æ�
%�&i��l������l[V�����/���(�0�{��]G1DDB N�b��V�VAt�zi�S7�����
-QkK��F�S8��7�F���X�ŗDҦ�QY����*CmEw�Q
�e�F[n���) ��cnD'{u�(�S%ث��`�2����I��S�T%�Ц�Ѥ�O��PX�F댬��at���c6j�p(�W���X�ܮ���^�[(�Qw+���X���i	6��9<�mv�%��K�#�j|��k{��zJj�\U_+mu�&V	�j��m��S[m�*�ǯJ*g��Q�݈ήH���^ݭ�݈ΞO����'���S��ӊ�S:U�Ӓ?V�e�A%#�J��{��>{i;�^e�XY
��ՁU�����$�٨&�wEs#J�ίb�>Fͺա��Gp�ɴݸ]���6U���)�[=�e�Y�{�ymWi���Fe}��	�����ݳ~L��Nዽ:N	6�16�n��K��i	4w�$l���;i�m���� ʓ?@�<b�X�І�f�]
-
�Gl�u�7@-���3��}
�=ͷ��l��
�S
-��o�M�m؆����ޯR	�ͷ��l��
v�^���Xc�
� 4��F�
� �8]� IDATM��>?LRB�w�‚�n3�6���7��m؃{~ׅ?�H/��6��	lm��f�(��Qp�
��6D�m���� 
-n3@�f�(��Qp�
��6D�m���� 
-n3@�f�(��Qp�
��6D�m���� 
-n3@�f�(��Qp�
��6D�m���� 
-n3@�f�(��Qp�
��6D�m���� ʿ�
-��8��<�)�#���R�s'Rf�+�@3����Y�r�?@wp����)49w��	3
-��9	b���R}���L�u{��w� �I��|.�Yq�����<��O�$h����K�R��(�n����0�fx��`���^�m���<��������^A�3)49	��*�����C�n3����L(*k��SȂ«'�
��g[<d�9�6�8~	���+K�-��l�\,��I���?t
��沗�6]��˭T�+�N��b>��/��'�����[����
&�3�O���o������e�^���<����[[��
���{�GgG�84�l3��vd�]���OS�U�6�C�9������l@����
�f�{W�	yI����
`2Y��
��{3�av½EyE�	'(aG��0�fؘ���ϻ#�9��1�蛮@p�a{�/7�����*���%I���D�};���'|f:]��Z
��ƦbJ�}a��	��
aP������P1�ex	��������k����I�k����4bc��'N�L'��=�YM�txE&���?�-c�
z��o�yJo�]`m3��&����@/p�
��%<�.;��F`�
�/�]
��$m�(��Qp�
��6D�m���� 
-n3@�f�(��Qp�
��6D�m���� 
-n3@�f�(��Qp�
��6D�m���� 
-n3@�f�(��Qp�
��6D�m���� 
-n3@�f�(��Q^�6�9���,P@���l�'J���Q[+�oq�{yz�K�V��Q����|y�9
-�%`�
�P䌥�@��8Y�D�#J(����n߱���u��1����)�&�e�9;T��Qܘ�K�>�$�x����8�Lg-`�TP�0Y�$���D�ği5��M�P�<#�9(�n�q�y��s�,Z쨀-31�L�e�7�@�`0
�`	��n7�-c�Cs�(�q�[b4�v3+J�\���kr��V`i��<�	bcg�[+ �?A������Y�`���y�j�q�(?Y"M���b�K9��[U��.���_?��'�����dl��k
�����O�A5�i��Ɠ���]���[G)�Cg�������CR���*
�6v��q������uSkt���N�!	}�z��ů;����l�6K�(����H�4��~‡(I�Q@w��%Xl�)�B��c�i�X�#�F�N���Ţ�tg�x�S�f��}��L	]���q�n*fo����4�r
�ݾ���|��s��;���_���h�ns,��w��M��8
ʯbw�W�P�s&i�;�
��h<�:`3�@��g~��)�%#�����f{[N;�B���a*:y�
-b�`��������
��=��o˹���mq��%�b�
��`�a9�'����
>m��%��%A6�F����oT`_��z�tGh�/$�:�J'�)j~��b�Sη����R݊m,x{�6��m��e���?�P�̖��j7.H;�#��y��{�9cG��w*�Pr�%�+F��r�5�s�b�����8�k�;]��z��ԁ���티j�M&$���DB/�?�p���N{���Dk�H3�d	s�.J�>՘L.��^�Fp�z�S�>�r�b�v����&�~@v@����v�5��H~wbg�	��Y��=/�Kৌ�m�\�����.7�wr�M(�5�N��P�'K�*�1k%�DŒe��b�ɂ}�
-9����`�
��k�_1�|=����}*6�i��
�J�$&�]����) �'f���;���_(�%^�z>fD�/Yi�Zj�(��7��ۗ������#�iQ7Y�Ch��4	C,t2����]��woI�#�f�h��x��l��'�8v$kh+�y�H6�Pb�{ڱ7��F"�
l���,���>h��b�
6Bb���X.*-9&Jb=Yd���LVN�F�OfV�N&��:}�
-|�휪���*��6��j�$���	2��h��C@����m|�O[���.IOC��4lG���V�5S�Z���D
W^�~W%�t���ǎ˽ky�X-z��4��#(��:���}�Կ��!�
�S�o[b��W8�
`kh�_�~S�����s����~X�*�a�F����ߝ�F��%#.	F�}i�d�h���6��/��q��+)�%��^�%���K}�}�Mh'h�Mse�>�.a�p%�Y��h�ڸ!㨭7?���7gr��أq�3�D�j�Wl��(|w�����±m�Zp���"�E��oE���P�=\f���C��va�b�D�#;����������
-��^@e���l���@��6f��6�}ͥD�D���c��k<��N�֌���j(ߡd>Y��,�^l��U��/d��J��ڌu��N�~tV!(��:J�¾s`(Wי1�Q��#�$h�_�$̟V�|"�a86a�F��f�?b_�j|�%���O����d|C_j��Sj���
-rl���
���f��#�-�΍��Ü�%��2�\v��$̷�����m����)r�}�-���ɮ�q�6(�C���F�`pP&�ރcaG�&�4���?3�0��N�~��]���^��U�?�M�^�\�J0	�'�KP�i�����s��%���$�"/��؋�A��+O�y���ߍu�ZxPm=����
-�g��;u�?��Wk��}]��,�}���bqh�{	iJ޻:�bu�����\C�q�}Gv]��±�JtX��w<6�|��0��z�W˔JH��Zh�_���lg[^�p6Y]�YiEYˍ���a��}y&i�'�zY�3�?�w���4�`S
`S䋡nc�<{��YX_�ߟ��v�����DZ���6d=����1���� ���m.m��>�n
�Ø�Ϝ�6�W���&8P�K�6(��[N��v��E�
dg)g��M�#0����8����XJ�n�:���������<�&;�:��*v��#��L��ט�U���`;�}����D�o����j{��)]	+l��9�i}�q��^���.l����&��}W��B�(�nb�T�T�~;�d���v&�%���£�^$�|vUcL��]��Q��IL��Z� �d�m�mqω�`�F�����=H��g��X��P&�Hv��?����$�?���a_Yԩ�gtWЎ�CQ���f�b�L�
-N��|��v�r�tv�ybQ���A�=�����\��]QGe��?����m�?�-\ �
-���G�${���q��dW�#�N���PI�*ߙ�e�����ey}{�%��W]r���Zbu��*a�z��}/�n�1��Xc�?ƒ~r�>d���z��l)�sy�Ϗq�M���S�wV/+|w������Sꕫg��KA���&����̾J��peuV`l3�UP	�Q��r�`[?�}��WsW^b+���T���ɲ��W�>��f$�����M��j�(����6kFMB�O.�������#��H��yp�v��>p*a;�5؎}_�}57��&�4D�+=\2J�p��˭���Q���7�'W�l����6t��Cuᛷ�Ī��l��]�����W
�
-�re�;nY�+暖�����J��$�m�ol��KC�A��H��I���44��/�2���Bh���6��~���:N�^n3@=��i�%B�N�r_W��Z~��t�)�4P��9�f�N�Z��98�ڶ��>@Vm�H�J.#�gԿ�m�6�C�sh�_0,���ݒ�Y����Y?Y���`���B�����`;�}����4(�u+�Zl����k.��gO%zwD�G�3�T6�`ߊ��:-�6�C�*4R�9����Dl���
-H�����t����\�#N��/d��j_�MHyI��<�EI0:��&�g]S���i��.��ٿ$�@�؎<���p�
���E��${iJ���a��'v�G�c�ǮPB�����&]�L)=#Znj��������^n3@#<F���p:w�ڴ�Xߢn�m�+h�1��q�t��nےf���9fc0x3/u���V�k�߉S\�%�o�`����`�T.	{�Y���}��8?�t��/����"z���r�s^�]��PW�m�*	oVoɽ��H�s�����WD�:�.�wE*�sFȏЇB����;�R��ߘm9^89�8Tߵr����3�P*HVߴ4gS1��32�6��������|-<�%l]�B�댵$Y]��[��6�{�Jg�$���8��_��|�
-+��N�U���͚�_��0�����З�&(7��d�g�gq��<��#[7YB�U�b�&6�J�*������\9�n�1t�:}�mhŵI��s��lb�K_B,Mvi�H��70*�r)m�i�
`-�%��RO�Q��N�K�i:}�i��ܱ	�A��w�*������0~�m��F%f��38��Ȋ\6����t|hŲU�Q�.���hcgr��X�]T�ɰ��lp����W�OC4Y:b���qѩl�AiA��n����� 18{8���u�^�\��X���!�Ġ�6��Hl����6��7��eN3�0p�$(�I�(˜�V�4���<���V8Y�;��m�U,�ﵿ����W��+^��^�2���$p�ա�?�rt�w����[D�O�J	
UzH�4���h��'TB0f]{|
-q=�X� m=�s��
A勂�L�����Lo����6'��H6��N�������qqh�O��%vJ��9��Ȟ-
-���4��{��p��q��n3�({Z
-gD
Ll�Y�>!�QCNl簘p��(��E���2�	�CR9�����̌�Ž�6C1,ڬ��B�nU�H&_�U��{���*b�TB�|�9���R	�=�q��M�%_ӰS~4q?�ej{,��������fu�&�������p�c;]W�,��u�j�9��س�J�ֺn��U��a2_�h�n�4�&(�n��H	[+;��K�U��K\�$��!PXzE�Q��v�Ĝ��%�{�}�:���m�q��G�k��+;V��f��X�r���Jnt�a�x%�:Pa��J�)�]�J�
�F�|;q�wœ��=O/�-,�D�@��)�3v*�QE?���f'��>��c,W/�lw�~�p+6���E�ZS���B�9���_B3����X[x'4ԯ�Gp�Q��U��}����_Q'J8+{���D��Ǿ��KG�
��5��|��������+6��x�ז(�$�
0���uV��i�莻vۻ�d��D�@��fp����+fj(1�E	�u^X5*spD�ʧ��K�����w�j���~���Q�Sy%���ʭ�����n3@�lp�p4x�o�����b����M' 
��Ƽ�Ɯ�K�=��&#�#Ey�+�$��H>��3h�������ž��p�����n�I�8����[�����
@!E���ˬ$�,����{�d���&<*7DP򉍭;[+�/��ML�ʳ��T'$!�x[m%w��6�D�
`1�\��nN�MqgCyy����a�
-7`9��MH� ��%敫T�9�2u,t�ܭ����
� ٹ:m�f���o5Z�g�� �u�"��I�>��mV��U�h�#4�>��;�����L����?t�5�i�5Þ�N%cV���]��t�(�z��\Z$����)S�66�[+�/���`�B;��0�%f�V���+w@���'O�~�F}%xs��.������t�{���y*�n3�?��T��{a��Uo�e�4w`(�u���
/�ljU��|⟛���L:k�{}Y3�ֽ٭���f���j�[<ގ
l���R�N	��q�[1߾��`~@��!����50���f�n���{y�]t���D_S
$=b\'��P����g�ӈ�������:9�<�p�ա�?�B�PJ���E
�D
�ӛ�G�U�F�7y��R	
��MV_��2�?Hv�ʹ�F�+6���t�=S���5	~�2b���W�@��Rp���r�v�᨜Crǵ����g�\śy�
`#�n���}�as�k�K>e��e�^g�{-�L��غ���8�x�0��7��C��J��3U���Py�Kv���~4ԯ�G3I��Z�����}+��g�ě�em��O���}Lc�ZlǾ�<���Y���̱�ټ~�<��
r�E�[R�1�i��J�ѫ���B�Ia��K���8�U
��g�@���KJ/�%;>����Td7��Ʊ�#�i
2��E��T��.ۢVW\�ˋPw��>�k	�h�\٪O�K��8�oP/�X��������/����ɫ�bǒ�Y�.�k��7U�b�^-aw���(y��
��3h(R p�׌�hx����]4I�Ru��C{���h�P~_�W�,�5T��c�G����jnڔ�Y���̭*�ٿ��9{Q��DlpN�͈���\�7�K��r�U���͚�_��P�@��
[��O�!��s��z�gm�����J�E��۱�k���M��uF��o�ј���7�J�OK�b�:K�mXOv{�`�R�q���<�.dgmu�Hx�E�;v�hSU�duvK|�Z||�%�6��q�]��*ͦ{��#p�)�Q����4�d�ٺ����B�D
Ҟ3n3�
-�ȮZFfZ�D�h�W�������2-,%̤�z&\��T�!���`M�,� �5�[��w"���mV��-�аߊ4����_�lGUG��1{��U&S[%�ѯ!�v��Z����|w�K��&d��vd���2��_q����I��C���п\

�IkX�vi9cc�u‡6�}�Ș�S�{%�
-�}�����S�BLb��<����G<�{j�F�M�	�i
���
|?%uJ�m���}Z��ڞzB�j�#�E�۠k�`;����!��)V��9%ߡl$h@;JKі�]h��j���Ud��ϲ�����._}�~��B�	M��n�ґ�V/!�����2�'���P�t6ia�`U���A ����ݮc��]�B�p���	]�
-����-�vɰ3�z�۬���Ѱ_C�dS͎�`��񵭆�;��)��Q�o5w���Ⱦ�վ��ݔ�N�N"j�P��|���q�Um�V~_p�ա�?V��MR�a�n���YnN�"���~

�c��j_�M��T8i�r����d�����Dw�OϞ�g,�w�yh
�`6�<h�%�]�pnEW8��N	0��Q;�_�4�ÿ�|���<�U���6+�W���E�L�`s�-�e�Ŋ9��yg�}jT��E�t���K� IDAT�f�I��-�����s��$KBѣM�#_��
�
���
-xw�MF��uO�:��
-����@���п�
Us���d��7�r��7)�4�C%ԯ!�v��Z����U^���N�ڬYϢ��KJ~ڗ �;�>��_�}�mV��U�h(���_��F�*~�ܟ@u]�����{T�W ��x�3�}�@I%L�_C������WsS�|�E��
8���2�N��ޟe���4�~a��@��i�vt\�t��#�	������\�k���Σ�\۷��)=
�����l�/�>�z�jԉm_攐�03��"k�`�B&x��X�D{,��Ͼ'��`*R��I'l�cm}�1U��̱����vK��I�U��ח,�߇9[vc�֡WJx!���п�
�0w�mY�o
�^�Eg_H�آG���1믄�5؎}_�}57�*�Q~�+��Wh+��t=�Y߶�Lj��g�����fu�_叆��4s�������2U�m�t�#��[k�V��5؎}_�}57����Tmi�JJ>��7q��9���;w� �h�T���R��8���њD�&��K�${����j��dk��#���X"�q�Ң8Oc��m�3�ǘUU�w^r���Z�6�TU�ĩv�Qoɽ+T/�L�bn��G#�!�WŎy�1C߻D�gTl=��nߏ�+��w
k8��q�6� �X.�[����C.���9:s��_J�鱠
zCC�Zx����
��]����\d�;�HRcrv3�}���6L��̱,��]���-��!.�5.�|�J2*K؟"+�yk��*��8'�[ذ��	�t n�:��^@�
-��<���d��
�(�Z;�5�}�?#�]��J�_C������Ws�I�Unœ�G+��¹�����w��b��g�B�)d�v_v%oa߹
�#N�vU=���ҙZnv]g ��u����MM[Cډ��P�=�Bn#�IHK[2{yh��>R����=������3�0���A����6��!�_��`sp���-���<EY��o3w��`��_�31p�
T����H��.�~nj���4/j(Gb�WΪ�:�s~xw�,��){2z<����mxW����[y�����j����HF���Ŏ�v�ܮ\&/��x��%�'��ٖ��Y�W��a<VC�#OE�01I{1���'�o�6�ܚ�JD��۱�k���f��E����{p�p)�����-�|5�n�/Sw?���/��&��}W�Ö|6�r>�X��D�';~��5h�]&3?�8��" ������a-	�0������:�tI�rL�v�=M%��þ�<�����]�(\�����\�����5�?�z̐��a�������4�~{�V�NF���6,`#o�f�����p�ն��&#k�&˟">�ܲ������m�D���n�ʼn�}A�
-�H뾪'�c&
`&�9ޓG�G�w�Xks����y	�����&�a궻�sg�
-p�:ufR[���`;�}�����V~�f�q$��y8ޗ�Z5�������fu�_%���,�zT1&,/�q��Ns$"j�
��}_�}57S�7�+��l�U�JĿ@9����h��f�+��������f�yľ�(�O���Or�7|{�ߤ�`�7�WBM�i���4�f�NM��B	Xn3�p�ڶ����ஞ�OW�������q��(�P��+V\�9/�Q���#vw�:p��V�l�7H<���g���Ӟ�}W����:�c,���X?�
�k��ǔ�0B�>�����c	�SՁH�}��+��fu�&���2�Mo�-�..-��s�Ο%<�#͉�<�9�S+!<����9ʷ|�9�Dy=Ύ�_8
kh��ͽ����<�fu�_叆-Lޢ���0�a�t��T��LG�⋮"�,�X�sٺɚ�1�EӼ-�r�w�i�a���%�A������T�����/��Ё�|Ȏ��%An
=�M��Q��vGJ�ȵ#����ܝ9h��5��f���?;�I�����ff�g;mS�o�O���M PK��a�0�zP�9�k�m�b�u��/ԙ�ԃ�}���&�����י~Ⴆq�v�"���츍ʄ�_¿�
-��q�XhDU:-[l-�q49���>��b�g
���T�	�䟲:4�*!����ޞ
;XǮ��Xd
��[���d����>��0ڬ��'.�ڰʾ��H�vK�����'v�����y`%Pȸ�Vt.��;��By
�J�t���v���R����Xn3�X���{��Y�uj%�vwe�|7�"
�E�ӏ��I
"�
-��ҏ]9�%x-��S�8����خq��Gv����]�#�լr����f(F�>�5�Y������	L�%z�f���sĪ���u���Vzn��b�\��ݒ���ƾ��>ώ����3���i虃�R��Ĥ
<����zL�	(�n3��6RzY��9�=��`lhl����6����Lk«���
�9z{�~��� 3}3�a��Xn3�2ڿ� �&��>��k��2��1)������
<�	�ӵtS���K�x�����f�x�`�
-��ْ�
���~/��9���
�}�+��$P
6���|/p�����V�����9?�W��{�����(��pL���/��k8Ge���_~KRq<��6˗�m��=�Q�������B������L��k�=�fu�\��M˰�
z��p\�`��`��Y���L�o�fu~�3@�Qy%_6^5�<9w�NږB���L����Z�g��S�����l���a����a�� ��9Z�\q���h�^�],m��}C�s��Ƹ�lp�x�DW|	{���O�k���TH��n>fc����8��@1m�Ѱ3�R���<�fh0CJtP�[�<���f�$�O��`c�A9��?��0fGvEܿ�s�h�����w#+=/��
�U�8�},:[�������X_���а'
��W���V��$�5\�9���h���?��(
����&4R��A	�r]mڿ,�`�����m~*t,�Q[������r{��H�[�nX}L[_��	vg��OH�����ސ��Y�UXB؝��͇�}�IS�����5\r���[�:^"d�b�?��~c.����<,�E|I"������~�-3��XMh�lէ�%�Y����q�Q��MX��z����b�bW��ɜ�p�k�qR���)�@o��zA���)��_����;~���ϡ9P����pǯ/���l�Q�������-��uW����{5���(��~�%V�V��ݩ3��4s��l��"��
��רK�.ӟ'egN�|}����۷��h���:�
���w�+���go�8�a�n�����`��j�猥����ش�y^�$;�{��ٞ��i�F�
G�Xm�:�#
-�g�����%���O�ܱ��y��ē���n�l��ކ��_�?�zB�I/�o�b�e�ߝ����Ϭ?�;��o

��W��tȩ
-����
-pD���@vzK�`�4�f�3G��ӻz�Ud|�XZ��:�Q����#�s����Zr��V~8�e�Ü�^������~��n�&� �K���-7c���[��ړ�0�|�v�̰���q�}�{���{'��m⸄K���G��y����s	nQ跜u�a�^ҘK��g�&޷(fԄO���<��wڄv�6�TU�ĩv�Qoɽ+W/%<�*��5,�PS,��ҧb�x�õ3J�:����s�9_���n�w�ʬ�c�
�`S�&�Oۛ=:�V�����r�1�`���;
-��MN)4ԯ�z�[w�^�K���2 N������o��I���tK��q�f�����g��}�;��ա�2�a)�#�'Pň���Q��&4g4��?ݩ
�Üf�D1m�	��S3��i͎&��4ڄI�V�.?e��6f*o�4�UjyF�J�%��mV���(WόѰ����)I�\ֻ����(�p���ؿKC���������
$К]8c�Sr�|B�q�*>-�ؽeB�	<��
u~	/u�
N�#��.q�;��oM˘�1#:hvE�!z��fk�
@��rۆRmC�D��������>�10��V?-���-�4S��u�G8�A���<�no��et	�DZ��Ѕ�nNb����,�|���QG��A�b����gk_�^����MEL���#+K�^�w�Ж\�]:�|֙������E���˻��N��`;��ѷTB(qF�Pxz����6}�1YZ����袞��7��M,�{�V~T}�z#��n�߸��ӑ}ݍk�躷A_i���/W_��EZP�����Q���N���g�j�����\�ө���B�z0�㳓��
-���=�K����~������r�K���oGy?e]Q�zC�*���/������&�غz[<�㱨�q�C����WyF�ၨ}�m!�8'�x����x��J��<�HD:#���w&4���kC�j_�U����q�8���/����xK�Ϭ�[��p��7�o�N�|�羶nͬ�6��w���5���땯VA��/�y��s�T��������&x�������
ޚ�K�/��������C�]��^l�{�]n���Ogd��r�C7�U�~�<�q�l�_�4�f��F�	�J���;iOƟe��	�/k��y[A��DO?�Q2%,&.ΐW{X��YL��͙y�������q�`���7a�0�&�����I�s�_lt5��|�%�p�|�AKzi�=4��͛�L'���v�{F���d_rBOBדil��?���Γ+fQ�=��
�Gl��?�̿��)��uK�A�98"}�^�Fz��A?�6Ȇ�uİW��h]�R�gy�5����}��'�GV[��F2v��(M\$յW�iϽr��Le�ߎ2�ه���fC>�]�>�
-+�Ғ���1��KOy|
�6/&Þ��{񔇮_ޔ4.o��5�9�2�xĮ�1����5L�����_�v�ڷ����?c�[|�d�:�aؓ�КU;��|�~����1�����*��%���i��/��õI��/�@��R��Su2T8�A��r���
�g\��y�x��+.��N�>G����g�p^M>�?���{n�e�K*Z$x�*�]-}�4����}�=�{'���A�
pԈi�Ȩ��6��U6���o�bE�[�s���{�zu�:K����{ο=��[�"���ߚ������C��j��Ə_�u�wز�r�;��N㮝w2�G6�[�$�-<h�q���zb��]��=��p��ҫ�{>_����\��Ϝ�S`������9�}�Y'��"�W= �L;v���&r黆��#1��39럇h}-y�V&�=xj�`�փ�͋����`�2�֦�v0;����ϽpQ�yD���Hs����V�y�J4��g
`CA�C�@�Glo����
��R���z
-����6O�}�uZB�,���	�?L���������N���?�ɸ~e�h�G�t}����4�T�[i�}M���Wu��`hk�����Z�ʏr�X������kR��{vX�%����<~X����-
-��ߗuT���DZ��yM�lݚ���wG_C3`'����nE���S{%��߄��6�B�
-9�����}�z�W�1㛆��~\��̜��p���
q�LӼ�#{y�S�����p�
������DN�ɞŸ�
�����+���47J����f|�g�����kRlN8��0c{D ��1�<����W������/��:O��vK�:�DT��d���m��\�s��n�6�-���%Y�<�9�C�a�
DŽ���	��=�&�/'��9X��{�s$��/�(kyb�@�-�"��5Q�|9���vʂ�o����,"�C�_�u���fЂӽ�^ޘ�KbSq��"$����g��J���wӟ�Kr)P����H⒢\�﫧/��:��m����a�%�T\R���T
�������9^T��K�#ƪ�?��β/e~�0���_�A��m�*�	�Jl�.�3�E�׺{�+[�b�sǚc�E�n�b�޹���{�N�_
e��4����n�߸}�m���b���Z�4�b}~�b��������%�Hk��\O�i���N���6~�����z�l˷K�c�8��U]������}�������5�s��^b<3�������������G�c�{�zo{C�M��*U�F�+��4NN����}�����v�g�ĭl����޻���6�Aþ�Ű�v6\���]K2z��z�XHzW1��V#o7V�3W�o
-��� �ߏ����Pn�;��w���Ip���������n���5N9���˂ס�r�˿5Y��TmMJ�����y����k��ۄ;
c�)��/̓����u,>�0��t0�
#Fۄ�� �Y�{����=�]���'E��E�r�\�tW��
-NLX5���e��Qh��PHl,�A;0f����k0,��R�z
-9���l̔�8�6�!����;H�F���֍��F4=��B�ӷ��A�&b����!?����C��������Ь�:
s+)z��
-
�w�s�<m��	�roЈ�+6kZ�����ߋ��Yon��¾k����툣��8���q���4)�p��a�#�q�}��O��o�pt�W%}��'*d��L���w�<U�O�F��I��dI��e'��3��I�	�����������7Ͼ����Ri���X���ڨOa��l�<gMؓ�`��d���d]�KŕY�˯}R�z9�V����k������3]3�蟃:}�vv4�P�G	�:bk.�_��<��������ɴ����HB>�b��6Ͳg	��j�-�c���{��"&/�����jy���o�ӻ��5vB�_US�w �����7��@�QB�����p;���	�Y����;��v$A`���Ԗ�1{lU}u��{��
����C��h�<����O�iK������פ)o�F��X�<a�����O�G�������
��=z��������~a�lM���J��3s{����YJ�E��"	��vVf���ų��.�v��0
-�[�)����O�|^-�aw�}�.[���/���t��_�P�*Q�GUkV�H���F:&�y�.���_:�V�)����3��-���w��ٷ��NÞ�3�<�[��+�<󒴙�����{L��� W��x&�L��;��\Ee��.��)�Ü��1����N�*&�K
n�3�E^RQ �0Z*��"�k����M�4���v�z�q�mݯ��]ԩ{���ջ�a��"$F�:x����s*ݚ9}�9�]���ԝ�FQ|nv#[~����Jn ��P��d���
9	������2��^�9�̬�1k�3�l^����M���%GuxӋ��w��V����c��^�X�(y�J^ތ-^G���TM���z0�\ɞ��Bǀ���!�:~��9RX�f�L��y�#(�z}0�0��Z�k���=e�ةU8!	m,��uҨܣ�m.CO����}&��s��#'�hmh�d��|�ֺ����2/�:�*�	g��U�i4_ڻY�6�@�T���
�,o7�<7�{x���.���L@#�m��m6:�Y�5;�#J^���w	U0�l/VYjO��|f��_21G��L2�)Xr4��*���~
-0���9X!�.�3-'q0�i�*%q���"Gw���+?�rf�W�:Os��j�+�m�D_c,��1�~���l��d������]�<��������"ȘJ�1�����"���{����B����gߝ�F��ޗ��^̬����9K�P�Z���̀�p�'�X�c�X��ݕ[b[Ϙ�5�68a���Ed���,�N�Z27i�I��N
���H��9~w��-�ږֿ*18���π�ȸC�	죶h�k�X"kb��mޛ��
Zb���̰����a�uѻ]�x��._�ߢ�E�L�kc$�_�4����O�,J�I��t}���7�`Lu;�g���6[9�U��Dp�Sj�WY�4�l�*e�Q�|��O�����H�]���_�
-*����;~�D	� IDAT�����bc˵ô[s���C^�\~v�e��?�A�s_q-�[��L���d����K�w6M/�dZQ.�͙N��x�77qV-qօ5'f|��Q|�}+a8,$�
-�;�+���kn/���$�&���Z-m��F��
-�+U~�=�Xr=%_�Py�������;����$p�5"�Ľ���x�g{�gH��te��F��9��ǕXr�7�q�ⶡL��	�_���)����l�PiD���:D��/�TO^��?\�
���4U��}�ۉ�[���n�g��mk�ߎ�ATd��K�5(�Kh}ߌ�٥IJ�{�>�;;w�а%�������ٳIA��
-p�c��&!�6�w�؟1$�c��aA���x|�S�t�5Fi��8����� �^|P��Gc����cK5�w�#ښ�"�-��=��Ȉi�#�
-���u\�
-9N)��,F����ηGK,����3T�����Wl[�6��Mxt^YM�0?�������O����m�r&h�y�T��	EQ��kP�pwo����§Tο��)U^Y ��ߏK�kY���t��C�$�;��@u���@I�;-6��=��]�w�?�i?N��7�s���D�s��	HU��������y��VA�]��+-w�����;���L�~#�_�����кe'����,@UUf�#���_�M�#�%s��[�=m�<�]��mj4�A��5?��kN�����Ȏ�?����<�c�u����KW�5/�k�Dyu�Wqp�L
��w�B7yN��(�ܸ�ohX�w�~��j��=���a���
���~�#j[y!���oc����@���Y�W5��Q�6�{���?���e�@mզ����x�6���59yv����b�������[)�
-�S��!/~^f�b���*�i��K�n�9��=$����)�d|���=1
�^��w��ѵ%�F3{Y`IT���@	�n�MT�+��.���FwC2��d#Z�X����0�zZ'x�Ju���,`�&��YTe�E��#Z�eQ��[�k����
-fk�Rlѽ��3v�H�]`0�
�C�ڊ��9X���MT[H�τ��L�p�C_��0zw	==��'<�K�~�~c�l�����|��;�ސ�y
-���m�٢u�AG��4�Χ���73���kX��	X0��]�����9^��ޟ�6�\�؟u�WL[����!��2}�<��>�p?M�#NL��D�P\�蚤���%���Z,�c�
-?�~8�5�g��#�(�.�����\���o��Y	���EA���^wm�jno�6��?m$�q�c.����}{_�����;Q�bgƺ����y�	ŮSKꣶ�%�J�G�h�r*���vK۞�e����v]�Z��������E��-�������`>�'�gr����TY���O�#-8[������F��cU��X�2��|�/�_9w�t���-��}�����~��PJ{�/y��.bJ3-��/9���`�Y�=Ԭ�l�:�v�yֻvB�Nv�W7�lh�z3��E,�0�%�|Ր��ߍG�jX�!Rؾ�o=�ɺ�a�^�Q�poi:�1S4�Go
�rS�������Ƣ��t��{ǻ*�anF����N̷2Y����S:���|U�3�����B�3̝�A�f��݋qe�y
-���-,4R�\+�g�'���1؇U�"5�&�Nn��\�U�<��u��t/�yM�PK�`3���.�D�+ɷ��4��m�7�YM08=9�m���
-✭�&�͎hَA���V8VP����
-L`-
--�#f�c�ݏ,��b��%�F�ϑ�v%��A����3hj���Z��Ÿ6�N���ԣ�m�����$�����{e����|b���T�LV�����g��D3p�n�ez��j��XD��ݡ�&��f�&��{���Lm�Ϙ;߾��$�C��-8����hs�ހ�eD�\�4�Ѭ�v(7A�ۼ�%���
l������-@����^%��r
G�������9�Ԭj温N��Z�����K�7��Z�9&�Tx�B	�(t�xBlV%��u��p���=�T~�g+�<yp�-ҶB袼"�6�S>�#ν`'m)Gn��Z��=����%v�38�KF���=3�w�-H$'�;�~�w�T�%��\��&$�W6*�T��%vm�r�bU�D.��c�JJ�J�>�ƌF*v�V��^�T�B�0
-C��v�4����v���E�����C���5��π���Z�������3�1�1}:�Pd�o�ں�p���e�E�u�k�u�ݾ+
��X�wO���]�?�(�F4���X5ƪ��׬�(p�Kl֖�xU�؂Oma����<���6a=��3I�
-��7?�o{�Y�X�L����u_��"F��\�D��BOI�y����&ik�@��L��#�̄�'�T/\&�L������9̱��X}��|�h��H���0��C����O�F�ی#7��E�\
�8���)-�U�p``A�s����mr
�m�-�y�ݵ#�f�����L�?��۝am3<��"�5L6����q/s�a��
-���&l~��Ҏ#������f���Mr�Y��6Y�V)��w
��]�w����37*��ҩF�ۼ��qX��Q���v���=��
-O&۬nG��Z�0�ȵh��Ulݚ)��F�S�r47��;�-/A�$mc�O�}�~'
�<������|�Ԭ��]@���
S�`(�7�~����X~�NY9�K?�l��;x���(�|�s\�]�Cw`���ǘ�����&���:�
-�ߑ���w6���~�nt�Ͷ1X����/��{r:�C�'�k����w����K��'}��d���(���F��@=��q�4�Ǜ��k?���{'ts��m_T�D���L��-���0繉�k�;I�a��R9�X�l��}�I<��f��~p�j&�;�m�9s�?��d�<���x��/m�7-���s0;���J[|�����_p��E�n9��-��_n�$n�u~��Y,'�#���gg�}l;D�+�\���7��#%Ni��*�i�O*a#gj�q�d6��2��x�pH6�{E ��MˏX�������Ѭ|�˱V�F7�Qyi}L
)y�UQ	�&i��Q͵�($k��`���x�����-y�C�iM�=���l&հߜ��_g��s���ϔ����ܗ�8�_	�O!��kM@�
t0S/T�F<2��`2�ll��}�h�Y�k���<���A���EznBrLǭk��V�G�F���u���D�ۼ�����1ƸȘŦo��N.IVF��_���_�f;w�W�
-�X�g�b�h�}ҋ��a�"��E0����w�����!l�X��"�=�\�J��r�ڔ�a�����^,pΡ�m~!��<���^Mr���������	�����b|�R��:����vR&���̺���OĬ��bi�Ѝ����)i�t=j��u�nn�/4?�U�6�֎�Ƹ:����C�z�����	���/��EN��Bx
-�Hqb
�s���3Y̙���,���d�m��hs��5�؈q)"y�ը��f�����sa�H�4:��u췯�*���l|��N����aS
N)���K̓��m�T�����
� ��#{y��ϦO��
��o4�l���OpJ���|}�Mp���q���
-�dѢ|�?��y��y1�vz��N��^���@�d��u����7�Y�kآ��1��Z_v�'����+,���C�,,�t/�wW�e��-ںZ�Y�Xr�
-;�p��R]N_.X�%�$z�����P5B���n�j7�/k�k��e�AW(a�=�^���A#v+_��-�A�i���ޏK��w�߈�aa����}��S���R�Kq�G�Z���0
�1��r7��}�6�ڌ�眘��np�_
-�k0�C-v��f���v&��Q�a6�k������^�+習��F:���"\`��Q���@�G5�=~kU��yPC%��g^���/�T��
OUʗ�G��h�h���^ʟ����̺��p����V�a��ΕJk�<�;n��
-2�������N���V��,�K�%��=:(]�������`=¦�c6�1���.�����y�gqO���
<���{S�筷=e%*]��?aߴ���E�}3�
-&o�輧L��M(���`��GgM���u���#Y}����,.�| �a����ew_�'���}�Q�f	v�s
-�6O��p�����g�G��E��K�e:� ��Kb)�s����X.�Q���i�����K�̇��K��Dx$-�E��^����9^���#��}�i�=�xK.L�����m��U��X�x�ի;�.a��
���J�s�3��MG��K��z���7�m�$��/�<��������q�d��u�m��[�d'T��*_�꼪uX���_u2��nUN���&k��XA��҂t1
}5�Ӿձ�br!��á;ح�-�Am��BczXj�Υ��xV;('��-�:���8�n|�c����,g�2N��n��-��U�,b�(���1�(_��X���t�TU�"����zf������
�	�I'}�B'�%:�K�ۘ�0=�k��SQ��§9��
-�k+��:�bv�S&�7r��R�@�E0Y��t�/ȍ%K��Y�k�߾-v�۠W|_�o�V^	���'Y7m���#��Uݭ`�'\�|�C�N=�潽������Z�6�AMǪ��d~�ڿ*(��`��i�Vn��1w$ķ:��@�Il��XOb�8��>뇳��B5���Ƣ�DA�o��x4�й"�����������?$f�"���T�i`�4��{ٹ�q��u�pL�ɱ";�3�a���W0�u�ԟS�DU,���V����'�}}:N���+�&'6kZ.͟5�r^�@@	�x�Z�>�c�{���q�5Rm��]e�rl0T��Qk��"<U���dm����.���2�b��3m4mW��<{ULHZ�\ �<��"���|�B�	�p��ȭk
-��Y��6Z�#K|���6x�
ֿ�@��#��a��p�/)S/�R�������E�����!<��Zl
Tz
�}��?����؟>A	i5��"���F?֐z�[��i��7�9X�_U%�Sp�Nr7u*U>�U�"�2����^:bm'K��{)rB�|/�J}%W���Q��<C���p������91Ԡ�WK��߄�jE�֙�t�v�b�a��[d�屃B�B������UI��d�S+!�)/�a��������7�k�'Ӕ�{�?�Wzθ��א
-3�N�Xj���m3�rij�/4��-UX�~&B� 6u-�R�4r9O����O�T�=�y���zW�dB�K	�W�x���e����
-�J�a�T�G�3���eEM;�oᬪ�ڞNV���=$P�3+Qc~�
f縕����{*2tk7�fW/<�oS���
-hcIy�A=D�F�,��V:؋Ƿ�DZ���!t���La�6��?���p���8�� �pU$�3)�Ph��e��~<�F�"�gU��k�]J>�d���k;
-�J�8�u���D�P�6
�]���w�!k��7��Z�1���z]��"��(���jo�d�K�%-�NK'd��ݳ��|q&O�O�%c4n������x]Gn���	��1g;؅����}K;����L8��/c?�3�h3�R~��Ȯ`�?��T��[3��p�J
-��$xܖ�NT�O�n��#���sYwU_��
-p9�?��ף����8L�ű
���bh�)����r{�N�����0�����9.�0���%�>�Ȕ��8���_���o$��耒0<�_���~g�_�p=�č1�������/�		��Y(]/W KFC����-�t �X=���2el,}�7w�2O�_yx{����
-E9�}/7(Ϳ*����˕��M��.%�,T^[� _��am�$b���ShD}��v��~FE��%���>∍)2�{T�i��d�F��}Z
�@���F��:y�we��ہ���NͬK�����p:�����ޏ���6�;��%�D����;�s������X^�e�ڲ͔�eږ`���0ڼA��4z�ރ�k�K?�����2h������a�83|�M��'�q���q�r��A��S(�ko�M|w�-}פ�
-m��
?��a%�
-`g�~X�Z��>�C���?ŵ��>�̈�uZ���N$��W-V�1��J���D���w�6�C#��p��4�S+�͋��y��p��6��t���}��`���n��l��F�̥�X'����ZN?!�vN�$+�o�0�+Ed�LV���ޒvےk��C��O�aW�	�eɱS~9�C�[7�xX
.��{���5���X�X�N޻��\���rl�0�F��ڍlf�8o��܎�B��
�4�U�QUhk�mֈ<�mG���s��!��o_IU�d>-��������~�M>j��k���!Đo�!"�)��Οi���`���N��
�N�hr�JQ]��ʴ-��?�}�}�m^L0�,|��3�+ɽ��{O�Z#�¤2hd
Z`�؀=�(�Q;nr��
-�n�T��wŮ:����$z��еr��c��Ml��F�+��Bc#ҍ	[�mO�� g�h�f�뢻|uk7>@�Fޅ|��s����
-�����M�SK�F��`��5߆�GF7������������]r_u�D�����R��~Bk��5ْy��t*����8���Y[+o�^Ǜ����@v�o�w`V������p�=�6Pm�i@����w,�Q�k`���c���ۏΛU�_�V~_p�
`,���op��z�$1p�g�p6<��=Y�	'���_�C[�Io۴j�+�k�����R��
��$����{��R�`�������K����n?�`x�Ԃ��y��0��[]��������osj�8�(�+��)=8?ܿ���'�_��8�2����,+T��f�i�
��U@��r�<m�%�7D�p���p~��ls�V��ճ���ɘ��?U􁨾_���8 �s���'(�F�[�|�a��1b�O(.x3���f|'��ƯA�
-���v^W�`���x8�;�����D��>�Kѯ�a�s�Of���6+i�vu۷p��i�H�ue$ٍZkx�[ӽ�?�v
G��Q����{퉯�}��)0��F+o��	ս���d���v���D0���Ӊ���?�d�͎%<�YI�+�/_�6�h�a�`��b*�̌�����V�.�^;)��l'.�J&h����ȇ�|45xD�J�p�ci�s��9(��E�ә۾�o=�dBn)������4a��ȣ���]gi���h�⪚�&g=�y���8xK0�gs�89-(!1Y�N`<7x���޻s<(�$�l��ǘ��,,@��-�4��\=x�d�M��cx�4�����ؼn_>��dؗسΧ9ͱ���?�������ѧ����ٞ��nsl�o����1�����#�/�͎9�g�NX�`kԻ�:c������}ߟ?��G�s֣!lDb�]��iy=�ֿ,2��%�v��;ٝ�tJ�P�\��[��W`3��l�6�Q��B�go�Vm6ac�9��ן�,�U��q���EE
���p6��Z=��g6%sD
��X�Stz/��R����2�c�
�h�Is�&W��}c�ˢ�f�R���obv9!_?�jQ�؜F��S��Yҕ�0�iTW������r������mN��]�T�
l;z��H�� }C�x"a2v���A�O��
��������eVL���t���1�٠\AT�����v?�$X���D�1�6v��A0Z,!w����O!w��>M6t��6���{�M��߯Ya�ذC��4��:Nv�܇���b<S�}jW�Q��a��<��
*U��ܛ:!���/�|}�v��h_;�d����|��o�%��[\b��3n�f>wQ��@
-���u��^n�s�1�.���e`�r�PLR����ی	/�a�fo��+��(��s߂����ҧ�%�U���U�s$�P�`2���>�]������
-��h���
-f�K�=~	����<�����ͷ�Z�~ؘ}"@1��4Y���,��|7����E�����Y���ˮa��y IDAT{ı�:/hVQ�a�=�h��,R��z�L����P
���
-W�7.�:��5�G�ȴv۾)5u!E�_[xNaf��:o�y��,W���6_����3�����P��]��]8�7%J�v�ѤjGl�YM.e�mE5��Ձm�f��h3�E�T~���j&сWҷW����ݎ������Ym�'@���~G�ZMl�kl�Ò�6#�,g�p���N0��6�����I��ɴ��*�iK��ѱ{�ͱU�a�Y�[�gzSl�0R9�e�ł���X���,���.�����ǍY�/Om%�v��K��<Gn]8a��CǶ��
]�4�[O�S�'���]�ޥ�3D����FQc6SV�ޣ��$���=�Ýls'����d��k�E֥��R�c��K�ŜJ+�$X9�*��N��Ϊ
-px8�D���k�~K25c���M�>el�0Hs����jT/��
����W�.�\z�B��5��l��^]��
�6v�ʬ��M����p��������Ƥ֦�v�#�������L�X��v�~�	:�a�x_M:�LP�]�
-3�N�УI�%��&��^f�]��o����	�`�؂��)�Ĝ���0`���m$S�~�!
��F��nD�䕸U��{�hy
�ޥQ���Q�F�'a�8�5cy����q�l�4?�m���?�r� ��{��^�]�g�yG((�v��\tN%lt��t#��V���4>e*XG<3�����2�z��潱-_��X(:�~.xN��k}�P$;xP=C�f���N�W�&?<X�UMLm�h+��aA0���V����nҡ�c*~-�4߳s��y1�8f�gZDl���1LleT�vɗ�O�i�w���L�ɏi|}ih#6I۟x���&�d����9��$&G�	��C�K�H���m��
?��a�VO�������og����B
�I�w���_-V��#�>�^���z$5�W-��L�&�
2�p={V�����otU~t���v2˫�����mo�P�y��Y#�/�����4��3(��
�m�W�7`K.½[.�-Ϳ.��:Ůu)Ww��ߟ֚��g��lq�����T+&<^���sm���/	����ѝ���S�F��إ��ǻ���
��^�M�_��V���E��]�^�T��5�:�*���t:4:��j�9�K�u~�zEv��o�U�ɂ?��]E������D����o��	b��r������{0��b q/:ʔ��n�1�+УI[�c� ��C�N�����T�%���
޾�v;���
-xC��fw#�bt.��{�+�}[&i/&hYc��|ʗLPZM�삁���F:I��:�y�ع��Fi�EY� ��r	���L'ALI��u^0���
��`I��")=�6O%a��$��f�
-aY�b���s��r0HY��]�(1��,i�&��
��{0���.��am�+x۰���MkXcr�1S��-*�����{B��	>���r=�����GO�W���?��q��W�n�[m#U�`U����<'x�S2i��#q��N0��_�j�R�
-Z�C=�L���Wq�j�]�T�ׂ��Qk�T�wU��8�N���r���q-;�!<��bh�Q�9�BIks
��g
�@��5j�����
-���w#���m��a��V|���M�o��(%����k��ok]����\$�8�����v�γ�b��7�R
�;Khlm�%^!�9�A�D2�𘄌z�O�I�Pz��s���w��oܭ�z`u7~?���X�����6�
-
���_4�N>�2�~t\�ašt Օ0�����mvò������f�w������ۿ��e�t�T����Z#�K���C���E�R�|���?����4k�6E���֟.ۮ�om�d�X����6�j8��=���EC��]}{��ʎ�A8B����s�h�Ėf">y�w.���4{}�C�E({S�����/dk���[�w����O�gVۿdD����oP%�!я9�Z�q>��CH�J�rl��0��)ߠ�G�ُ1/7��&���b��8m�*�ͅ�<b�a��ưM�R�nID�W	3�p_�}z��s���i���;�E��D�}r�ѩ�
^��c_��Z�Oe;�ڶw��oB]�"���eV�[#��g�ۜ��Y��G�P�6�!ZG't}�v,q��X2<�>x�\��O���ߞ�C�\7�q�ܾ��^b����5�H�V>�c��j6������Gu�%�m�b�1�)�`���u,t}�z�R��c��=NC�^��1��.�i4j8a��EC?�0�܀p ��w�;�y
c>y��������!
ʯbk�
k�V�ۼ�`@�%�]����'�k����A�*W��О�mں��}fӠ�}�@!���ؓ�gŪ�N��^EU�3�D���Y>w�9T��Mthg��c�1ނ2�s6;���a;8�ҽ�V��S4�g�]�GX_x3N�]n�?_��:I�T$5��s��Kx��d��`_BVfVy�|hA��t����S��<>@��	��?���x�*�)�ǖ�J%�
-->�w�叽$��u�{�]�]T�xI���(vs�3r)�Ċ�\"y鋚2��/�������TR��$��"	�%���/B	��G𸟑6v�Ec���P	��K�V�k�W��
-J��#�I��b�cx�0^���hv��{O믣�W>\a)��D*{�NEt2��ʶ�#���?����]���wr�_N�SPD�}�Y����m=�&���TI���i
RR��j(QR�oNE��:�����!ćN6`�փI����uʥ��w�%���q���u,���ড়���!�k�\=3LÎ���5�س���
މ�S�Եf�[&(K~�i�ꪍ�x���-a�v%{�Q����o�"&#�����rD�_Ď�Q�3��2@Wզ��Z�U�K^y�s�j�ϼ��2����[��
-�K��\�.<��-������#�^c�`w���BtK���\5��X��{�D��� ���fx �r+�P�zf���rR�}zgl����L`���T5�
��l��;*5p~b%�ŭ)�6EX���O��N��@���n�p���.���ԟ��^Z����1}\";$���ħ��_�L�l���B�t/{�-y�{�oWml}�S��6O�9�[�}�ّ��u.�/	ZS�wP`0/0<	�3T#����GJ\\�@����^��%�7�._�P��'q���������|���ޑP!�Ol;�A���0����^x�C�����%ٹ��.�|_�/q�^��
-pWK���=�o�WU�裋�ݺ-��]�s\h�-������Qs�R�Z��������-��#9�J0�%5̛� ����I~c
w��^Kh1��/��)��Mx-���ORwI����m�>�?&���
-NҾ������m�/��� �74�U�ق��9�[xy�b���3���þ���?d�h'c�e�c���8N�\Z��wi��b��G��D�.�N�!��I�A��K���6=(-6���҉���֬��ِ����Vm��Z�}�m^L,�Lc���|;�������4o����aɯ.�N�!@g$5�Wic���M�dr��Q,fp~	�f���N�y�j�������![�&��vQ��T�W��u®�Ŏ�K��No��{�_c��N�d�h��TĞ"��.�6k$�N,�����Qj���C��ZlKZ1��D�rg't�
-d���=�%aw;S��E�6/&�N�6��E���	]k�m�����(�:�1l��m����6O�(؜��T`E�z�е*e�(�P�z[@@����N���K��}G}�%�/���O��m~o�o>�k�\=�����v�%��m]m�V~_m~�_0^`-�~`-����X@p���}�`;m؏7M������mx�y��`�ZtE�ZA�2��:�	[w$�V~_p�Av���K$�/�O�r��^tIE.Ͼ��p���_�����+�s��4*�����v�z�dN�7T�u:�o��<��ú���ʅ+Woģ�ݾo��`#�����q����r�
�|��&1�4,o���Mx-ף���ΘP�ߟs6Ԕ�t_eo"(6�qٽwY$�$���{��.Ġ�b�,�þ�[�Iq���f��1v� 3ܷB7�)����'�>�x�i��Y�6���#|l>
��<���Y�����6%f+��#��g�1�0����K�E�smb��	�����\bS"������q���%�V`Kvfkl
n���1��d
X�o�7�L��v|򄆱d3
��-�]}�����w�?bR�K.L7'��\i�dAL���w:�;qsz�}UB�IZyA�TK0�g�����n����R]���ĸ�����1�1|-�N)w��FݹG���v(C����G��?S4�eƤ�����ذ����F�W@u����G�g��6c,�ĥf��J)�v���_�Kz�&Y�/@4x�Wj��k.���L_�<��u��aS��y���]6�t�yk3�����۬�jK,y�����kM���x(`� ��q\�1�vR&Oq�d{�"S˅a�!��g�:�Ńg���G����NĘ��a�f�����Ps��	��`_:�q�@��0�W�ާ.�P1!~z�H��r����,b\;h�k;Y��/i1��K�;����J�%ڥZ*/@4��O����H�(�E�\;(�qK$8������i��0���˛{mгo%Ay(�Y�m���ui�-�����&.	���aNK�S�"�)ls�yR�P���_��^ē�>mΩ����7��f)N맳1��63��;e���#1ta��AI��D�dzu9��*�V~_�[��~��&y��\��G
0F�
6�^�<�`������w����.�no�+�q�$%�����F��<lB��6�i'V�K�
栳�nͩSy�a��!�*�H?�sx8K����]X�;����q�y<�����(��6�$��_����O��g��ӄ~�X~_\�%��T�'�0VU�����9.W���o9w
��� ��(F"[�DʢR�&�%468��(�B���)/=m�
����}�G�nls59S�n��9�OI�3�K��rnߑ��
-&k,�v	pq=1�v�6��2+�:�W)=;3���$��K�����ܝF6Q�M��z��y�Ų�O�#7��|�r�52�;��j'AZ�BT)d��G����ѯ!�f�($_Ȧɽ�����.B�b����ltw��;�_�C)L�ތ��}O*�Ә��Ls�/�*�gޅ��D�������1�&i��meu�X��cغ�Ey�]`��C6��2�=(z���kPu�u�v%�FFQCT�j�ٷ��o\2�*�
���;[+�/�͋���
-�IH�^����X�:e'W;�b���*����Y�pb[��r]�k�Ŏ���=q�6�����6(���;:���3�����۬y�1z}����7t��
�Gd�Y��;�/h�/E[{H�d��_��-x*x�a��ַ��@y(�y1��<�<(zm���BS�\C��4�~

^[�T�uq��*�V���<���]��FG�_�ޗ{n��4T�5 �c���^�%�
�W�vX�X9n�[�"�k9�gP��I�6K��ۈ�ۻ�-Gu]
����9�!�h
-c�܂s�~H��(� ds�?�~v�;;1���DW�i?M꽙�"x�R6��;��CߧF��퇯�C�.$_?J꽙�"x�rK��~~<��[��?>0bաj���i#�gA�3�]�~�Gr<��y�3a`
�l|������.?b�3#f��Q�c���Fn+P�Ϩ�=`FټѪL<ڇ=�d'�^�,�[�5������]>�b��i�[ص�>��g�,^��x�F��2N\ۼ�,}��^�1G��������)��=�CQ?�Ҩ�;C������)�_���K��ŏ�(���M��מrl�s�a�߇��xz�P�5;�X|�c����{3�_E�e�y�Y7��a��K_�������ެ�z|��&oL��~��Y?x���Dx���T�Qb{��_ۿ��Iڵ��v;�ǻ�g��,�s�w�D�,�ou��i���L�WI|^�������2�u�w��ӳ��ul���We�>{vjY�2��V%�Y�V��*�k�u���5�HJ�|��>�U�{���۳���kutC����Q��+��u9Rݾ|ivH�8������cM�E7=-���HJ���P���Oz���qS���A� �Y.ڙ�k'v�J��-H�wv���;k��o��j����[�������^�{=�-�ǡ�C��g�_(��?�G<�A�G�!lpH���Ok[$���B�f��*_4�j��h$�q�yv��O�ۇ~�_%u�y���:�8��a���|�U�w�c=N�:�^�<�ﶘ������ӹ:[ذ��K�3��s��
-����"���X�ٳ�]H��3{-³��a���
n�
 �Q�
F};�o�?�m�c����W��7����Aξ�ﯽ�jL6��$�͍�M�����1����Ϟߟ�W�.,�s��I��~tJ�c�!�}�c���c������/�f�˫��02�=�6o���A�5�ȕ�y�%d���Ւ��.�׹<�M��r�+��o�m^ǎ/��C��#� �#ďV��+��L�W<k)�{��v ��#��#� �#ď�G��Yϝ�&��*��J���R6@�����G�7׶��xc���U�C]|̪��X�AA�
e���g)pm��P��?�/p�_������n1o�����������2�ݘ��56P6�,oN�e"\�����Y~&��\/x̢�o��Gy�W����>Ѵ���s�-k��t�'f������
T��Rݘ�ۿ��4��t���Yzr�� a4�0xx��?B�c1��6�m�t�����s��	��ϐ��	�*�g-e�ŎM�G��n��
�mLv��W�x��`Oݜd�(�
P6����|N�b2ޖ��K�r0�I@GM�gON�^ZUk�=M������11���m�ī���x�`��㞞V��);�k�z�ޗ�
�l���R�bv&ޙ���F������'��0xx��?B�v�U�/�[gɺ���Ƨw�U׋1t�K꽙�"x�R6_l1�'˓��������ߕ�0xx��?B�ʆ��n��N��Ƽ������͎�S�_E�l���յ��NÏ���}�	��6?B�aa8\����YY����)�Αr0ߤx&GA�P6�fC�/��$x���K!�:�!lc�~��{3�_%u�\B��
��a��!~���C��H�7�U�Z��-$c��p'�u�֞4��9��Fxf7�^|���M���I��;o�?��9�6��$	�)�
-�w���_�����{�ٔ�Bt�����b�6����Roᩃ��h�F??ê~������'�^�u��~k���
-��:��f�v���_dYv��x�xw�u��}�δ��,��6�h:o��X�8	�P6���rfm�7�,8ۿL�UϮg�)���V&�
�F?=����N|��+P��4�W-����u?S�u������,�8��Hc�t����}�H���U�Z��׫7Om�]�������g�||��2oL���F���������\��2m�Vc�I����]���?f�c��۽���N�Y�u��z�.����e_��3�6=Ir1ۜW�I�e�M0[֪�v^w�>m��-�ao���6����=���2.r�p�U�z���s}��`zժ���>l�:�������2�6�	{���	rqp�s��;H��7��
-��:�/;/��������nu�5�Nj�No��%��6u��(���;���^K�q�����!�@��S�(B�azk��O���~7��{j�������]|������sY�\$����Q6o��F_�{�;�;C]�{=�2L���6K�������n������}&@LO�57n%�7��׳L���IDAT�b�E���"D�a��(���t�=���Ol~�P`��{���:�o8p�s����u��fi��6x���D7rԏe1/���l�z+�����Y6�����(So�L|y���
S�.W)s���]�S徶y�M�����<
�Z��{y�r���H\6O�x����{`t&践���,�5{y#���e�z���uc�v&h�&qټG�.��=��#8J��g���gW���Fp�:=�-Ar4��%��OmN�U
����t�P����:�	��nR6�g�
:�
 	��}m3��q�6�����QJ�P�x7��U�uX�Z�V�u��E�u'��\!g�Ӯ�m��6�t
��:pj�C��͎:��ƚ�����!��T��+`�C����[�N�����!�:l�.���'<�����e#�Xӳ�C���jqf��.�\N

w�m����m�����f�,�/f�1��	m̨��U�����۷@@a��Z�>H��k��'���ь�����
Eu��|Lw�umս%Z�C�u�m�c>�ϯ�Y��m>HL��S5�:ZhH��߬� w�����U5ˆ�)���.#�:����x�ۘ+pHuWް�0+�Qr��W�8�m���u�Ԑ"�R�í��c
�����ܹl���|=�t|'���/������b1��C-����j���ܷ�Č6�O��+�� 碘��
�}���"�� ���}��G>�惌�\6��J���qZ��O1C�Ч���\�B���m�_q)W��Tn��u5˲V '�mW�Ӗ+�4�ܩ6����a��J�c��ȱmzu�a<&��������1Z�C��l]��\��Cz�>����HJ�x��x?�aiE��r�t��m6�t
��:pj�C�It�Ֆ+�\�i
��z�����=�N��I�U�f�R6@������f��ڳ���@	o��S{\��a)�!�Z�-3�bV�o1}28��$mHI*�t�oHJ�i�^�����\�W��-��A�T��
�L�}j�XK�Gg�dp��h3�иMH�]������%��|�������
�H�p�f�a<��p�(.�����pk{�2�U�f�R6@�����P�l�*e3T)�
�J�U�f�R6@�����P�l�*e3T)�
�J�U�f�R6@�����P�l�*e3T)�
�J�U�f�R6@�����P�l�*e3T)�
�J�U�f�R6@�����P�l�*e3T)�
�J�U�f�R6@�����P����s����^��)g�|���ڔ���&nLٳ�ι �w��f��)p e37�z�:S�8M��:�����l��Rs���2.�WK�O���ٜ����s���jg���UN�8�b�p�;]�t�R/���a�?=$�/�K��S�E>6������3�[���7p��_.]�3(�y��)�s������z�I�zB��C�̃��:����O![l|��f=a�]='�j��(������9���:���������߼ߞ�9�_ƇS)�Iov��~��sO�����
-����c��
�?pe3��n��~������Vg��ږ>�sI��F��;�yȢ�fC�p6e3�-�;���q��:�ؘ]����Np鲿��@�Lb�_�ܹ��$���yO�
���\6����;���ryٹ���M
`�d�X��:Ȥ���ߡD��K����~���t��h3|0��]�{���cU`�Id`�h3�-^Փ�R���θ6�	6g��\J}��h3��.�i���i���K������m����>&�����ʘ��c)�����=	�}�P{���~�O_l��8qO��7p?�d7�^���������'��L�k[����ג��מ�)���q�q)��;��K
��fy��⟐�k�uR6�I�v6���C8I�G�5
�id�(�f��*n��=�4�?p,�@���
�J�U�f�R6@��(�a\�_�IEND�B`��PNG
-
-
IHDR�/�7	pHYsMM
�έNtEXtSoftwareGPL Ghostscript 8.71?h4�IDATx���1
� ��R��d��NA֬�����v��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@����:�o=�e,m������6��fX�K�
`i3,m������6��fX�K�
`i3,m������6��fX�K�
`i3�9B-*ehIEND�B`�
\ No newline at end of file
+
IHDR/��/<�sBIT��O�tEXtSoftwaregnome-screenshot��> IDATx��o�$ɕ��jfg�Ǧ٨A.;Dê=�<,���ξ��44 �"��?݌OlM��n�4
���m��]�?���
8�Y�|�0�
H�-`ZDž��g�3:K���������p6��eEF���ȿU�~X�VefED���2���H)� � � �u.M{AAA,(4!� � b:�l� � � ��@�� � � ��F� � ��4!� � b:�l� � � ��@�� � � ��F� � ��4!� � b:�l� � � ��@�� � � ��F� � ��4!� � b:�l� � � ��@�� � � ��F� � ��4!� � b:�l� � � ��@�� � � ��F� � ��4!� � b:�l� � � ��@�� � � ��F� � ���7y�����ŴGAABlo~�d����z��
+Q~��M؛s���1s��lD
B����<`���]��MnL�2���'oD��Ռ��r��� �YG�����o�V�1������o���|A�<���ۻ�;��;N%a��f��ʙ��ͧJ�4W!��C�w�޽{����1	 
$c�pc�����kry9��1��k2q
��#
$籍�;��n7���R�/Υ�fl�<9�ۍ
q݌��H�̍AD��VB���e�����^T:��|�?��W�pm-o��ۋ�K�M���{)8��^�^u�2U�R������B����l��ݻ������{��������q�N$���Pl-/G���E����ˡL4����})�ب���-��J���6��T*���9��L�N�� CpE��ӧO���uQ��9�ޫ����E)�P��Ej���"�rf�S�����w�ܹ~����ׅ�_�":��sx�NO����o�=��� ��Sx�$���A�Y!��3�R?�a,�/���4���XAGGpz�l��˶;'6
+
���e�F�;�����v�Y�37����A�
'''w���{{{�n�Z]��y�p��	���nw�.T	VVJ��{q<�-�n^�j��d�U��^��ܨ>\��/�62�}�5�������4AXHGJ9�1LfNNNvvv@���m
,�����*|_@�DT����+` ���ۅ'O��6�j
w���7��a=�T���w�I���_�������_�“���
l�A�]�ڿ���w�!�5���W�.|-q�+�A�j: %t�:��
��K��ś��W����>��?{��g?�)nY[��/���|�3Ϟ={��y��Zb�g>� 8Oo������˿�؈-�7��g>s���
 �1g���Ǐ������Jw�������N$�ϫ����>�ϫ��3wU�������rC'|���+W>���K�.}�S����������
��ZI���?�	����@��׵��?���:^WX���ſ�7�_��3����?���_�&�O߅�(��+���Wr�܃߂o��a��%���o�G	�9�����3|����/}�E�^�����7�w�J1A5�д��,�_o˥7��PkW#gc�J�pc��z�H:�΋/:���*i��#��������jc������O��3������|�ԅAd4g�9�����z�<�`��? ��+�}<aW'�ܘ�*V֢��������k91F�8������c�I�u��ąA�#�t��/ÿ����M]SL�?�?�
+���G�v���
+�<���K}�|̜�����UFΠ��i2-�a,��rTIZ��f�S���������į�~�VY8����1�2�#�Rfp�Γ9�ޘ��ƒ�._�	
�&8t!�C�f���Ī��?�ϪŰN:������_�M���u��a�f�V'�:b��
��G��0����XF��p���>`��`�CAL����[�n�����Q�q���|p�7��O��O���W��e�7�)�s�#i
�؛I�^ܕ�7��&�Eu�8��ғ��r����?]^���l}�����&#:������ԃ��+��^/������߀�^��\�Lv ���/�6d�f��ٺ����MX8$�rT	^�z5�!���t�>Կ&B�=o�~r7����RF�z_kk��D4^���\�6��F�qm-v�ʊty�Rե����K����J׍"��%���X=p�����{ }�O�H��FK�[1f]�5=�2���u�f_KKK��E���J��,�n�w\�x���#�s.E���e��+5���'h��W�7�yLg�S��l19k��ڧ^,\_�pH��QY8$I���lll�_�yz=ׅ��p��z�
-��ԡ�D����h�g?n���fUl_��/W=5��}.�x�Z��o��h���O
+���c��B���/��l&/��XR_�<���������I���@�/����Y~�__��/�{�1��0��t:��}�싟;�O���m�����m!��A"R_7�訠��N�)����y����;.��[b�PZIʘ@Ơj�N���^euO�E
��j$so�J���q����*�A´b�7m�яO^�}�>�.~��L����g�	F�g₏�%�?�54U
����G����՟=�>x���1�˃�9d2�(��8ȘO��t�<����3�8�s)%���~�y�7r.{���~l���ڵ���<�s��qy�����8��v���s����ue���F���}���1��u��FL���9�j��u��r��t��Zo�6j�p��5فOʭ$��1u^����
�q
/q
+z�a�5
+�q��9O���c����&��7J)������Z�
0�5q#>�M��ވ��M���W�W�-7�]��qɪ��\�e��md���Ng����Cᯞ
+��ZBC)q7���ǩ��	���$v�-+��� �]��B;-Q��^]�K
+m���Uo��:��	�ا?-]�<�ey��+]q`�++�JA��:�?=�~�W�=�1ֆoҠ��OY�~���n߄���z
�\z�>�z[�2�ި�\�W����p���>c�ʕ+�2fx6����խ��B���FM��Q������&z|�����7�Ғt�|~j$���;��W�b	���YQ�\�.H��@��GU��~�?*t�B��q�2��I�їC�F���Q�H�g��j��6��&*�������7����w�?�*︖��*_������d���ѤV���73���ԑ����{�W���#�فs枏�=��/qRjanV:�����a�g#z�5D��S�O��Ww���tJL�V���dJ�L\%�����D��ku���ʘ���3����i�e,�DC,�J�B�[;crd�H��*kk��ώ6�u���K�3v]��X�]��1(�>gN��,TI3����?S��$D_��P�qi�o�ח��̽�+C�r�g�}ϴWdN�d�[F
�����Әt��L��sQ#�~�!���k��i¸!M4
e��˔�dm-�R3�e�p~��%2�\���Y�|s�q�r��b�?�W@3t������pH�Js���Ff�Sk�}��(�߁?����r��+@��ܾv��Bb�Y��▎랧�L��L0}���p��,gh���r�(œ9#�r�g�ٰ����#O-�	|�l��yE:a���yB�%�y��˯}�8^���2�'�,?֧:9�Z#���������7�.τa�0x�R���v?��Y~�X2Y�_
+J�-�f�����E�[t
F�;n���}SQ�d�|��A�`��'�T�Q�N����ރ�߂�gzs���Z)=�p�����$�T��=�Q�e%,'Q/�����r�J:��=��m�Z�=م�=᯼q��h����z?a�y/}��ҟ��1?O�)4f��LmԽ��F%��c
+��Ř|s�O��W׺�9ˏ�Q�ȱ��x�Y���rC-��sj�mdq�r�
+�t{B>���K�Y
����o��ֵ�$'N,A���n��Ē*ɘ���{����A/+G�����&3�$l���z?l����������l�\2���'�d�%b����H˘��yj���=LKI����EJ�G���f����q�����Q1D})��ra�v����t8
+YQ�D^�y=F���H��5��z6��W�ݵ��F��،�����u�CWތ�7-rm �);��Љ���P%��ѵd��>�Xc&?.�^�6R?$����N�e����i/X��+�����cb
���q6�d
+�d��w�ߕ13�~���B�X(��� �d9�Jʜ�&ˊ6jq#	�����9�Un��)U��9w&?.�v,TI3����B²!��y>��}%���KK���eyYv�������!�`��^�ǥYLO�`y����O*"?s���A(,�DCPN-C�5�D��  ?)W^Dt�J!
j�Ĵ�9�F	WdNfܵ�x�������O��rTIZi����yjUA���ٮ����O
���K8RƄ�^�]j�=am�����y
�Vo��Yل��&Yy�ۜe��s8���S�hZ �9�ע�-z,�����3��^Qz
RQ���H۪��o�e/��xs�Q.���l�DԌ�וq#s(S&���z�=�$���2힛6vO�t�_�`��}�AƔL]�t�
+A�X(��� �4�|q%#A<����V�ٱx��EW
�?еcѲ�~�Ғi��p!N�d�ړ�E,TI�`�y���yB!��mb�ܴ 8)��_����ہ~����8���OÍ�W{��Tm"�����p07����!��F�+c�1�vq������q���S���0߇N��A`\7��U˞^��y`����moo{����s ��/_�M��!#�h���Րl��7$�㯽���<���
B	���n��3B@���,?
�i@��ùB@
GG�^�ߢ���}}x��`W{�!
xt:�����H�Si�����6�r�1�ڿ9�j���gϞ�mL{:T�Ԫ�/4_0�<��`6*��!��r�n���B2����Ϋ��Sk]�|5�֒�JX�%}����y}[�<��& ��,���=D�
���&�X�L� %�	�+嫜�C�����S�n�g��"m#3?!�_*_���i�m��l�~2UȨb��Ʋ���0�w3�+&���K�Y<1w
+�Q�Ӓ�����S?/�e,�DC�J�9�|�0J�R2��O[�ܛ�߲{.�i���p��PJ3����j}0
�q�X��h6B�����:ϔ�Cߎb_������9sz0	���>�xd����u�hڻWmq���NП�H!
+E?��S�{���T�_\)��5U~7�����		�X�����Xb
+m{QJ�s�+�D�Q#Z��j�!5j��ӱpTIZi����"�Ԫ���t��!�
$sg�~��\.bL2g9k�D$@T^]��Q5RM�6t
s&���''c�JP����9l�;��"���f��=p}!I�S&Yzp>Rv酶�g�:����Tz��2m5a���?�$�k�k��{�y�B�.U���CmTE9b)ҝdQ�tnܴ,V�U�B�8�:�.�53�#%�‹�o,�DC�J�i��W���{��RkLj=Nyg�g@*~2a�������t�UpH9�%���B�4;�{c �_/�/�ǹG����jn 	٧�ȴ2��T=Z)c�^f��΄M�O��W'��PeL��^ļb��'�<��pHr� ��뱎i��?�XN��}=�}�>K��Ǹ�),w��0Ɓ%���JJ�koߴ����!I+��3�D�Z���k��-:E��3M���8���##��s=3f=S�!+��
+�WӤ��z�w�%@:j_����9�S�,�DC��������Ռ�dB"�,���H�s.Kĸ'<�y_9O��e:�ٿ�G4��d3?�r�
+c����
C����s�2N*zo������x�?7j�5�k�ф8�Ҋ��+�bH2�wǜ�~�z����3�P�
+�z?���V	X����� -���u]��F���%���<��rэ_z�
���c9�k�=�#I���ߏ�l����T��Dw���k��JG��jΉĦ"�j�:>ѵ%>Z��D����*i�g#�U;�U�xL��K8ˏ�̹*�^������~��LFP���}�H���֥;��(�c:�#1X�E4yjb��hT�����|�&L����3n�%������V�|�2�=��([���,a$���Y��C�V��g��.�Ԫ��/]�(yQrq-���Hl�������mG��伂�x0I��M���cs�i��J8e����+6���y^3�]�}Y(������ ,��q�U��|�1�z+��6��枏՞	8��15sHLfrdX"�>c�&Σ<��V�3Ma����FH��ηV�����{9�D�8�%C�xh{���e�
?���Y��<�6>�_��c�@7��
+E?����Ŕ��	o���/�iu�S
���C
�C��M%	A�*����1�$���(ʬ��ĹD"�\�"�
�kگ�o�<UR*��[7#dJ�Y!�:����<���fE?��e��C�ڨ�{��GT~vL���H����&t1�9I��e2r�:�n���P�w+�e]פ��sn���,���\?���j�/%+�e9�+��V��f����2q���&�v��WsT�+1���4�RY��l�
A�Z�`��'����b�yD�գo/47cQX�<��8���!,�}P„���Q/M��B�c����FH�׋�U�\|��DKH�^�d0GPB��l�#�.7u�9��L�'O
Fa$j���"%1[X(��� �47�'����˨���6TFJ�uW>���"3#C��jAP9#����p�h��UE�bL�%����H��N€�#�P`�yz�Ҏ���.a}�9Es���������}��o
�%Wˆ�b��'�<��pH2>*�$V���/�tH}�(ݫ9��9���H��[�gU턻���Luc����$�4���l���˭�I��DwjW��o���]��ti�0�n�*�:2�;�t�y�`���b#9�H�n�~��Ty��D��F�-+%��t����Pe:n�Q̼e���Dw���~�L���+++�X���ܴ|���n�WǠ�U��p�H3)�t�U�tx�~W�T����s�zZ�&�+���mm�ekO��4�Fj��]�'���	��>+�MΙ{�r�7����ѼEّ'�����dV����?P��f�y:�9�l#���y����~��?C�LL/5-f��Х�?/dTQ=��δ��&zF̺3‚c�J���
c��.�|�
�8�`>�D��@	�'�LHL�MR�by�/_M>z��M�F������#I=X����h��2��!�Ԩp*҇CH���QO�� e6�>Z9jtܵ��y�����<�9�6���c�Ce�$yj5
��j�/e���$�t����fY����88o4Z���IN*7��mqr���“��}O�D�#�0
�,I��O�B�O4-��Q�r8w��w�׿�s�		��R�C�Sy�K�De�
+4{�V��f �Z&,��������o���~$O�.��E�J��zzW�Wn(ݠ��C<�}�Яv�)��Zb��'�T�<�i%�yd��o��D�C6�q������1�I�D��he��q���l�
+a�:���y!���I���T��gX��|�Z��ɽ����i6f�qϕ N]��y1Ɓ�9�|��K,�DC���!If�JW[�*����OD�E�G�cHMH
+\+f�R������\
��'�e,|�,���\?���j���Yk�5�{j�a�s���]�|�����7<�Cϙ�r���mޯ���(��8/���"O�Z�P�
Ads�ZkS����5�Q.����{�*�Xb�)ҡ���̍gܲ�e����d3?!����[�d�+
��{�)��nh�v���˘����V��U�^\*+�:k��>��?X(��� �4��y* IDATg��1\�{���ɔ;V��22�*Z�ۍ|q
��Uu�8�u^�P%]����
pW��􀱌���Į?�A>p��{~_l�{΁
���E�zہ��ώ����@�}p��o;�b�׍ ���z�j�C�@�',d����C�����rl���\{�f�
�3�k�ȵ��=yA�c���W~�>�8x^lK��6��pH����i!Ŵ�CU����P.@Q�.���8ДQ �aDg���7�&d-�2c*���#V`�B����t��N(c��q�&ybH:ke�a��MĝW�Q�-�6R7�2b��X��f��������9���~�K,2�Ɋ�|W��B��e����u=
���ĥ���J\v<3.Z���cꗱ!(ndq��������k���^rM��[��5*�U�k���~��o�?�<����RHf��ل�8���@����r�
+c�s�ò��ظ -_����W��@F��s ��~8��~ ]�|$��CQ��Iו�� ��n�C��7�x$R��qޜs�c�u�qH�k�����%ZOY���+����k�g���ݹ������p�����<�|D-���U �M\�鎦���J���L��G��n�C]PO<��7��n0���箫�C��q��ȸ��~?�Q��^�z0|�����v������
+]"���ʊ������BTs�� ��C&ֵP�w�����	��0�%i1��hYh.��d�gڿvR�!��j��� �4(7'���r*����	|dϯ�v˹Ԫ�ԘhK��
+������U���F�S�Ѿ���
���<U.J?2їi����znA��/�Y���޴��ܯ�a�o�h2&Sĵ�U^�Z ���@���#���^9>�;�8��_,QR
+%�+NH$cjNU{�D�y���	�F�D��wY�'���G7�3p�@{w���Q��u���^�V}--��Gz�5,�DCP�CC,��N6PO9+���N�<=|�55�,��>r������s)�3ҵj�6�ݾ�rd�7�‡��!I+�h6B���:I!�k��(q�bq���Ml#��s�	ɂ�r�JJO0��w����,���ym��\"s:a��
+VB�����T�1��s=Ye]�s�e��R&a����7�fr�6�F[�s|���ô�7W-D?2�vf6��C�O��%0HR�ب	!&T�H��?� ��
+�%�+
^�N��v��2\�s��y�ccrw� :�t�������Mˏ���0�o�����KV�`�q���0����X�C
@��fh��0R�ʖ���8�iU#!�f�ӡ��BT�0gp���Yb�A��ͺ-�T.
�+a�b���`J�'�]x5Z�…(�!�S��$njJń����}��>�b�2�G�3Gd���Y�u'�7N���{�+aw����s=�0�܋����C���4i�i��3`���eJ���p�c�LV�Q�&����~�a$23������
+4YH%��8ar�q��a!��Ң0_^.VX�g�󢳣rC�A�7O��B�4�ʩ�h_�����,U��*+�a_Q�`��JeO�I^_���b�Ċ�ђ�e�R�b�"j���(3ta�B�4�K�Iyy9��I�Ng ^���(�����!���OHx5����㻄=_ofK������F����H�=y���Al��7�����elͣ	I	K�L�0
+������B�O4yjb�d�R,2;Wej=�G7���9*� ��re�͘>��Ɩ�/=}�]�X�PY8$i��̿��l�ib��q��K<.���Ѐ���TX�$"�Q(C�0��$�x5���
�FRI�J�
+��nL��xh�.-x�m3R����E��h^��(���p�~�>,TI�S���ǰ/���������
�c&��iI��Sfx
��
�Cl?J0b��vt<��n���e�T
���PʩU�S� fT
������i���#'g�bL����<�t�%�b�{o����s����H[�3ܽ�B��՚R{����3[�ʹ�CU�������� ܛ�nO��-�v��f��8�j�����&��4$b4��vC,\�"�<��pHrҨ"C�3���=&w7�η��
+c<B���*{(��H)
+�O�Ex-|�,�$O�&��H�0g��g3�����-O�����$J�aI�X@}6�/V"wnP�x�R�0�u�vh6�8�J�c0�/NEœ+c���%
J]�QY˄D-�)�P״A�#-NU��{j�x���<!�]���qc��&�S�vwwj9sWΑ=�h}����o.��~$�A�x,�;,�$DvG��Gp���w�p@�]��o��v�54��u�ж~��q���Ԋ^�k6�
+
�ກ����bãX�e����n{{��gϞ
��z�
+ozs�Zn�e�p�x��G"pCG塛y<?��ZFo�`T/q��9����Ů_�
���G8x8$�
8�.~��sB�b|�n3�J���&�ぱ����]��lt��t�*��4z�VI<5	kIv#�V���e�0������R�B�r�/&z�Ű�Wc�����QDC���!I�
+@~���j���9���%���_�ke�oz�Fa�/m��e��3�m��s=�#j�
+�Y�PY8$I�ZM@���I�F�����z�r.G�������VR*��=�J1���,?�^������@*i�Q�K�b)#���i�+RK��;�?�Ȗ��T�NJ4�����Ԣ�ZM���h��p����^L��y٨4"ooc�x_��瞛�Ѽ��\Cƀ9�\o;��(#�_u��r��.�i����2"6��	�(���P݌U�1�wL�dn�@QU�2���U)e��]v�2VC��s����=�?B���VC�1��PUh!����9dE��&.f��)Q�Pe))���& �[X�D[���*Di,\�"�<��pH�`T�,���α~���'�s�kq�
+
���{X�2��,�+�Z��K��*��-|�,�$O�&��H�9f�ga�n�fER��J���l�		s�U���-�(5��t�+���ldq �4�`I21�d!�Ql�����ྻv��6�L9�B�X�����F�P%��V
�ՍĤ/�J`��X�ɬ�b�W4��6L���t�υ(\O
+�M'G�Ē��ݯZ@�?���Fl΀>���S� ��4-�*)��{ ���*���{�0<����P���8��|8ݨ���	���yc�ӡ��BT0���Ў�^��ϼ�S�d��O�s���\Fs}��lP�[]�q�ȗ�(.D
A�Z�X8$i6*�~*߉��$�E�m6��K\���S]�}�ى���53��T���pH�<���f#-e�s�a:�DٔH[�/Ty���Dj%,�TIxg�m��2ڃf#����Gyj���b�9ǧsQ���U{�ż��o�[��6�v�׾,�Z����&X���S���Fb�s|�h����ܹ�<a.s�LYP̆��8/i��J"N2[x���M}b,t��
(�s̴�9���Es��:s�r
�\�4�uT�mv�B�5�q`y�<
8�]�����'�>���kKij���,�����,[s˴�CU���P�@*�}\΍�����z�{j�X�Q�~�(FAH�=!L�p!�h��2��!I�Q��&J�B���	�r�
+�J����f�6�s�0���y��X�>TI��V�l�
FU���Z��a2U�*Õ���K����I;�f��*��=���f��,����4�Y�b�<z}w]S=RK�䀋�:��X�Nׂf�&$�J�<	,TI�U�yu#��ZO�o'�CZl�d5=�
3\��ג���SŔ��?�3Gn��j�/L��������[�X��2��A��羽�ٺ
��0���z�}d�x�L����sx�~N�k���^@���<�	+��t�*��*p9����`�DkEQK�Œ�s��䊄Fv����9@F6z2��…(�!�S��$
=�4�eTy��{?�HRµ=�80��ҩ�آ|����7)���n���,|�,�$O�&��H;$f#�R�܊Z.#�.�
+��Z\�Bi������Z�ߢ�=�FRI���-��D�`��$]��=�.��qEn`�NHH�T�B�D�Z�W7����0p�<K/f�O?�}�u%�m�&9��y)W���b=�[ǁ��㩏�D�)�v��+�|2�s�6�7���5yjQ�`T�Pe�bn�@H9�G��~_��>�)�*:m�����bZ�N�� ���!��s`О'�`�ӡ��BT;���Y~�,ԙ���*\��
�xU\P�3���7+�+C�qX�E4yjbᐤ�PӡqXj�r�r�R�V��Ko�q-9���jC�Ull���g�q����pH�<���f#�N�9�0�8[:9�r+�C���,�J9�9F��PU�Lh6�8�JZ��K�C�D[i�g���T��0�n-Q�94PR��^6G_�
+�T��UUyj`^�H
+����x�,����7yO�ywRU�4h�5r���m/i��-ʼn���~�ؗ�pz�Rw�!O-� J��t��)�8tf.(x��zr,|�0�����C5;����Q��zQ%9�
��,a�t����'�|�y��-��ָ�1�P��]��j9�1q^�G���<t�L�B�u���V%�K�{���w��'jBR蒢���}����Fы_bc�I5�(�<�1���\�Q@��ܤ����u�գ�hw���%�\$^�|�7�9	P�x���K�Y
�����Ѱ��0�>j�
+�
+����F\7��Dm�(<��%B廽xloG�)����nb#c|��x���_�m_?�q�&�n�����tp�ybH��M�l����<�ٳg`�6�T���K�5���< �J%#林(��k�0+gh'�-)e*���J��DC�JZ�G�^4�D��;ka��,����a��_��t�:}k�`|i^T�{ب'��2�B�4��ԚN_��V���N\��ʙ��߂��W��B-4�B��8<�@S=�~��ku
��z�H(x-<�Z O-��'��@�xf����?�e�R�IJ����֫�Ž�j�@%�4�1p]�w]�f�l�&<�=�(ԉ���t�*���m$'V��ţ�:�y�.�'�ՠʫ(dI���J��)�PJi�B��S��$�Gţ�S�;�I�x�j��� ���靭z~�q��P��ј�֐��Io���9�0����F����#a�	���p�K���ٿu������
�����hI��0<������KM���˗�=�X��5a��|T,,<~��
�p��@�3ل����
u._Ф��z	@�[�<�s����1�n�ڹ���Q
>���v>�����B������V{}
��w�ԏ�܇Y�f�,+��������� W���Kyg17�����*Ѐ�^IGGAkw��g#
��
���u
�'$3pj� O-��3��s����x7f슮�D�Z5����'�Opv�8���M�)T2U��N:�%��m��
+yj�F��>�Q
+c����r��*�-�*����䱕��ާ"$yj-�e��C�EF���u�f��
+�H5�z_q(�K�����Ҋ3���N�9v>�zj��;�FZ��곑��#E�>��J��r3,�/��+�+�z;Ǡ�D��nċ|}h6�8�JZ��ӣ(
u_��0Z��՝zW�TР�":Z���^�q��P%��V
�Ս�4o��)�Gf��ί�
��j�/��
v:er"O���!��ˡWQ�%���F�+�}`���'&�f��J@�Z1g(�&=����	�aI}�X��x9Q��ZS�'�7
�f�^SG�Kъ�Ǵ�CU���6Qi���T�s���pb��:%��J�&�U��$l�VZe�F��,�z��QDC���!IU,���o�0�c��s��1�hUSJ)��%Ȫ������,Q�v>�zjͼm�h�8��`{�f��3�Ӥ
*�G�wK���jH�rc��}b#�XzO�̟15T6�����ۀ �ʩe��C�B���
s�K6g��2��
+�#��˅�<�gax��\/�ӨuD��&38�����f�;�sʩE�*��]@�cݱ�t�*���5���ڄ�A��^��((���eÏ���37�T��ҥw;T��� �نs=[�J7o83���%��B/��R��0V.c�	a^O[�l�,�x~��1��i�/�{��ǘ�����B@��f\_��	U��E�����n|��估G�I��.��We�}�u!�x϶����/.\�H���J�uj�P���ЦJ2�ͧ��%Fu�[�A�Z�.p2��%Ҩ���;�s�x
+�Pah��͌w�:P�"8*�n���җ�Ϲ�*iڮbU�����T��y�;�R2�<��<��1�,?.�oW�<)矉�J���SH-t��\0���~�h167�8�JZ�Ē���E=�ք��Mfc0Y��7�p<Y�{�
oG�WIK1�8g"�������Xh���d��
+ߙ�38����-�'�1�2�ml"[[ց*aI�
D7ox�F?Q�\�'�n�
Lъ �#���Tf.XU2k1p������6�K��Z���֎�CV�;!�4����l�<�Z�K����$�0ƚ<��p:1�2I�RФ�4���5�Bd�2c��F�Z�l��5��'=��`�#_�����e��C���R���#� �d�a�s�jO���c�^��i�TM��O���DxbbkC���ۨ��m��
+���=�T
D�X�a���01b6��J�bU��Z*�E�a"Uх��D��,N4���Be�W5^Q�洍�i������
�ʐ&
+w�p���+G��C?jBJi�J�y��&���3"�����@̄�d�`�ۅ��Q�b�����c3V.�L,���.��#A�B�(����m-��}�KgւQ�_x�Z�
�{�o"�|}'T
��o��<�B��}��36�F�������V�}��!�}U:i�X��B煩��LV����a
���|6A�y,����L�Z6�ʼnf O-C,�������d�{̬u:�3*sT���|�c���GGpt4�Ž���@M���wkT��Q1���}�S�6K����ۨ��m��
+��[F��:�nN�(Tn6l���s��^��G��Cײ:����!���T�&|� ��,4�
A*i�p�\�d�r3B�s�*��2���e_Z��{Yž��⼥��@�~Y��9�B�4�b
+�V��f�E�͆�����a��¿?�N�A��5p����.ZH�4���)J	���$� ��bN
@�Qa%Ǘ��`l�G�(t�2GWv��W]K�(�_���e���Z�2=@;f�@�y�5f~6B�ZS�k8����}a�E�fCxL�K�!�D4��&ӝ��5
[�l��r�q�w<��vw���E4
yjbᐠڨ���G�dY�	��O��-Z�xj9N�kꂱp�X�8�\*](U.]?_<�jOŸQ�f<�]���Ň4]lTI�6�T���-�rj�.X�i��xs�qX}	*�n����R����)��x��^���B�8����L�eÔ���(*C��S�4�v��XR}�)G��֗�G���w���X��f�6BL��������ZX�6���bD�^�}�Y~�f��́vu��c� ����o9�AʰP	~6��RnG�wj\�g�^���u
+e�2XB�λ�(K��`�ӞSa���F�S����No���XkB�L�1w�|�W�c��º�5gD�~!��t_��8a
����(
^sǁ����H�ak��"��<��pHPߨ8+P��>�Ƚ�TQ*X�Щ�M^����K�Y:����[_yB�9�D{���,Hl�.�Q�!MUҴ�3U!�xˠ1�	I31gZ?Ց��W}*
*�bC�{Ґ\�92>���Y��'+����DC�JH�� IDATZ,8g� T7�GʋH�Șt���{*EUC��l�~˺1*R��J�B�4��}�X�J;%��$��Ȧh��R�GJ Vi(x"��������7�;�<��.A3cCq����P
��9�����'G����4_�M��o8�"�`0r��������T�27�b�¢y��QP^1�V��~\�*��~=����X�y����I����(
^��u�v���ɡi�S�h��2��!A-�-�1�q�܅�3
+��f#a��B�����G�	I����
0� �������F�4m�Ly�>}*�,�:�n��Ջ�eR��&�BX
Ǒkk�qJZb'���(�՘�k��s�����,N4�ӧOI%-X�ѕ&�4����n@z���4�S��մ�v2�$ϯ�<X��f�6r�Ν���i�b!�ʌxo�0ZQș�3���Ra�"��c��+F[[&��V��<"p^>@���E�g�rA�qrrBZi
��.QEUr䰘�U����
��P,n<V�]�+���d����0D��l������������<�Z��~0��
�q��-W��y_�k����ĪR�r���O�bldI�T�Ѹ�i�/��q|��Q������Q��vvv�<���pHPnTRBV���CT�Q��Ј�Vx.�C�����W����aְ�S���ja�����F�4m�w�޽w�����Ç���<�ڇ1壥@̱r���b�.��#��Y~�n?��h��|��W�㪫Ĺ\,�pAB��/�d=��,NT
�j%�V�I%- J�'�]Q竊�RU���9���lG짫OΥ�pU��F��΄B����;w���E�
��4T
D�EH�~Qx�A��X�#c��}ЃP��
�g5,��5���	1�p��w<g�	&����D;����&:99��ۻu��EZi1�eݷو�X��0�����N���Z���V�����
��m�3�������U�����5���X_G��$s1s�I_�f"A�m9����o�7 (�*+D(
&���{���B�ɱ�\��٨�;T�x |�	H�ZD9vvv666���buu5��^�x��O����z���=�����W}�q���B��Z.=f5���F�FE����
+
�����lx��k>�����կ~դ����D���Q�.!�ө���	�9�^�}!�����{��0l/T�;�nYp^�߻���&���/|�o����Ǐ�6�m�1boooooOJypp��u��%�q\���z��~�/���M|�eシ {�*�m����9��
ڰ��񔱒c�a�ǀ�l�.�d��C���+^|�%cre�"<)g����r]��–����s��z�clee�q���I�������c}yj- �h�ۊ��e��Vpj��(�
+�L~H��rZ�^�
{nex�ͻÖ��Z339>>���Co]�����*9;ѣ�h�C�����̬"�jt�M���ADDs��J���,�D�����
���JZ@�%�-T�=�yYW}>cԾl$��C�������X�PT+m=�J�B�4�Zpppp����ׯ��ւ�%D�aU:l@ԑ$PUB�FV6��j������T�L��ʴ7�WӐ�֜qpp{{{�1�3��Z�X8$(;*=�o|G
I�`Q?�l�
������;p�xQceY���3�>XxYm���Ϲ�*i�ӡ��BT�0������?J�?0_eH�*���
+N��j�4��QnZ��i
��� ���h6�D��e�jQXa��f���Z���S,<�/lf�O&��ٰ�v����@h;�Y��:P�k�Gyƙ�KVi��
o�w�݂�K���丨����df���p֩,"A6OÔ�Re�V�Se8a��f�%�/!��^��J��2 퓝��H�4���F^�x�y���QL��ƍ�^��N�RYGjo9sWі?z�Q�u�]�a���p��1�v���:0V���>^��%cxv�
@pt�8R]�I-�px(�;�y�����ڟ��1�x6j|����=��;����u�����
�����<�ٳg@,/_�ě^�N�F���T��K��e�b�����<�t¹���.F����
+=8hu�?���|p��~���`�}��/�q4�8>loG��7��E�����B�d����uq��ٵ��M6���Z���m��
+���G���@�ek ���2V4�~�HB�-ƻU�8_&�z�\dQ=���B�8���
�}{�<K#+�XU��F+&kV(טO�,Z����ך��XX��f�6BL�Q|sG��
+ �W�A�	�*���������5�`-*U��AV�"|+@�F�Ql�֏)*���H�!��Լq��=@���2-�oe�k�*�ʈ�1�ʩ5��֝��֨@��5�p��t�RM�Dj)���8�E4���+l%l�~6��$Ⴠ^���U;6&0!��rjbᐠ�$�!���e�Ѝ��T�ՠ��[tT��;
+�KT/��=�����b]vTGD�� Fg���*��Ϲ�*i�ƙ��Y�}���P�)�Xu�JR�r���b�$&%�ײ���ʼn� �����ÔS���k#R]5��FЈ�Q�뺍;OQK*��)�~U���F^�|�Z;�Z����9�d3q�*=H�1+�H�K ���y�c�*\|lP�b'R���euŎz�
_]�~kc.}"�l�B��^��0��Zn�;�F��a}=:F[S7l�yA��y7����O�s�\`1(����#
]g�<�������@��
���+P�+��Q�6��iO������Z_��	��}�l#��Ѻu>�=���a��I���#��Ă�	k�ƭ-��W�<b܂��F��ai��5[�<�n��Z_�tiS%����	IVs�U%ﴵ�D {X�+T�eF�R_8�v֗1���
+ut�29m;�sU���F�,>B��@d��g��IE�r����3kI-���H�HΒۖ8)�,M��DC�JZLP"�ZU�1�:N
�&ԭJ:A���1�U7�&�R��ĄhC�']�9*�8C�'U��{jSc��O�(~=?��|&�-�z.�ꙵt</L�^�e���Am��_<|��Y��1U8�Q�&c�|
+���h"�nun����_ϖbD�����"���A<�V�b?�>k���Z��ڴPL`����s���X��O��O^�|Y�!+!��C��5��VB@�R��SZ��΋1&�tQ
B�q @�'��T_EPI�깓�)�W	��ˤ;ΡӁ�-�1`�!J�]n��lt�%��ڜZm�!�`ᐠڨTY�Pgiœ��P|��i8�)1*�J�[��VC)h�H7#Բ]��ž���k��,��OE�|�mTI�6�T��i���M���j�M*���)��k�p�fp��+��mDqu��9���s���i��������AG����,N4�b*#BJɀ+����g�V�\�%BG
+F���z�^Ku���'�.Ֆ�����b����*�<����UG�1��I��Mg�I��S��ڂ�+�N��b���J6^���G�2�•Հ��;k,u����C������&��"b��B�J�P�Z�L�]��
+��;�%�
C�慰�v���L1
+TǜC�����ݤ��B1�/^x���V=
��h�8�?�����w�
�ׅ��ȫW���ݢc�xx*�]l#:�
<y��%s��HI��B�������i�S�
F��c���l:c`�g��G/�;�<�����}��H�=E��d�Ϟ=b1x��~�T��K��e�b�����w%>����H`��˚���=
+ .�M� ��ܡ�@��U�p�����ki9�:�n��a>e!B*���ү���}�`kK�.�>���ё��
9?oS_�l��6��ig�B�ZSA�)Z�\b������	&W�*;�ʵ��9g���2�����Yh'b1�!�U�{�
+ &�2hP��y�Y��t�RL)W7<��W��2r
�`~-U���Fjd��w���������7n�Hvvvv�ƍ����������~������=¯�=��...��睝�a�����糳3�������7����ζ"���T�Җ�r���_�R��JVp��B���D.x2\��nN�4����
+=������[�P#��i���9�wZ2=�!��
+�pU��v�%� D�CʯU3?�H`�O����-��%����`ss���@}]]]M�xrrr||������o��w����w���Ä�������ܢ&*��s�����_]\\���ե��
&����&%N�����~�>/��]�
�u�~Pt<"�Ul�����[
�˘6�*�]�d���j��lL`B4��9��=�$	*��1�G-�X��r�W�V[�t^�ą���m�v�I9>
j��R90c�NE�|�-TI3?�|�rr��$��[R�5�ܹ����&hQӆ/~�����_Շ��ճ����<ruu���1v�֭��M�NQ666=z���
)-S%�����;z�}�-���@��b�����gf�/:��L�t�*�a~Z�FB6��l3]`˩	Kt����獞���-//��1]2T�X�c��!A�+��;D�*��7a��P�*�qc�q)��-<TѼ�;�sU���F2@��nU[ԻlzK������������͝�5����8>>V��>��,B}X]]B��������'''ׯ_�U�����B����u]��H��M�E��6k��f�au�i��;�2���ͷx/��A�D3U�� �	���!�a�v�L�k��NސyDy�tq��U��Cr���<�Fjb_�f���������Ս�����/���������U�Ӓ�����ɉn$�����ٹq�������lnn���?��
����~1�TQ�tY�0�L@�D0���܅s�̼,�ɋ���e��C���ҔJ�dU!`�?�"������/J�B�^L�T�~
b�
��m;v��UV�v>�zj�|N�˗/3�ZNc���C�C�+r��=�k��O�>}�T��f����+��̍���Կ��U>�A� ]�<�ιJ�Uh̘�"�_a0<)e?���qdb��N\��2kq��~���[v����I��Un���<淵����z?U���H��d~�뺌���I,KKKx�k����H-�Ӳaw8j)Ú�ё��m@�z�+�9�v��K�۽��p[Ջ�T�~��E����~���x"�~�1��v�e��l������k����hS�U��v&�n�{Xn\c�׺��2�Ք�o�N�:{��r�庰0�"�v*#�p=���,������(�*�����ɇV�5��L�ι���
D�l�ƙ��*�<�$��U��S-�	���q#�&�e����T�άˏ6v�5�VE&`�N;1���,�y���Q��2��!A�A����
��R�+��
t:��r�Cj
w��L1�F�p2���*�퐑_�g8	���[�5�;E�lQ�������C�"���~�s^��C��O@M-����j�_����8#�����2�M@9��pHP}T�(��߉7^t0�`�#��*�,��j�T�qJͿZ�N&���GJ
 G����SN���S����Z�a��H�Mz�c����{h�B�y1���>�:�0�Gr'�Bc�2R�߬F��A���X���W	,�A�Ϻ3�cP���;t9T{�����D\�E��xQ����@�UXĎ�kg�g#��	�$B�?�r��J�߯᥿�<���2ԗ�)�
�T��|(܄+�JPO�`���Bw�M���'Z���h��|Ɲ�����H+��G|���`~����n�5I���;�s���\���Ғ�
�H�������������罽��ׯ��w������ݻw�޽�����������Ç�ʣ���S����{����qf�w���R�E]qH9]���0z8�b,X6��A�+��C�&�:��'�C�0�ȵk��6'<�Qz�x�����W��FϠ����Y���h�b_pt�iF)��x�w�0:�r�vQ֨CM�44/���O_�bc�>��Q�3?1ɩ��_�5%�!�������H)�޽�{����h�������->�{����ן>}����{��{�󽽽��c���a�����S�	�mp6�H����Ĝ
�R곑��*۠9��˙R���D��#IY[f5�jw:0࣒��8���~�!h6�����o�eW��JYB��E���ּH7�Ǥ�lQkf��d��.,TIs詅�{��H#t���˴]����;w����߹s����ݸqCU-���;;;�U}�Z����X�}oo���bss�G?�������`!�G��z�jccC�D��lll���v���|d�li�÷����9oRC��Eǐ��y�%qRV`!Tӄa��}�lHu@�Z�X8$�iTc�`J�J
���@�[�2w���R�W{5�4	�nwWU[e�UZQ�Ԋ�l�^Y�|�-�Ԛ��ȋ/��c�π���;N�_���W胃���������͝��~wcc���'������auu�����_�~�Ν;j�����ѣGj��~����u��a��g]�7sc�.�#S�-�^s� ���pt�wd֮b'���i��*�o��p	�v�
��M���kY%v��u<�\���yU��S��h�Q��bL@�
�<p]𼜎j<�a{{��gϞ
�0�M��'s��񌱆Z.=f5���F�F��A��N&���s�d�y�7o��.S�"$S��*^����
�(�r���
lo���:�(�b�o�\�����9<�[��<:�s�Z��7e�qww׳rq�#�x8���/�҇~����eE��������
�#�=����ܺu���'	�=���������<z��ѣG;;;h�u������S�/^�XZZ:88899999988�����������?��?�i�������Ɔ�:�[o�u~~^��
��ǧӉ���RO������80��tjHa%D�c���	��p�t��1V5�=q�<��M��R�� x^]��
+1�?U�M&*#b��t��
8�m����H?�k�
M���
�M���D�Z��W�B� �3Sg&r�ب���*V�Z�*�T�:~H|E�ݻ����Į�O�f�<}����qW�'-D������z�ޱF��3gP?����"��ŏVű���5ţD��l\0��t]+.��N�DC`b�h9�	I�1*]���a9��9�~XQ�M�4c>$���S֓��7��vɸ3�
����a���Uf~621������{��5�Ȕsji���
Oo��tX^,�W.�ϋ1��2�	��H6;j�rj�]�tÔS�h�b_p&�F��W�4����`�
�2z�M���l7<_����������1�~�W�C�{�Tɧ\8��� �ޗ�ֺ5��&}1��\�1�n�?=��U?,�l�
�G�	�h��Sq�{r_q*�1eu�'��tn����
+(����׀Xo	U�lf~6b�L8���|@�p�h
D���*�PGz.5ѭQ�����D�B�,�@g�$P=X�G�:�S����J�*I�MC��U�YyaU^�5�P��Z�
�W������"�;!�x�ݠ����0��yj���Ԓ������S+��HԗYe��~�1<�Z2�c_1�՚�����v�ϴ��2�g�ѵ{�SkqXLeD(�ʙ%GU|&
���B_��O��v�.��xV�G��V��{j��ee�0j$������� J�1��	�
���Qi��JvXNJ�JCR�fB�3쩅��a�q��hxj�2��A,.��rW�td��e��݇9��*yj9� mi��Yg�g#5������bn�������7nd)�8;;;;;�����w�������#���\\\!<��
+$��ﾋ����<ϻq������7��͖N�Q��+�"�ߙ|�(�~��z^M�F��bI���-�F�4��0�r��
�IF,�e��C�:F���L�9Ƙ[���V8b��j�GXud{�|�.T��-a IDAT:��g���̻��v>�zj��l�F�pp�����F�+�Lsrr������o��w������!�Q���899�-j��(?>>������ѫ�u:���ג�W�+V�9W"��������X�oΠr
��]�,Ik�/F�$nn�W�^��~�!�4׷l�4��!A-�
+�'��n�1���^JK��Q���Z��ld8,߆��
+���~�b�cI�D�V4Z܃a4 �"-4���l�O>I֕�t���[ԑ�-)К
w�����W�[�na}C�_�"�-����������N0VWWONNc�n�Ri��-ecc�ѣG����U)ws���,]`d��"��D�n���-7���ɢ��38w�
nYYy12i�x
G�A
���[���)���\��r��o�^r��2w�np�f4}�xE�^㉨X����իW�b����.�~3K�C���m���a~#�Z<&���A������u]_Ų��
�V�8B��G����y��n�s,v�����@�C�n�;����d�\�JF�CL�G,�-Zur��Rʽ�=��ݻw�޽{��=�W��~�����|EJypp�_�w��1�1��vvv>|�wt��]�������ِ��!1���l���aI�*�����ćq�Ёs�`X����M��2n6�Ǩޛa��DkP�CC,��iT�,���U��TM��
+,'�
+]�0�{�t(9�*��pvX_O��Z�0����F2<��b�{��-ʶ�ޒb_�.�qpp�����������򗿼������_��h���ONNt#������΍7����k������q�a��&Ѕq���ɫ8���W�؊u'���ؠ��ڃ��I)T_��D���j�&E�gò���m��T6�f�q!�h��2��!A�
+���(l,U��9k���9J�T�B����\���2�X��x?6=�zjYdy������Ç͹3l#-���C���AJy��=�k��O�>}�T�RtUf���r�Q�p`�OV�ł�M�=����Iq^�E#y�
Ya�i-NM�O�(�ӧO�ݻ����*�Xd�{��s�54hߧ���w���duoY_�G��ӎ�����4b�J��6r�Ν���[�nM�>P���
���
677�C�WWWg��|��h���񧗒�t�&cClUF�!��7Оk8�{^;+g��ܺuK�gJ4�rjbᐠ�Q
�afq�l�$�	�{u����.&,q�E/T"KC9)4�_+V{Q3@ٓ��Bs�E��������#>;E?������(/��5V�_8c0F�L�$��?{o*9v��{ܞl(�y3�:����K���YL�^$�n��Gv*����86�*����$6%0��	�+�s�E�K�	��%��	�����E��00��tf�-N�}�I*Օt���w�zW�=�Tҽ:���;@{E<��W���h�l�?>>��w�؛H-�)�J�́l�D��_Cjk۶�):RK
+��**@^^D*R�j>�4LQ
+��^|x֔��U*s�Z�#r	��ZLV�&��f0���Lm�]C�H-��X3�2J\�9�w�g��+�d���`��?�j�1�W�\YikD*/�pq1jm4�t��
"V���M����"	
+�"� �RS��F
+�E7ߗ6�U��7cV��5���x��v\�[
+�[����}:;[�*F���F��G*��h�B��J�+�x�g�:�f��sb��zv��\��+��m��U��jQe��t�+��JАV��#+A%:H������dpZ�1�.Ե\�f��SZ]+J�v��W�.�/��F�����]'��8�;�S�������p�;(�Ty�,BB*�Э��6��e�&�WS&%�(����M�e�v�aB�k���5�d�5�͜�4x�2�����[;7������58i�f��>	`oA�>0q;v��`�B�+��jq�@"��mۦi�t,bYV�/��ba��O�S۶����OfJ�2�����l��gn�۶��T����!	�+UK�$�i�$�&�H�d0aȥ�P��_i�m�f�/��K�£�QXf
+v�5��$[��������հT�h�[k�[W����Eo�
[���+Q��sv-�$�"�v�u
�p]��������R�u�����u]���OV��R:'�IEAL&�8�����۷����<<8��d��o~3�"��
V���k����-�c��.�av��ۗ��!D�
L������YF�5��C-��H��ԗ�#��ï����*�T�XO9%G޺e���Z]�%"cp�v�X�ZQ�
d�*
+�j8�y�AJ�j(���`��Z�����C?�<d?�ܽ��+��bƀ�yh<����g�����=`-l���SJg��4۶�86����a"IGFQ��G}4�)�R<f8b!��Pw�]S��F���sS}o,*`+V��E��U��dQ
+�P����]j>�Z6Jc���qj�:%���ڟE`i�5��Я��*TvJR�XE��LU�Z�u��߽�>@x�Ki%���zdpZaܭv��q���>���6xS�d�$VQ�a)���d�~������E��\�5M3�0L�d���������֕���~�DZ�8�~߲,���)
+��vE��a���ס�"$M�
+#8��'=-k<�ˋ��
+��?�Xud�,���>��_�up���$���qjA�4P�@����5D�����׊ht�K������ľ�M���Ê<��'͏F-q��r�~aF{[jH��3(d�X�庮�5߿���'w}�qJi�2Л�9���?�#�q��?��a�C�(��
Ϟ=Ku��8��)�����A�UG�o��p	��8�
+����^�r��Ȭu��)�@��<�I���
���u|�+��@s��H�)�w�w��ґZ�PP%hX+�vm�Z[EZ��ܒ�c(�b\�B1�4�ʧ���
+G���͡�M���ӕ�wWEEw��WrP*e���!dW�����2�y6��bq~~�ڵ\.��e���r��_�w�NٚŎ���6�<2�HH2=I�$-ֈiܸw� ���5��+�3��Z'd�|�׸����Eį�j�940c�����d4�v���y��
���uz�t5���=7!N��N<8I]�&čF#B�g>�D�kX,��|>�o�3�ŭ[��G����6��鹬828��;�O���dpI�V��i���VV����]'$�ѓ5�S����M����/A?+ϣ�z'I��ח�o�N�3`u@�(Z��kB�yT��6�K�Ԓ��b�h'*�"�8�X##}�B�&���UV�0l�����1�v�x���M"�=F���WdnV�Q�(��lf�!~�Ϋ���&
+���ӊN�`��".N��K�9e��6p՞*�KռP	=�>�mҊ��0*�k���̄�R)��y��F��C�����/���g�l�4
^q��"��L��g����&/_�Y����J}4��B�i�ꤥ£��n�d���w]���
����6��~����RW��Lc�ҝyf�b�JSH�!;�������8���?���??K� �n�V���5:�[_R���5�G}�����qx��_�{]��f��b�9Z�Qe��=7���Z)Y�
+�"3c�@m�t5�a:�:��8�d2ٵ.]i��]��-���^��չ|&\%l%���+���R�x���L���P������Zֈ������Ze!��pM����g�
+	�۷���C
!@OvU�^dtq�ED��!�\�+��j�
(�I&����Ц��ċh���Ssjuq��i�f�)I�2S�T	�
+�GV\-��^�)a`3�5��J�Ke��T
+
�?Z��2IZ�})W�-(�@��5��h(
+1�_��܁?Ti��0߼����W���3�Ux�؆�s��_PCq�z#�AA�@�V��+��q�L
+���7�2��&�ʢ��ZQ��.Z��LD%~	l%�u�D�2���j�F�\���[��v�#k<>|�7�ET���*��e��a6�u�12�:�>R����L$���Q[1�ވ���
c���m@YwD� Ŀ(W^�LXI\Un�''�L����xc��6au�N\��Y�m����)ȣ������mۋ������[��X,��mی�w�\b��ba��i��b� ���x�|>��׿^Ja%�|��D��o������]�NHF���f����Yim9	��r���x�������4-q���G�xT5Z�����*%R�H�ѷ�?	p���o����Dv�OJ�!�B�$��ڪ�v��h��(!; �Q�SK!߈4`./oh�f�f[\�5�u]�g�XǮ�b�u˲����l�1��u]V�RJA��DQ�:�����'����b�sZ�$$���>Ϡ����7�ɯ�t:��\��NR�\z�GU!W%���8��БZ�PP%���]�{����k�e!6i%�";BF�J�P�T�@�U��
�G�M*�3ڍ�֑Z����p�ZXc�%�qp��<�q��`Y����GQ�y޿�˿L&fE����~?C�4qW����2�NY�v�q�D�Q���2��侴�>�9�jj:�t�I��UV�bYr�7^V�\(7!R��hTfR��֑Z7|�qq�C��ٚ�}�	�"X����nY�k��V�_�BoLz�����3t��Y���4S-�&˶dຮi�A�a�&3!�ĠIJ,�u?����f3��`�D�ߧ�A������,쐉��h�Ի!�S�{�s{�������O���S��A�H���6C%�/+�gy�,{ϩ����F#8<,c:�'J@g�4����
+X)�H׊{�ώ�~�Z�Cjk^*aRʅZ
��Y��V[�d��rjec#�b^A���[#��qJ)���+J��8�����8�~8:�ÎG��u]BH��d8��9�L�aN�0�y睮�K�q�x��/2��>�~��?Q�0��zԯ?�n�Fd��=_A�:F.KU�iy�P:RK
+�R����X���v�$M~dt!z��ELi<���i9�y�J���~���d�ܵu!w!�Oa�)�d6��i�Qa��p8��{Ѵ`��|>��q/v���us���).M��c��&��+��|G�����B�R�X�)��
N^dXS���xY��1����|G��Q��S��������Z����ɓ]��IP
+0_�/�G��R��l���M����C�w����17^3\(�Cld�_�<;�Z�u�.v�F_9��ٴ�;^�>Ri!GD�n*B��)V��R��,B�O)\�_��j@>�k��&�{�OQ�.�Fe�ȣ���SK�)I
+d��{ϩ����c�$dp"2N�2IS���P�"$I|���%�ՖR��\����Q�ЭМZ7e;q�(����V�� 񩬅�TX}��
+'�����Z��_��K��-^c
5#���Gj� '������'�H��1�
++J����C\����B
+T�8�o��X�ЭP0RK[#�1���!WaBk{�(��+�G�p���X:�������3P��x�z
�������l��Ӂ0�������Bdtd�<�(�L&Q�a�)��
<Y���!�C���8��q��h���5�*�i��u^>��U�[����a5WKu �zo
���
V�)'�o�%Sat�Q���[�K�q8�iʢ�^��eUKGyĉ5������eId
+~qC�r�~����ՙ�F���9�2%a�+$]�yx��t�Aض=�N�xz��8F�G��(��өmۮ�A���� ����E
+���Z�qx�'�*L���.Eݾ
��1�Ͼ*a�I�7�L�UW�^��Zm�ȥ�jF%��)+\b+��:o���������Be��x�T�׃^o��#�$�˪�읜��5�ri�d��D��ccge<�)Y��IRT��$o�ofW%���t�k4�����$[8��T�t��@��~iS�����!$�"���,�U�����*AJ4B��a����1?2u�3�s��I�����R�r����K��V���r�KiE���BSV�ݠ�,v���[#"�K�y��Ḍ���d��u'C����?�L&���
�Ξ:7VE1�+W%5�x2��=�ˑ\�Y�:l�%q��P�j��<�^՞G5�l��_3�����uk�'�f`SOjmV�J��0rH��)iWm��}H����*�V;�ZM���tG�o�ʵ�n�;:o�d��?gg0\
���p]�0��7��G�l�,���ߟ�fh{��ˌ
J�p8ĸ� �^�t:�}�6�3����aN&�o~�
̇3�
\�+T6xVo_~��坝<R��X|LM��C�4Cnp��AY���kSf5>+/~N�Z��o)�y-v�tW��nq���������'l b�l�i��8��R��~:��C�@Hj���h�7�`�+\z��a�Y�ů����od��餠�:�����;߹�///�9�4f:9>>�$޽j�}	:��q�߶ɫ$��֥N���������,8_+���=����?/��/%��%������]�z�ŋ/�H��S��"ƨf�6�@$I2��l۞�fL������
�`Y��$�|>g�`�뺶m�������n��%v�G.��{��1��ri��b�`}��L������X��N#��������������y4zPKBj}��]�U���v���o��^�M�x����_v�$9y� 
x2ɺR;�3r-�~]q�ш� ��FCh�t���|��b�`۹X.���2��n�,4]�8R|�	���I~7A>+,!dp����[��%l�z����59
S�*�w���{���⭑$I���|>G{���Ue=ܿ����~�
<l>�[��f�!�ł7r��9;�u]�F�)(m�bkd��-:BV��'��|�1�vˌ7B��t��T9#��no&$N�<�-@�Xe+Y��ofq���� $!��j%G�H�j���=�=u��H[o�����|q%�ዠ�S���Z��tS��F`�F���A@)u��W_u܎���0D:�"Ϟ=Ku����N�H-L%,���s�U�֘�����ciĂ� ܚ�ዱ��V�Z�Ta��r߫.���k�����X o���us� �c�JV-�jyl�\��H��V����_�Zw��aUF�ʒ)�E�^A+����pD���R*]�V7��┴ks�.D�|���D�H�9����]�>ql��/~��R���1Dž�j��L�˱��uc�m�+
+,��~W��
+�2'�\�����HF#	ՎyT5Z�����7�8V���#���u0p)�dL�������̍�Z�ԃ�i�}ۇV���v�k�Ơ�S��7���
+��R��s?�Z��P�!���R������%�ჵr��2{X�C�ڮaˏ%uU��Q0%�Yv�'�hڶ͢vYpo
+���e���c�r��n���X��|�gBf��Zf�����,�Մ�>R2H�F���ؔX�4�	=iIj��al�,)*�ߔH��@��{�<�E����Ť��-�J�^l���X��6"�BY)����H-YW*��5�A��ė^f��1 ҫFQ�8��o��T���o����t:}��+�>�N�(�^�&Dj��������X��pbI�=L_�Ν��_(J��B^�P]�L'յB��Y�˪��6pO*8%u��~�Q�F�Pe��ɪ�H)Ye�-��/%k4��M��y*[�a��Ug��Y���R��.U����4BjJ����`gg�]��gg[��J�~�y�m���ַ,�ª#�?�[�0Dc�u]�����C۶=ϣ�Z�
�C���|����[���`� #8X�������@��S.u��Rie���ӫ�7�I�j��U	�'ּ�P44Ԁ�SR�
Upɽ_Wxr��SmP
+�$r����W�t�$pX\��^�|�?�i�
��X����FY��w/.V���݋��顗SMA� IDATR�=���::L�VA<�A���]؃��X
���
�Gg�A]Ԟ���t��f�{)��_��~�nc���&����"�MEmt�Q9R�+��r��6ڲ3�=[e��%5�Kt%p/[\��,�pUwv�؂���~��C*�k��H-�NOW��:%t�k4�Ԕ��,���a�<�ڛ���x2=b�U
�#4��x"�rG���S~�'@��xx�$�`��zn��c⮺/#��V|u�W�Z����6�%�̅�SҮW�Bb�mۦib� &Z��{$&�a��?��?`-�$I|�g�~����}B�`��i��b� �X�����������V'iU�i�}��������o5��&=��Q�ͬ%R��yT5���)�U)�����~�������l�;꛹R%GVs���G�-�6XgR�?��~�)���&[��B�Hw�帶.�4'P�����p]�0�2�y����0Dc�R����s�.����QJ	!��=��9�q�����,�c�4YA�i���uPP)��R�HXnY�Z6��%���V�.�h� g�NC�Xlz��N=U�aN+؂���$�6�7��t�VSG��B|�MhzW_��c߇'O8��`>�&��iL
V+oՂ��l�yk$'R:>ܐ��_8ے
r���y��0����"���)��ǬA��1�����9�L�(��0�����i����r%�S>��)%kYg,���)����U�^�;�r��J�k��2��M��B���:����h"��|�fP���&Dj	����������Z]c?��c@|R0�5z���q�eF5�X$Ԗ�JOl�w���tc��V���[#9�Z�™)J�ܖ\�5MvY�n?�я��q����)�A��aF�e�`�{-ˢ��� ���hE���=:�b�-��Y��
+��;�"NDV��s�d��`y���x	L4��cq���
�Ժ�?���jIO�"�r]�$[���PվK5����S��W)e{\���QOQ���[#9@B��d-�ȶd�8��`Ah8:���{�!�	2�0�z9
+�$��iN&�g��
�x�w�	�r�@�P''B���V�P@dE��"kG�kU��lњcDc� $/k=�3��t͟ 	2�{��m�憐�,ZѤH���~_��]'��ŭ[����bgy~Y���M���%�de�!����i�ͻ�[�� �'uҶ�j���^<Vi��
+�����U�)���k�����6ֹ��;w����AH��Dj�'I2����`-v�K����l6[.��?��s�tSg�iҵJ
›���|e��I����M�5��]�x�$Jy�)���_�j*�\M��+8%u��ȩ%����aE �'�!$!�'��Q�B
+�VC4�	�bC��LC*���<�M#=%����d���
��,LӜ���Q��H�&G�$�e�m�\.
�H�ԑ�w6�����|>����gI��f.�Ԍv�'?����R$����I$�uښ̶�:�EXI�J�Ѩ�
+>����ʦ�IO�./���#Hw�jf�nAN�2���liC��j�{��U�Ej��aH��-�b|*�~)[X�Dh���5d��Y}��h$r���$���WX�̛,���_طר|t����C9�¾�)Y��Q�J�U�:զ+�'RA�����է4���Q�
+�h4���ė?oᰩ{E<oJq-vF�"§����,N���˳>��-�_M\!����$b)5R�*����T~7`Mؙ
+NI��FDL4�!��^\+[�Ù�,J�p����40\���d�TjuW��)�9�2gU�F$0�hҧ�M��o�H-vv<pU��O�qƧ�ʌH����
��Jժ*��]�S�
+�ן���|�Z��҃�@����u�cQ�7	*Iw�8%�:T�.T�i�D��b)	I��ޥO	�A{�);-cQ
+2�W���e	p�f��4�=��z�Σ��4v2%��b߄ܺ����f.��	@BFO�e�>�{Y�$��T=u�CjbW_y��'(�w�7"��u��q���#�����d�{$s�;�����������-D�q���A��(���U��4��
9 ��:}�,���-٬|@�w��!F�����J���K��R�-���$�5"��7!�.��Ԓ�1\��ע�ɉv���ՁR��N"�*�pH�JVO��U��SҮ͡�_�1vuI
��b��,����?��$I�6Ѳ,�R�<���|>�[��\.M�����>R7�Yx�믿~~~�NA�F۶��m�sj�n�r,dpRs�Q����o$�\4Gс=�7"�bW�xQ�GU�Q�LI„�*B��e���6MOR|#�N��+W����-
+��E�u�ˀܷ����F����?x��+w�
+�$�y��8̧a��t||L)�8]V�ֵ�g��ڶDZa�?�жmXgFQ��G}4�)�R<�s�&�]ՋR���NY���>ܻ�C��a0�T'ҁϣ~*o&
+�P$�,5���1�h��!�U�;bԊ{_~���H�-��!��`0�۷��mr�}l]�5M�Y�`?�я��1�p����8v���[��y�.gɂE3u�)���ǜ�g��]V�����AY�+���;�I��(���,߯[�W\�,����������[\�l��‡����8a\ð��Ð_c��8�n�ò'n��=��<�b7*R+Wҵ;�׃݂ͯZ]�&��~�O���5�v.TYkD�VE��Xz�T�k�)8%u����~�srO����9���Ó'9��Z��QPd8:���{�!�"c8��a�C�(�q�ٳg�~�7�)8��c�+�&�;l{<�zn|ړ.k�2�
�0n 8��_GV�S�'�ꄸʲA��%��%�"��F3�ʩ��O1S���~�w]����t:�U0۶��iv<�3#�"�q�~�m4l��)ޓ�R��B{m��t���#f�L��(��(*�?)�©Z�ʬ���Z
�T�m�T�' Q�-o���v�n.�QpJ��Pl��'��A�{-ˊ���]�ZH�k����n�&�n����m�>q�R�w�2���'�U�#�+F�x,�!~y��m�B���Q���V��~�&j�D.�
��ي#�ꇸzeF��a�
X'�O�S۶����?�!Vy��1�:��á뺎�����C۶�
\��d��N
��@J
��7ZB��)�(�ta��l�'l�:}WA�u��G�}#�Z����0*d2I1�䲗`����B�p�K�Z<�)��0J��R�CK~��M��rW�kx|,zdYYu<�:R+���y�@���
!5%�B���h�����YH�~���_&8%��A��o4f�FEj��O/W*d�
�����Z��J���UQ��ۤD�*���B�)����Dy��I1�97/.�Ȣ��5���7
��Dֺ�Ո��u���!�[o��{B_��,f�T�QGjm8�*{D
+��5��RSoc�����woˋ
FL�C�0��.3Q�w�>~�����o����o��z���C�{pp��K/��u,=fx��GyhP��[dj���	��j�`hw�?R�VR���$�WUpJ�5��>-�
4J����]���
+V8��R$�
�
\\�"����Qr��0|z=�t��� ؚY!�$���JI-Naܔi���^~�b0�fS'��aè|*�:3�(ֿ=�@H�䈌�;������������w<���FjEQ��j�H-�M��rMϸ�ϭ
+�"��Y��b��{6B���������ґZre%	����(�א�·��)	G��>D�򡿹1�؈�����������j��e��TjXO���~>�`-�Z�h4���om\%)f��SR����H�r�VWЕ�8=44`^}��+���ª ��#ݠ��R��5e�A�nE��AA���D <�4�"�$5c�oN�Vn��Ѹ`
��VR"��XY7�ߪ�RUS�4�U~�H�l��zh�� ��nX#����"lܗ�6�Q�p��Zf���/9"A�R=ːtz�T��`�f �^�+`	|Y�u��JC#��wYn� o����P��\B/�gc����0�q��~�ͩ,B�Gt�
k$C�M�D����}��Z��!;��L&�ð�FA _;��1�t<c�vtt��a����dŒ� ��o��
+� ͓xzv�OF]I)���sj��"�f�\|8J��jx�h$4}�,�W��UAkDA��Fe�ҁ|Y)S�H�C�D�0�<�����(�&�	�1g�⌃�c�H����.,0���-�qs"�
+�eǎ\�U"��2���>���9�W6����]Dj�+�����
k�1�����ϟ߽{7��Уƿ����e[\�5�/9��BIJ,�4�LB�6vSJ	!��0K��{}ߟ�fq��ɗ`/qE����8�onc�.B����=��Ə��c�����c�{�h�6^{헼J|o�.Q�z���΀�㳳j=��$^y���
+�pvvVA�������,v5j�e���[Q�Q�V�D�Q$u�����x���~��ݻ����
�FQ�
+}�{?����~��I�nH�T?�:�h��eY���f3\�JU?Dm� �"�xVEX�����h��q��֡��ձE��԰ �s����_��l��k����
+�]�{#��������tFk�����ǟm��+_
�������1r��x/8��|��W>�&A|���/��v�������W_UsJ��4�
.丮�C'���_�����U[�g_���8�l�Z�l-
+2H*������m������Q�R�$�XU
+)�a�O�!���|G4T>������W���w�>y��Y

���>!h�]�Y��
+�Ľ6��_9l	�X$����b���I��bܻ��~��_�:k��za�zT5�G~��U!D��$~��%om�D@E��������#�a�EaN4A`T3!O�
+�$$��cp�,����\
�!K}�>S֛�R�|M��u�k��T
��m�׃୷�/��A6��V
+>��� ��!ֈM��œd�ɶ�_,ے��X�3U�h˲��*�
�~�O)�I�3�eY���Z�E)=88(w-dC�'��j
!�SkM^(*��J)R�&"�R߱�5�馲�
+\:RK[�f����e=R.�������&��aS�CL��,��(�Н��|�C6+�LI�ݪ��ѐV�!��L�9G>Y_�&h��p����`��IxCZ�)"J�B4_�C��f )8%u����3u����S|�`t��j.#�L�\�Bw9&��9�Lp�	O7�w��җ��з�L�߇���@{DT!@��l����h��2����(���"~���B�U��D�pJb�;�]�));��p�T��f����b%u��!�g%��qJB�62b_���	�Z�el�1��	���*ޮPj�����Y�?�[+6�Ua�\�
iE\^�i.�ٶ��](�ڻ�PqJJ:�۷o�[�����]�Ţ`o�$��r�\�-��WSc0T;�	��w@��Z	!%����ߏ��������B�_AC�V�GU�Q�vJ�nT����YI�̥�#�`���7
���q%^V�>��~2%	@2�*e�~�[ͪ�uீ�j�B���3�Z���ٳq�Iix�Y��MȖ�����.�����]�G��������兠b=�_���bňUM�����֞店(ۈ�!�ǧ������i�~,,
+I��ըyo���nE�ƚ��v�ʕxK���������h�<�����I���"�7!���Y������"�Xv����htA)^�c�ʼ9��]=�?�考<P�ߗx�X���4$��t�)�rM\\��dz�m�� !�'�~$7�^g��܈q�E_�wr||�蔴ks�.v����n�����^ʈ��$\iοQM���]�5
��5�M�V�GU�Q����o�R��
G�+�E�(|���| R�F��
;��y��N�
+�=W��7�V�
+>ŝ��h��M~���+߇{��޽��w��	Ś��,�u�h�!��r
+��

�.�e8�Lj��V�`YB���h��.�]��E���U��
+����RY� kD�"4���䦀u��c�Ę��8�/���JW9�X�W��bk��^���Ƃ*��4���\Ō�컊j׊i_!�_�N�F.�P�/$��z�BAN��[#�o)�I>�<-����L�(����G���Y"���e����^��X���G�6�ɕ�4/px�����C�FC�yĥ��Ֆ&j��`��s�=��<���o�ֺOH;FJ�P�̦��~�b�̦����Q�>W�S������5��UfG�d���8�����8
L&��a8=�x
����q�-����8���R�l-BH���>���������pLD{���j�I�D���Ñ�k(��t���#s��Hϩ�7BX~�F�k�e���[Q��ĭ( g)�_ey�ڋY�qc��G�Y�8��r�J��E��8o��6Np��_Gp����0���ѣG���t:��|6|kϩ"=�7]��_k���X�¬q��-I�F.���/�F���t���S�:��"�Ů�ٮW�"�2��b����_�d4J�Ҁl��7؟<f�&.˲f�6���~~~�3�r�4M��?�����m�f3<�f��O�S�^,�m۶��~�u1���m�����o~�o�4�H`K_:��m"��g�LA�GU�9ܺu+�$>�V���� ۶���Z,��|�X����|6��)ò,��s��y���m{�\���������xJ�$8C��k�6o��ڗ˥m�(:�w3W��o�i�6����j�/��l�h�*;A�y�߹sg�*��y�H6R���CSX���Ӝc�`�qt�0�FE��M�S�0��>�e�X�}6�QJq�
+K%>~�8C۶a]"�p����O���1��P�g|h�������[n�zY^����4/����*,~iV��6���I�Ŝ�Yϼ�Q� ����$�>�۬%)������믣Ä
�}��/�A���]؃���jF�4�U�:��DjQ
+��5��\���T��5�s�%� ����$��2;=��뚦�a�i���8�����pXg�q4T<��۬�-���f�47����U��~
�Z�p��)�����!Ye������|�~��T
+;FR��OFA`P�+���}~�V����a���
�ٳg)Aq�e���v��8�:�tu����A��T�:Is�Zl�w�J�~�ki��'w�@K�e�R�5�kN|;���g��d�&�p���\�gϞݺu��'�c61���Kx:��C���!�LT��S�;�n}�&N$MCeBj�v��XE��5�T��w`6��i�Qἓ����m���!����4M��Ɉ�$8C��(�8��]�n)�h�/��x��V8���1��Z#^;��u~;*��w*V� �H�Ǽ�\,��\.��I �������N�5T-~�/���J@����Y"h'^�g��*�WیCm9�u_���A�
A��,�DJ':	J
+�����=��z/k(�e�5���2���+��a��& M��Q����ؑ�<���[�7uJ�#�r.5�pq1�.k:��\�V)�H-)БZ;�Q�m'���{��w��XZ��Oܸ�1K:X�	t�y��� �fk�-��P�!.�����S�#�SDg��Y�K왫ݻ��U�\G2����hϟ?�~��J��#@�>��.�����(k<>>�&2�H�Ktvvz=X�BV�R�3^�&zN5�_��H��S������{Tî�3u!��P-R�����|�i1@2=�"K���V����}
gjY����hR"�l�F�^F��{R�"/�r��
�J
c�����/��f3d�e���&����(V4뾟�%��bI�&�&�ok�z���Oq�}#�Z� 3depȜPٵ28=<�[C;�8k!�e辯�L-�ӑZ�B��!+��jR��t:Ŭt$��8���7 ���tj�6�����2��T�C��@�� �ﷻ� IDAT<\^6�m�Z��%��F4�½����$�{�%��������D��"ͩ5�	}EZ88��x�z#�ibz!�`����e�)���!!k�PJ-�’Yx�bTZ�J�+����V�)��V��ޕ�}C�ehƁ��_�,�����T���P0x����V:Eq8�stt���8��L&��a�R�q�0Ī�?��&�	��8����cl�ގ��p;��x����7��
Y_��|Z�|0��^�:"FN��W�#�~5�~���v�c�=_�F��æ�)DQD��qf�S�Ơ��c�0� ,�b5LP<X�Z�QQ������N��
+Z�u���^mK�*�����j^(����F$Fj��ks���<{!�������6�1�6��2q&�uA\���}<�4M����oQ
��V
Z��S�h�Ⱦ�3�,NGji�
�h��x�M�X�CV
V�Fছ�ph�&.�a#cwܿ�W
+�jJ�4�����'��3Z��J<kԁ֒�}�~Ȝ݌Մ��P�lK�������q�}ߞ�=|�0�"V
+۱�;�
!���a2\#����<E�e���#��)�ka`����կJ�n;;�LD

�& �]���!��j�6�P��!���|��,^��ʮu�U�*��J
+��k%"J������gϞ�~�.q��hT���БM�,�u��}�s�ٌ9@0*ר@�-~ppP�
+�'���J���h�������c�����Hckd����b�Ğ/.`<.b{l�1��Q�jȺE��L"�#ï�t���}�߭%�
+��-��5R���Cisll��v�]^^`3?iRJ��0u�S����SB��)���\�:�U��z��obs���J��!�/��^˃�t����|�
�[�7�qpe#���"�~͉�d�)�a�q|yyyxx�<'�d�.�;::�������� �=�c��;�s�Ν/}�K��ܽ{�ɓ'���,`�\=Ƚ��cJa~��4R	��:�F#8=��&]�j��Fs�;%)}3��j��L��x,s*�h�йBŧx��u!�ܽ2���ٿ��b����r�\.�|K��1F��7�Tdp��������`���2�#�����ۭ��!�=��A�Vwk5�V�J.�Ԫ�fEj�W�Z)�RҺV�\���$�y�,���H-��Z��lީ]�-�{I1R.κ��vxH�����#���p�·��]�z����k;߫}Y-�kS��A�
A�X���CFG�q���%1����0
70;���b�*���CeS�<<ϓN��`0=�������*�N�J10�y�$V�5�`�ò1Wb��B�Ӳ�fSD����wO�4}Z|���ۣ��`*JW1Z�Ӡ��x�eq�SKCYH�~E��8o��66���IJ)rv���V�t:}���p��iE��t���=��`2��b�::o�h�������/ur�T�J��hhh� ������)H�~�y�m���ַ��a�?��%�!��"��Çm��<�R�]I��ز�U�k�Q`^��:PP%ؑV�[
͔vQ�B)��5��H��@�O���Ek�]��P~���Kq:RK�	���<}#!0�`��Vō�
YH�~���_}:��g����yt�`;�����jF���U�8Du�6
U�i���tv,�RA�������F���$?-��P
+me�t?�gS�]�^��ӑZ-`������`��k�1S��X�K�b�+�X�
+m���~��7�Ā�gϞ��q<q����K/����a��]�=2B|
Ł.ͽ��h�N��AN-BB�Ѩ��ȶm�4m��m۶-�����mۋ�b6�ٶ���߲��b�{��e�Ba>��f�Mr��yV�z�ƫ�,Q7
+>�
A�SK��[@��h��Ԏ�����m�)IsjIĦ)qE��VF�k��J�.8��2^�y�4��|�T?�����~U�.����R1�0{.S��ܲ���6���>J�p8�L&�+�L&��}�6�z����a�a���g?�nc!$r�ǡ�J,����C��S���Z�~H�h苤u�C)׹��$r��~x!R�P�gN��!��[����|�)�]��R��A�H,%�Kğ��K�蹎�e�����Fg
l<2W�^"]��)dKM�&���R�
�u]��(b�
a���A����{��F�010�c<�q)ڶM)E�J�i�,N����(��8�M�,P[��5��>��>K|�;S�A�GU�!����4%R]����3
+>ŝ��d�J
+��A������)w�4� �0M���u˲\����>7���	�Yw���[��y�����(bV
+;����V��TCCC�4�� R�ي�}�r��P���*A�Z���y�$V�|{v��]y��V4&��.ͳ�Afi 0S���a�񫯾�830����RϞ=�u�ߏ:)��=-������q�tH�^Z�~�kS��C�FC��*�P�kH)�#�RZ!T	��JA�@Ib�=���Z�gg��o˔�\�/�0+[p�Y�"�c����q�NyUR����if	
�4|T5��H-\C_:.�ek b1��A`�f�؂�|lt�,C�=�#�`�0�"��E���x��,����
+{NT|���:|��0R+�%����>LL����:pK$ePCCCCC}����
���Z�0��ќ@?<�j�c	v��8,n���:Ŷm�Z".��Yp]��� T	��JA�@Iw}��t��-�։ $>-�\^�G�ʖ�ZV�d�,�MY
+�
!�E��G��æZ�Q9��l(�zŬX/��a�~�~�O)�,K��
H�œ��@����ҲVq+E�y�-)$U%�RP%P2R��ֈҭ�O��%l�#-R��k)�}�ղ8]�P�
�>$��#��aS-v�Q���;�mJ):F��`-�ea=��e�q�}�;A�ˆ�+���ykDCCCCCCHw�;��L���R�%�ّhx0�ј
���p8�|�N
��e��v��N��$��*S�k��J��V
+�j��w\}�6��%���� [p_�X����ZV�ĵ)K�·

'�v�$�원[�]䡐5�h ��c��h
+>ŝ���H��P3��>�5�g_e�,NGji4��>�H���S�원˭"��B9�6{nTV^�κg�ĉ��صoD>^|�EB���(۶MӴm�m۶,+���|�$�b��,�'?��m�lj�\��OY,�O�$�i��b�@B��b�g������F�W��sv�l�w�圍ǗQ�9�wx�t�]칲��hDѾ��w���!�}�ѾV�l������T)QR+UJ�t�w������o��n�lK�$k�m�?y��$��I���_�5�l6�?q/��a�����|n�6Z#Y����:��|2��n�jY\���5�H���J��l��1�F�5�Cg�V
���S���Z4C�H�1*"��<�s�V7�aN&��O��i��IM�dفX[��*�؈��Z#U�ž��hYݒղ8���>z=��V��x�^>
��8���L7��y���NL,s�q6�`#V�$W�����vn�!��H�n
�}A筑d�Y#�ζdຮi�Hf�hLx���l��{�
G`����m"�����2h��WCCCCsj�	L��̓;ɪ~�5I�8FCe:�FQ4)�HՅ�3�N=zĎǃ���H�|�VQ+J�JA�@I�T	����5�\�C,,UP��G:��C��1��N�U�/6����;�F���O���6�L-�[�Zצ,�~���rף�}��H~o���a�ꇞ�ٶ�y�Բ�/|���0� l���
�u�{���C�xh����)Ji�tQJ+��*��Z)�(������Zl�_��$�׶m\g�q�i�8�[p>��������e]�<-@�����j��B�ꖬ���H-����./��8<��Ӝ��9׶�~��aX�5��);�R�1_�=�6�N_xa����
+���0d�;~8bmVg�� šX����묆�\t�7�[�³"V�U��o5444�)w=e�Z �
@u�2��R:�>}����8fS���
ˊtM��\�jF���U�9�v�)w�T	��JA�@Mw�����BW?���B��XB��4I��8ͩ������~Ȏ9??ϭx��l/|���(���ul�t
D����S�K�iR/���|���Z��q���'O��Z�4z=����7j>�M@dJB6��*r�a��l'�f��^F#89I���@)$d����qà�S|S"�4�S�P�3�����8D�Uic�FJ:bs9�jF��J��˜��M�9����V
+�JFj���V�ٚ���-�z��+544�|T5��޻���,�'��0&d��F%(�w�7R��w<.r�8�stt�u����d2�=��	N&�����8ʌ����&�Ju�eiY�����B��!�u�� FQ4�L�d�3NO8
a?���q���.,0“ki��&s�
�Gk��yk$���&G��@)ܽ�ދ��뺆a�$��\"a�{L����?�����@��� �L&șx��m,8�y��LE���g?�n��]5Ts*�T�g���~���U��8�������~��:�2����f3�F��!�q�\[�
8�ض�ꓠA�qs�s�oGP)��
+ė�|�Ë�@��B�|�PP%Pr������������H�>pz
+����\�b��a�q2�<}�L�ĽX�}6�!C�m�q�����0m��-p��9���O���1�,�x����6�٘�UM��u��%�=w�����߿?��5������B����-6U?d�+��Vo���aH��'&˲��!���W��wr�_B��#.R�&�R����_N(Mpot�կ�s���:#m5�Z�2r���%:>>��H�cN��d�E�Y�-���m���|>�/�7u���o&I�.��5*۶g�����mۋ��^�
�u]��vv
+�)ڶ�\.��y�R��N6�+����9q��W�	�~}?!d�o�>������l6Ùq�xq6I���m�&���sBH�$�i��Ĥ����r�Ǵ9�h$�3���i��M��!
+>�7�;�+&�
\dB_y�
��txx�8�a��Q�"Ϟ=�u�z���W�^z�%<{h��TrCV
8kI�6M��.�jY����h�H��#��D`+h���*���P�8+a)w�B�4;:F�#���ڼ�J�e�R�%����|�V
+�Jj��J�d��
��j��)�"���Fsl�]l�O�����QΟ"r+ȊH�|y�v����*P�Q�h;��bs�����ԞB���y��`9�)�/e��#�~M�P
+>ŝ�L��F��p��G|�0�]�vao�t�-poꔂYD:h�X�M��6C�ꖬ�ŵ)K��(�}Bj���LTpJ��漣
p��?��J��F�
+Z��.4���54�|T5���?��O���$�fV3�E5�(��-���.BA�T	>�����7�ٵנ��C�W�Y��HA�GU�	NI��
����[F���S
�P�)�)�Zh$d��ڑ�
ZV�d�,NGji��^�kޛ�A��y`˦R���=���U�����ykD�SKc���H�ꖬ��iN-�& �@�/�tS�;y��	�Zwg:�2��q� @{��N��=b�����Cly�Cjjuyy�k�P�B)���*��d��F$�q���#\����d�{$N8�GQD)eHqSJ��1�`oGGG���x<�L&�� ��o��54444Ej�} �s�>����vݾ
gg���.�ש~�y�m۞�QJ-����0� �ʼa���.VE|��!<���X
+ӃbZaUL8=l�6���P
+j��J��Y筑�����Z���m
p]�0���SY�a�–XL=�z�K8�c_��R�%��86M�y�Z|ľ��hYݒղ8����
�>���rG?�..�d�.!�-�1k�RE�eY�e��)���O��~�O�N��O�U�(;�A��oOU��+�
�u�44:��[#9�Z�q=;���vkF�2ˁ
ӈw�}��>�~��e��U8���Z�*988�mln#���z^���euN����h�2߇$������,0�
+��0L��� лN)Ţ��~��~�T"�t8>}�4���j^
���
n����:�jF�(�ս{px�#����V
+�J.�u�{�#�HK��i���Y��׿~���>�$�~o>�7��<�������l�<�8�[�utt���|��WT+����hhhhԀH*���x�e���������7L��V?�F۶�]8��>M�dgux��6�P3�EA�
J��&���%�RP%Pr����8�0��S���|�k_#�����[�$���4MdJaT�a���;
->	B��^���k(���9q:RKc'����7����!�+��!+���:���[ECc����[vb@�v�Ό�R�8����͏���C�GUC:t�CA�YN)�R�J�%J](�RP%P���>Fj����aFqHvij/������6J444n4� |EŴJ颒jj](�RP%БZM@���]R���&BV��5Yuв:%�eq:RKCCCe�3�}�|��А��[#z!�>���H�ꖬ��iN-�& e�L�;�+_�쬎!�)���<+��]X�Q_yA��5����*��Z)�(�@�ykDJU������?�����-"�ر�:��X���`-v����q�(�N��m���h��q�\��,Ԍ`�Z	BA�@I�T	�\ �5Rj!J$�h�v?<��+�k(���9q:RK�
�T�*����i��s�J�#K/���W�������U��GW	#��&+�khhh�����<32��{8�stt�4z�'�I,.��R6��q�}�a�X��4Ub��{��6�"�)��%�J����u��:�4J�D[�5l⋤s��tqRW��[qSc�[������P���ϟ߿����/p(��aS-v�;�K]����1#˲X!E��,oWqJ����ͱE��T�M�l���X�K���J-_��F�J�_0��S������{��3��8����A�8n�?y�a��qvLǬ���=�òS�R�u�������ܺu+C�-��~l۞L&��������m3ck��!Q�6��S��PCc�P�QՐY��l~
�8�1v+Ct��E��`hV��g�
B�b�
�R,�>�Ϗ����9�Şq�r�9U��U�ͬ��u(�w��7���m?+�X����=�ú"�e
�a��������)���l:��q��a�?۶)���
��7?99�O�N��1o�n
+T6vAg�e@�ꖬ�ŵ)KGji���Z�lo��:_���g��|��,^��6Vy]CCC�����rja��ԇa0�r�뺦i�_���Y��׿f�L�^�r���[��ف�`�0"�9�u�/.J���f�}%2Ҳ�%�eq�SK�	lMe���룠�&��eosޡM\���Z	BA�@I�T	�\ �o$��!�0�wO4�C�Xdm���q��}�k|#��>W�ٳg�n�⏌�x8�qpp��K/����tRTCCCCC
l%��[
+d�Pɪ��Wjr
i���J��V
+�j.�%ǭ[��$�}�v�1�$��6$���<ղX,���Y;n,���r�=}�\������)��o�>�(� "�IiIV
��n�jY\���ܹӚ,��'��)	 
�8B�Y󎆆Ʈ��S���ZY�B�W"�~m���>qXn���)]������P-�s�t��F!�'(�^o�8)��a��M���=�k��W��� T	��JA�@�H��[#"�3C��7ԉ����F�Y ���Lė@�!��aEh���2�N1͝R�8��l��t���#v<�\=D5#X�V�PP%PR+U%�:o���~���6mw-K�RD\��\��h�1�z�>��]�ÞڛB��H"�y�Բ�/|���iWl���
���)�~ IDAT��C�x��544ZA���(�b�kx���-Y-�ӑZM �@��߈�
�`��v���������	
+�+�nlgǷ��f��J
+�Jj��J���rjihhhhh�������a�7"B���
�0L5��ʆ�Ј�媘-A)���կ�aW�bwT3�Ek%U%�RP%Ps�l�i�u!©%۶MӴm�m۶,+�H����b��m��f!E!ۓ$1M�Z,�˲�)��|>��d�Q�Skӝ���IZV��iN-�& ȩ�4����dL�쎩]�쎌�Q��QA6

�RP�)֑ZWp]�0�2�y��GA�1��u]�#du�1*��r�����lDZi�<�IC	�� �v/�o_Cq��ΉӑZM@�SK.�cA�C~W.�##ul��Q��� T	��JA�@�H��[#9����9�mɀ�*"�"3!��)�	"X� ���J
��2v,��8��^&*�����h[Ț��υ��jF�h���J��V
+�J.�u��Y����Rs[2p]�4� �0M�
�q#'	���Z#�� �(2#˲�t�!!�e���fQ��+����-Y-�ӜZ;A,��B筑��(�r�|�—I�d�8�4�2�'� �8�%���:ߦib)+���j(A��5<F�ꖬ���H-�& �t�T�C��!ϸ�{�'��}���<$f������P3�Ek%U%�RP%Pr���$ɮu���_~��>�ۗ���`mW�:�q�7�l�j�{��'O*��(�7F�jh�ڏ��\Ț��q]��7u�.�}:�Z�5�N]�=::B:��!�~2�`D۶�����$�mcA�~���|����52}3kht
+>ŝ����a6epr�u����e�J����h|�C�"����yX��3N���(���>4d���~�V��7�QCCCqt�Q��a�l��Ka_�c��n�jY����h�2����<ƭ�QEQ�r�OeT3�Ek%U%�RP%Pr�LW?�����А��Y��i� ^��u]�^�]���!��TFt�����n*��\CZ+A(�(���*��d�.xR���-����~�$	@BHK�6A�ꖬ����M`k��&�J2�ꇛ�[	Q�P�n���F)(�ߠH�񸠸ȍƾ��hYݒղ8���v�ʘ��R?�Q��� T	��JA�@�H��©5�픝j
+�"0��9�44@�GUC.ħ����f���:|�;�
�@��)0S�9::�hZ�b�L&:�H���N�8�Z����I��Pӌ����А��44444��F�nq���?�ǫ]�
P
+�����u]�0��뺛��� @��u]�7�rH����'?��d2��x:�b���Xy���DQ4�N����66�y�{�	�+����-Y-���M@$RK�"�j��J
+�Jj��J���yN�l�Ȧ�������͆o1���<�r�T����J���g�ٟ�ɟ���?���0�Ǐ@��mSJ���u]$}?99��f��4�c۶��q���}
�ײ�%�eq:oD�	�2��E��؟YJ-��B�+t�g�@�i�aH)�j�A��}��Ž����$ٽ|��y�a4�D�&א�J
+�Jj��J���y�HI�����2F���ﺮk�&�����F�8��; �;+ ��^��\�B1�"�����=(RQ
+�\����h�^9�//��h���ٵc��z �vp��A�b���
�(�аA��t:ŕ5t�c����=b���Q����иi�5"�G;#��1�#�,������8x�$������gϞ�N�/�>88�m��1��;þ��hYݒղ8���RS���u�_\\;&�:��=ϳm��<,���/|a8�j�m�a�����>䏇&��������*��Z)�(9%u5RG��p(H�H�*���i�'��ƬA��ٸ΄-Qٶ����с����'�q�l�8�����Zӂuҋ��e�VV��ڔ�����A;�RSRv��e*��%�/dAY8Sdg%��@˄�/l��t:}���#�*X�Y�W��Y��F��X�V�PP%PR+U%��[#Q������7�`���&/O��6�54444�� ��h����o�Z�lB����_��Wٰ+\������^z	O�pW�z

����Y#ab�8����Ki��]J�_C��Ÿ��Բ����jY\��vRO�5�d�&�TdJb��@�#�4�� p/���������v���h���oyl��J
+�Jj��J��ԍ��&c�,�SJq���z�֮�8<<Բ����jY\��
+x�4�tA��o��0��xJ��EF�"���.t�d�������,-�-��Z	BA�@I�T	���:�A�B$q�uR1Z���g^~��5I��5�GD�����QFCCCC�TTȸ�dV�G
_��W
+�ME7�﮻^CC㦡�c��
͐$�'>�^��$ɋ/�������ϟ?g��g�F��D��]Ϟ=���?����_~�lϹ�>��O��9���O�_/���
@��"�O�>E�q�װ�/�j����M.��P�V�m,u+V����^xᣏ>��z��ԧj
�*
��Ȭ��/���/�ppp��OzG
+6�O|�R����Fhq���w~���V�6hB�6'}��6����={������:`���V�����])�!��ڵ
"���eu�����(F7�F�/�����[ �������Ш�O|��ܵہ��sI�544444����x�W^y�7�`�a~�{�˒��
+X�?��?1��q��O�*2���Z��������%#��P�n�����څRM� �8~�W@m�A7�D�Q�����?nz�G)�~��W^�"��pa^bsR�a��o��x��I	��[���+���F���ZJbCH}�6���PJ�>}���ڜ�������z����a]sް
�4�7�x�q����U�e��k]`:�~���e%V��P�n�����څRM��d��蠶n��3�Z���u]�UlZ
+]�ϵ,��&%�!X�eY{<Z�^)�
!��l��j��e%6��i�'kG
+�Ӵ)1+�	`Ѻ6��ݢ���4�kE�@)E
+J\bozZ)����1�5�z��m��/�jJ)}<���m�uS�bςi��p2��kDE����}$slAb��<�)��^����!�Z�j)�
!�E���Z��ZHn�{��zmY��8��\;��F��<k�q<�ͦө"�X���b-��j�seX	
B�j��m���G���>L�(�x�=�uS��F�5�m+�7*%�"6�4zK�JlN�eY̐k�{���21Xۛ�j�$6$%�EZ�ɚ�zqA�Ψ�IhCR��@�
+��FC`���T�����X(=�KC������p��P��tSDP�B����}����t��)�^����ml$Iz�����RC���VK��2{�o�pXylS���v��>�^Z_�
w����Z�_:���/�i���n��#ۀ# �40��fW:m%����qkY�wM똔��i6W�ל���Ix����*+_*3��AfEED�T<����=����윞����U��mmmѠ`���)��V�K�G�t���|�xY��y���O������JOM�X��S�����l����Qxe<<<��y�Ag�t��_��������@��"Z�,�i��jǼ8M�P��.T>�<�&�nm�fu�g����{�>*�s�����T�Ql>M��@h�6h)�Ωh/��b�\�8Q�������o��o�_8<<����f����W���D�A{��ݫq��1�����90������{���'�� F�s�d`
V98|�������6k&D����e��*�������dձ���%׆?==}��1d	�9��p���mmm�w�R����������eJ)��L�%@E!�a>��g�|\B
pn�6.\!{yy��{��m#f���e] �����O���9����J)�h����m\8��j_{���&.)i��G�R_��g?a�;:!8�
�K	��
~�Edb凭�����x������8Ǡ6�h�6."zLi��M�*�*.���
�@=@
��@=@
��@=@
��@=@
��@=@
��@=@
��@=@
��@=@
��@=@
��@=@
��@=@
��@=@
��@=@
��@=@
��@=@
��@=@
��@=@
��@=�\��	J����k׮�_:==%������d���v�����021n3������hyyyf3
�F������}�q���ô6[[[��>�������N���tnܸ������|�s����2G<==�u�������w�s��܍7~�~I7{���믿������������߸qcoo/2>~��
�0Ӆ`ZP���M"����6B���{o|?kkk�%-����:7���4����{�������9ܿ�-���Ǐ��7�G�ݻ���,���>�moo��99�m`Fܻw�֭[�5���+������������7n���J)�>ì��ݿ_���:==�*
��a�joo����B������m)e�|(�����������3��������~_;;;B�x����U�Y^^��kJ)���ښ�s}}��G�@n����rzz:qC�D��4��Nl��x��Gkܸq#Q�X[[�����~mm���xJ)Ӭ�a�E�*¬���lW��ۋt����G����
(h#`ִ+��{�W�O "����ֵk����L�ð�0���
����������Z�Π����d_�ED[[[7n��t���ɵ�b@���."m���@J���͋���D���R��ӧ,>�ݻi��Zi�p�G��bN��RR�������S���������1��ݻ���8�
��m�@[b��H���9��
�h������I$B����������Z�
�����x�޽���$���a��~gg���C
���V��
aA��їC�OOOY!I�!�AK�leamm����c����i��[[[���p�
mTclmmݺu+n�h~P
+E��Xر����OS	�6�%�U������{�����qefoo�ڵkiZŁ6*aoo�ƍ���������q���1|@��3�(����Z�֭[�
+a�{�$��8�n݊Y__�IF�8{{{<�**��^
y��.�>r��D���ڵk����C)��9��Ќ���W�����_������ouſ�?x� c��V3&��b]e?M!���c��f��@4�\������6�h&zY0-�F@%���G֯8���&bʑ���x(#�(c����L�r0R�0.����9��֭[��S�k�ڵk��"�}���ִ����n�Z\\�2pR���uO�Ox����p�/�D����j�������1�/���1|[[[;;;���{��3����������k׮���Ri�l�x��
��Z__皃���={O�,d���a�,�L13?$;-ߺukyy�5��z�����=��<~���e B�)��������snr"Z[[���e1��R=dp�v���Ǐ�]������Ou<�{�ǏG�hcN��O�FL��ӧ���#2�]�&��z�ċ�h	����6�xj�J`����m�������sB���3Ȗ�6 .jut�k���03����a�ӉK[+b������;==E*yL����������^�l� ��Њ�����>���pqq�:A�=p�FX=����=)�N`����������"��M�ݴ�o���!"͈������g3��#�<x`��	!���M����P)���szz����=��
P
+�F@U��!-��믿���]��Y1�Bp��CWg��
0K���`S��č�Y�>��6f����ļX��mP����@=@
��@=@
��@=@
��@=@
��@=@
��@=@
��@=@
��@=@
��@=@
��@=@
��@=@
��@=@
��@=@
��@=@
��@=@
��@=@
��@=@
��@=@
��@=@
��@=@
��@=@
��@=@
��@=@
��@=@
��@=@
��@=@
��@=@
�C���6�ئ	�h2i�|�ǧ��l�$
�i�6�8�/�B�9�
7�{w�(�΄JMe��7q���	M��o~�VW�lj�ߌ�����
��n�x<Q`��o~3���w��㑋ì�&_�4�v���d�&�Dj�,N;�@Q��q�޽{��A D`Y
Q DrK!!��ʕ�ބz��(�2����m���H���<��Qt��Q��
�|��J���e�>��&���OyiljR�/,$ȣ��撏'
+ĩ�k�?�9~q\7 
+l{且���L����r��L�A�
+�t������ܟ��ٍ"�a��y��Ά
,�VVH�a�������ҐQ����6--Ѱ
w?�"����z��ſ��㲀(YFPlC]�,��fWjD~�q�d�V�񴋖�bZ	Q��1�Ƀj�! y
(@��P&?~������ͧO��.��M1��>�����>�����q+%�S5~���H�$�N�m��(�ǏA������������+A���z_���쳡��q6e�'q������;��&�k۩�5�x��ӎ�)���1�k �
�H�F���wvvvvv677�������ǿE)�����2�F��n7���WF��};�s�$q�$2
m!�����yP���ХK	=ko�x�87���-��"���T�wo���-��E��z��7Ȳ�߼Y���O��������̈́�c����''�o}+��g>�z����~���NN�?|8�X?>N�8	��ϓRd��#/�LDd�Qq��M��D�	bHa"��Skkk������RB"�ؠ;w��~�>��~���l�����<���"ߧ��l���S�������C_M��������.�"�)�h��]:���>��Ǵ�~�~��t(��w?��<�dW�|����W_}��?�!����ǯ���Y�U}��W_%"�߿��/�������Ė_*xpb�/^\�tif���ŋ�nw��hڃ�^�J��������gss��~��˗/��G/��ҧ�~��ŋ�K
h[[[����[K%q.W$��R����W���傝���Ӝy��xA���g�/P������?��_����ha᳑�bn�?y�--�id���.]�G��\�hV�/ZE��Y�͗j�}z���'O�t:��?����4Q$�m��������f��\������'ss��|����՗����w�Lb6����Ο�����η�J�N�7�E� IDAT���G��N�U���(��O���ߣ��ޥ'����-��#�-�ߖPx�Cx[�ږy�����|�Se��ȔJ�~;��|�}k���NJ��9V>�x�(I9�~�SOtj�v�'?����r������ϼ���z飈����R���	���R��η���`����e�Xtd�Q�K��q� ��>��j��-���N]����m�Hj�����������HI�X'��.}�w~��=�?����~��_1�?N����?��g�??���h���'-"M�a�D.]�����e�����L�x�����cZ���
���(��o����w)���鐳�G�u��H�������6��|<���1�e�m�'�j��ۅe`J�ć1�L�pvu5�Iic#���I����''���O}<q�''aڕo._�����t9r���//��ف��׿N�|���/�2}'���/����ǔ�BTގ�"ߦ�K���h>�8��|�w�z�������ѣ�d�I�D]����m�Hj�6������)��F��/�[z�c04v̭)r��%!F�!�qDt�r�(�\ۦ�����k�6tQe���Kd�C�Fʨk�N�@���~����+�GW���'K���P��-��N��^��U�t�������E
��U����\#i�T�2Oj�T/��h?���DdJ���������8Y��K;NI߭���U,~��>!�(����p���P
+}܌�y��PzF��@��Ո�oD�q�1-Q�G$������8BЗ�D�5R9��!�"�M�3���m2GI����,�]q��RD����-��$!�fb���Ե�^�q�:�&����3�����kY}�>�RA`��vC�m����m��6+s����;�f�^�����NcE|�3Ϲ�1�
Gѯ��Q���m]�4�dܣ�#�[6�m�g�8�/�#>��WE��m��/{��?��r�����z�7\��� [E��ι�KZ�m۞��}"�m!���p��d�D��¿��]��a�GD�m���2��}��m�H�`�}������D��ϛNBiO
+As���C"e(� pݾs��7V~�i��k�b���?��z\�ܞ���v�z&
)�ŷm�)
�kہm���z#�A������:�]��”���C����"�_�y���'8W�H��u�R� am9��(q���[���n�T��Ӄ��s�A�u�)�Z���u~�%5��`uKm����^b3^
+�7��z��(���ʿKl�^1�=D~x8�
+��3��"�H�޿I��
+	�:�dt�������>�7R��%_��+O8���6�q��
�e�m�g�.,,�=P9Z$E7�7M���;��^�{��II�OmR&�������4��Gz��%����,��{5��XV(��Qa��)G
+)F�#��<�NUQ�@X��
�؍L)���G]����m�HjGN�1��O���g�j��=��L����:,h���իa��+W�WF�'�LG������n�t�+��m�Dd��z��d'�RFg��
���8�d��W�^�zttT�,�,�]$�,�	�4��%,5��a�W_�����5r�?��q�C^���ݤ������H�G=U��2�T�i�H�6��{(/����e�t�Ͽ���o��/п��;�6��Vl^�>�Y��G��<��;՞�'�a*��?�zOb��O�k���K?��"�.i�K�C�.���m���66���5������X�3�d��z&qɞ�)d�-�ov�
�&����3E�t�;�U��XVϑI��s: ���#�]�2����s��Gq߭ϼ��ॗB�X���#a'�2����?�w5��}>a��D_�Q�գ�'��V}[3�\�p�Ϲ�KZ���=�;��D8n��fqP�/_�>�0�q(��+F�=�9��g�+@|h���v�郮ۏ'���(.%/_�D�@�0�&�Jm����͛�A ���¿���%�Н��L���n+���>��V=\d��{N;�q#
I���+�E*np��ڣ����t�+4�����o�	��CR��d~�◖�]^�;���G,$lf��?�'tvF?��ɿ�$9�W�D#	�����č(P
I ���oӟ���x���=�7޲��qȶ�ѣ�R�6yv��Σ�d�@L���<�u�M��>Q�f�(j�x��sFE�����r"�򴧖�N���}q�b1ǡ^�=""�v��u�c����N�ۦ%Jmc͟��y&�Q�5�������K?��$��=�I���?����F,����.������P"�>�W�~�
6�X���!%	R��:^q<7��-^YA�	�D�T�q�(
�S����͞���D��^���v��:���G�}DJ�)G� �2"�t�
�'C���k��n3&sW`�n>5���h�<�VM������.�T�ǡ�q�r�,���Y����w��+Wn̯�(BX}��K��=H|��w(%I�YJr>h��)OӜ��� JK�֎���q�:��$�F.��vhA������+��i�"�M�c��t�r����?>W���
+	�\�IX��Wl6�0�F�I�O�φ�ėhM܈���
Ϲ��`_y��g���4�؇Rۦ�����,����g���}�)"�9����W\�Ã��@�ԎZ�cx����8J)��Wq��=�%�#�'��<�YJ�ey��^���Dtr�v-��(�JJ��~�ҙy��VW}sХ%_׈���TA@�{9�D��*b��,^�2��B�  )����b�CΪ���+5<ǻw}��=����í��:�sv6�
�/^�Mo�C��k�V������ۥ����{��8�� |i���N'��G�m{RR A�3ݹC�����,�=����ۊFQ��:��7��Ҝ�|�n�a���=7�D666*��6��Z�����K4(�N,����w+�F6
[�g�-a��u���j_��CS����17[�19�MϚ1�/gL����2ϠUSm�YT<������a�f�/W�.%
�3�� Y J9��0�eB�ň�V�Wմ��kР�"������|�Sh+�{aVA��ǔ��4�׵e&�@ʈ�`ƍ�)�+e`��DDz���A��q)��I�'���������fDH�U�D@Ǎܤ��
+Cv��H{��.�շ����K�g���(D|>��V`����"	�ȅ�M_�'����'����.����u�u���AR�B�{����m$�EݪIl�[s�H�_���4�.��" �@,�L�A��
�Q�o/D��A����#�ل1�h"������yh@�i�Hj�6O�BH�+�[˿��^��w}^���f��W�=͇JX}���~�}���~L=Ħ�+�e�X��'��mi��O�-�Z5���AE�S�Z|\�n��N�֡e����V�Y$�.�Ca(פ���R�r6b*�hQ��_KK��U����hР�"��Q�~�i[�؅�r"��g���>xAF���ڏ�HX�����q�m�:�{�Gz��t�
+����͖��A�y��=�������w�'=����H{dR_�m� �S�}�}�
��aP�1�Ɔ�'V��B��8��)mȜ+�^�'�
�.�D����s�����L[N�^
"�㴝p����/���6yDt�*��43W��AƮ�\�_��%!HJ%H)���ѣ��Rj���$q�ܧRt|̱��8��Sr]OB	A�J�~`��
2�7�˅}�ͭz�Ƞ���v��ة�ԭf����W~�(�>���#:��7�I�oQj⺩$�N��#�r��wt��'1x�&4t�?1{�8m�~��wi7��߆������AE@$�DҢ�͈�R!Hj�5"�F��r^C�.{WڻzP��ԉ�
3�Ţ#�z��M�x���@���/b��*��
�������t�q�$Hqo�3򒔁��Ti��pI�f�ۻ�,+p�~��9�9V�Z23m��w?B[��j�
4������y��a� 9w7`t�Dȴc�d"*�&��&e��O�)4�j��u��|BڻZ�r�i\򖥙���kР�"���6�JAox�v��"D���>���"���(�pa5��Ht�f�r)�]S�I[^��p�BRT#�����-h
܈
��#D`S�ha����}Ħ	��b��{�-!������4ewj��膝��L(lu����C����$h# �͹?Ktm�����{�0�Nv"�$~(&.jBD3�G��x�I7;�2��Y&�"0F��4p�
�&"V}a��?�����m�
,�X
+s�3~D�	�Hڻf�A���7��/	
2�����k#��*]Q��\�#y�
�-��$�p�e�5�;LK\��A�It�(��c��q"�܅Տ{�A9�\
�����3h�Th
O��:h�����j��Z�R,$0�7z��r��:F6�z��I�?�a2���h$��l��`�+1�$�5ßܜ����A�F���k#؈*��K�Rf�
����n��r��DG�4�����@�G�Җ��i���g�����6Y�����+��= B7�@E@$�,\�;,g���U���G���L�#�.�xuE��W���$�o��"�"{�Ldc1.�۳kt�h�Hj�6r��e!��R�N8��U<�=j#�a��4Yp�o�����t)e��QwR�W{m�A��
�DGt���Ħ����D���l:I���uͅ8:�l���vk�����(��u$�Ȝ[q[�s��ٶ-�h�F����9���y�s�c��f�H�G�d���ݤ�i��^���l/�mk��^�~/�ˏ��>�})���A-+:�4!ބ�ڢ���]�m�Hj�6O�������_h!I��J3!����[ͻ��$� e���(BH��V�kk�jd*1>�哛��}M[��j�
\�AE�S�Z��DA�;�1B�9�`zC����No$�d$�<���t-m�)f?���a$
㞐��y��M4h�Hj�6�xY��=�&�ުI4�N5	)Gw��5a��:;��L�Iƙ�����fqPI #))D����7��n?��Ь䄍�ߠ�ti�������Ob���ѤV_�����@���Z�,t!ԹK������a.s��P����Y���l��H�i&!���4<`�T��{i���<�T u�	��g��sՋ�lfmS�DX���Őt�[=A*"M��ص���,!HZY���ɶIrr���!r�Ϻ.��y�A����"HJ���G]��#�ۺ��
��R�:Txj�EĦ�
v�$BݹV�Yↇ���m�|��
���g�
,c.�Hp��7����&Zo�-N�8�
+?��}��O�ﾦ-�Z5���AE�S�Z��,Mv��e�6i���q��!��Lq��y2���XD���Y��T5׳����p����|>nn�
)�Z���,^.�bG�K��oӇ�D�0�n�s�ȧ��J3���bY��$Q��A�,S�H��Q�C�5�#ݭ�3�l8u��H4�,*"	dE�p���S,V���_��y\�82P\`��f�|�)tIJ2�ꢁ"���l#�C������HA	s6�	/
����|�-e�.�L����h��
'n��ͨ��:hK�~[��j�
܈
��y��qY��k��);d��`d\��E��	��@N<	��>���y:���9�4U�����4R$�^�FT�H�ڒ(�F/9fn��*uׄ_�rXq��O�����t����`nD��� �<�N��!��3(�nD���H�1���(�����T���ŵt���DU��M�����NV�g�c�}�vx��n�����G�?��q��R��⿫8x�{&R�mAD�����#-� "%ٶ�mlx�N�%!H��o�|����,��$�0���UZ]��hu�w�<��V���u=!�{t�����_��Dñz������ ��>0���í��:�svvF�b������y�sÇ�<�A��٥HDꮟ�޲C�slȟ1�I�̄.�� �ƴ?&"!>�9iz�'B���j(E��qt;�^�}��{�9�sBD�Ǿ���?m�M��������FCER��PQ�U:<Om+o1���g���ʺ�o�n�	f�4J��1��UF�&Ж�4h�Th
O��:h���cE�L�7Q�!�Jؾ�M{wL��0��.%0R�p�^���m�A#ERK�"��xEh�*�IJ3a�I_��
+I��`d9+�I�d�&a&.������~tWE&	�

4����HSA��(:�J(t�$�5�2Xy�=���Dܨ�Cr�X�H���̞���{j��8>�ɣOX��m��Pd��Dߕ��Y��A���(�����p1�ʕ�]	AAfs�G6gvW���ڷj\�uN���a�,�J
��p��N�Љ87����>�?K�BVJa�ʳ�^)���F���t�J�=�vwC�ʵi�Wq���t=A�{Ե��eU�<rV}�j�\P�V��O���yJ���>�`�y$�r|�ݰ��k:���ƓuH{w�Sk�	|M�u�a�
�-OiЪ�6�,*�Z�uЊ�V�KO�'�5�����0�=�{Bm`���ɂ���Dq������QgN:̅���j�B=�
I��F`��[MK�!�Wm���q+s>�s�0-:��d�w�QDW>əW���؞�Р4h
��bL�@�G~~~��p���1�v�	�MD���`i��C��h!��6��G����@�m���F�*2q��n�Vjϖ�0�lM����{O��W�ם�ڗ���%��9��K?��$0-D����6�k�.�H�O�N[�D' �*^%i�ѿݛa�-p��A�4P$�^��V��y�0Ȗ*���6�~L��Fz^��b����xm�Y
��R���!^�myJ�VM��fqP��:��V7��9$~ŷ�h�f����e6")a[-7�K%΀�$7P$5�P
�Uf�� �/���cw�Å��~+�9g��$�ܟws�յis���pE�w�<}�i�F��$0-�W\�Ȣ��%;�\�8,.B�H�y
+&����kkf4P$!�H��tXݰJ���	ɠ��O4.	�N������ɵ"�YJ�"q|���P����t$6)Α�'<q�#�I�\���{���'�*̦¹J�t.ÌX'O,�O�I�%n[��Py�YC9a%�)F�җ��#�'���,�Į-�0�d�"=�"�<!�9u�CE�t�BJf�����`�N"�,��r�캮>(H����RJ����޸N�|���lz���$
+�A$� �m�9������}&e�K�V�ٹ�M���\�?����y�=W�(�9��)-x����A���'��ض-�XXX������|�g��?e��q�(��1���zH�x�,G���������s�f{�u�F�Q���WC�1"���`�})���s4�	薱���������+~�m#����3�27З���<rsKy`2\��?>{N;�n3ER���+��i�@P;b�!Sԝ����SS�z�j?���p��f���g>%�@�8��$0-D�5�����!
+޺�'
+�ы�����z��6�%��d�O���%+(
+i4ז��,���{.i�H���X�	A������BD\�)͡H����EcJ2q�A�Ӫ+憋C-,fey�2���+w�,�y�i�/���'�!�)�����+��}����o��M��v��d�h���64���͈�[���oO%Ȅ �&�,�X���2���`,[;J�
�����nu�(ȩU:�y���9���s�����pSn�ħ:�Rh�������9�2 �ՠ\w�53�x)��b>zg�ޖ�4h�T��Trj��A+WJN�80��?y�{�f�h��2�&D�H�Y" 
+\7�S�"&�E�ߛ�8�!G�^��S�3Ep������k#0�W��7z}���E�����d/��^!�Э�+�Iv)��c�����ڒQ�V���[-��fqPI`*Ҿp�	��$���S+�O��b���l��CƪC�g��4P$�SL��G6
2Z,-��f�1A���4 ��}WX޴6�����B�/	�x��
���H��E>{mi[sv"�im�V��q���"p�Љ-���ɲ���_�]A�R>~ IDAT��� tQ6{�=�G���S��;w��(Sq�u�����^y��E�SȊj����<��o���r�)ϊ�m��6�I�#[��/����B�Y���:wl�,�|�O�����k���S�e�8bUݦP+	*�-O)�j�ggguO
̈�DR]�Z�=g'��++tvF�`�����k-Mܳ�8�~�hLS��Й�R��4E"�D����|��N%Y�/ԓ�D�T�q�(0�����}@ؽ'����}6� +����$��1I;A���H�w!t��M��
����@�8��$0-aZ��3����,Ot�b�dF�$��<6??���q�'���\�q<fD
+_%3
+�9h�H�6&#H��f�3��:m���hϒ�0���-���N�����qıX�2:3��K?��$�s�����ߘ����` �m�s��4��R���Y��P!A�߼4P$��6"�V���ɪ�6�d���ҝ"<=n
+ȑ�j¬:Cw�"+fڻ�"-"�:�~�j�*8�-OiЪ�60�	���:��V:����\̴.�D�Y2���M0��9�rGÛ��t;�f�Q��ky������k#؈�BР*��+�/1Yj&��.a���";�^�*�}B+$�ݫ�IW�՗TM�HP

܈
�����W.��PIQ9������Jw��ʦ�`K��LL�&2��g
+y�����G��Y %=|�&"��Ӿ�#�Ɨm��F�e��<���^VIJ)��0��C�E'�"��"�P4��C
@�����,d9�Jr�%����S�Pqa!��]f��.��͢���+B���Hg�D����zm9�J'q�:�~��{<a��Ii�4�`--
�?N]�\R��{'��JFJH���!��u��\����$�FS�P�Q����-O)�j�ML`�
9���U��E͟�'�h�˾KD�՛��][䝵~�<�Y�O���R��(�ʪe����5<B*wF���rj
��8S��g���������l&��q#!
+,�(�^��W���.���0����	|��@�8��$��H���ǫ}��L��
+�l�2GI�U�HhJ٥��7
I����� �P�W�u���aIĉ�~��\�)���>I��IJZY�7�$��#*��}�@+w�<"Q���Jr]�,r<����>�$��24z$�:T�h�"�wޙ���5ٲ�_(����W�ә���RC���ݨL�,.�K뵑�?��q��⿫8����$K��9oll�zD������ϺD�8t�����=��\�2NL�m_ܶ��Q"�%sPBII+�x(]O/g�_���].�H�SUi=����""�)���BW��{.xI�,�g~Pg���}"��������?$p1x��9��?��CY=g\1J�y���>�^
�.w8��w�%
+6h���ݻ>�yvFj��ϙ���-WW}ޫ�8��7
"eYa���g9�A%_�q���M|4��>��.%	���n�L)���6kK|�S=���[�m-�㓱�1���"�n�LQ`�\u��=!
+�7;kM�g��Z,f�;j*w��Fj=D��cf��α
䦁fqPI�D���}.}�H�anz{7K���|V a��,U�6��%����H"��!��@��zm�FJ'm���8Q`_y_����3�Ͽ3-�x间H6�4xE�S��G,k����X����j����@���:�l�%
+��������8n(3H+-���EO|Ђ�Z�J�!W�"k�${�R��
�hZ��`#jv��t��.?�^#�����}4�._��n��������Q9AŊ̃Ri�F��$P��ͅ��I���R���ĥ>��~���a���>�݃5��:�Rj|�{(�Z7f�DdYa�ǁ���:y4E�92'_WΔ��k�W��!.��w���s�f_ނA��^]�ĶI��8���|U����ɐ�i�A���"Rw'T��'��f��M�2���:�����$u�tP��%ԭ�Z����>��LcI�i���a[�m�]R���P�|J�*%_
+]S�H�v�^��M��x�����j��"�u^�͸:�A�1�3j�ǔ�#]Y�O2.��&�e�1��㸗�d
+^�he�/'�In�Hj�6���"\D����g��	�?�_�^�"�ע}zMUaZ���G��#'c�f���h%
4����HE�jC(^

�(҂*[Z�ge�/�8����IVE��.�4P$�SdEJ:Z	M���VN�ѮA��0#�C�E�Y�����Sy(��Z$���#%��0�a���(V��?�ҁ'l���V����o$�,�sU zu�ay+g禮�jVu!h�[�g�MX^n'(��N֒ U֔4fo���	�A�i�6��ŋ���Ւ���(�z�A\�3�������5e=�P�:�V{I=#��j6f�+����m:>f��Ӓ�$9ʳ�����g�h�T�����u���>��{�O6��:��=>-m��+g������e�'��X��Y������6)�V$��d�8n��-x��8�Q����$7Q$�m�)
+��3�M��ux`^�ae�&�a~-!�6��c+�����Q���|?_�ĉp���O{�.ZO��" �@A����,�"a$���tv�
+�2ȗ$3S.�(J����)�Zo
��(�����-� �0�ί��V�5#�YZ���ǯU8ѝ?�
�)լ,vmN�e�N\���a���}���V�vv�� �<��Y��cA*������%�rS�	A���]�!r�z�=6��E�xj�N�<9Y��;""��dw]�A�],�����U$
+d�r�D�t��w��R�`�n*Q�Bb�������)�VM��fqP
��:���t�����9�}#"�J]���������Sq��d�R��j�� ��S��ZU�9�~�u��:^Q�����z��(��6�f��H
2M�dSL�����r�s
� gưL{كEL�]�d�eI	*��fqPI� :��^�'&u��1�+��$���O����J������ԋ<�4P$A
S�Xu���KV?�n;�ë�F3g�l�HOH��z�"� iS?1�;��.��" �@A�ܾ��x1�=�/���e��f��|�1�G��T@b���<�@�O���ǒ1�믿sB���{ٲ<����F�0���x���&4�r��)�t����%:Ԇ^gBHIKt,�I�&ܖ��Z5�&��A5�S�:�q�":�������0#c�g�,)��)�e�
��<ױ����f0�e%��$7Q$խQ3F���n-ػ��|��9�
	�Z%e�>��TB�}T�U=D��z�v��R�*"	D{.鴓lʘ�.a���i�)c0�O�vᒈ���oR^hi�@��z��1B�wңA�"35����B2e�c���y�p�c�d�&�*Ҁ�
����+�v�ze�&[K���Q��
�6X���"rn����\��F��(ɶ���l�/����'��sfk�%G�-
l2���;U
r�zm�Z�3~�B�9���,�f��!M��W�� "�&��+���,�:TH2���w��4���5Ž[垥$�UN��=�Hi���i�O��:���
e�����
���Ͼ�s��4ߪ�'���� �/*Az�'�H*���x��w�1.ԓ�D�T�q�(0���S�	�Ė/G0��8�Pϐa��T�x}}��D�@.j�
�\h
���n���
+���HɰMfg-v+W��M���+Q�P{)_���
I�����#e�G��	��D�"��M����c�o+�77����3G�R��i���e���*E�Nyvز���!���)uS�bӊm�1gY����pU�����y�/ǣ�����'յ
��‹��>
+yW/m�F������	�Z�e�KK�Ԡ"{$)�oOka��+Q+3t�
+��,�����=qpl��@����2�ߤ��)��<aydG�W󋵷�E�4���a�O��:�,Ǎ����i�0����
��m���d�
+[�'r��pа�gi�w�Io*xj
��835������� ��0�ׂ�ъ��
+����0��TWf���U�`~�h.�,�h�8��u�J쥍�V�Y�=_ph%bJ%�$PS��e>˒/��H˔H�����U�D�fb�Y&��n_X���@���������������i�s
DD��N�� ��no����2�#od>"4�8
+[)�[�G���>->�;wH	Y��¼l�����-\X�R	T�����1yY�<R�U?,+�V�����r|
 "!(��'���T�v��W��H�������������ͽ����嵵5"����*�,����s4?o����FZZ�vf���07��3Ova��-�Ki-��}�,���c\��r��*����T��f��A^X$Q�T���y��q����[�����BA�
��D��l(��� ,�xܰ�_N8K�L��e�$<�4-�F����hqq�ڵk�W�?~������7�xC)���AD��ȿ��׉���˝����Ėo�!=|�м��w��D����g��>�?|[y����0�%
�#$H��o�1�����o���_\�B�Y�C_{B�����eZ�KY�w�s?0����k[ֆ���k� !��A~Pg���q"o���8���g�^�������yA�$J�J�~�)�t~f��?e�<��^�K�y����� "īβ—�����o.�=��	���g���W����  �� "�|?8���M �B�ڽ�C��k_{{��Jz܃�
�CD,�J��B�͛o�Q����}Z�||2�?���}�q����
Iu��ebsssss3�{��E^��n]����n�LE�l{���DJN�;}�Ɉ#ת�Կ�QH^䚵��@']P�G�R	"	����>�K��&Tdg1ġ��d�N!���U.�B=�h�����h�4P$��6�,..����)
<�J'�<����1T-��W��r���~d3�Ƨf���f�Lh���۔{��| �7����qrK#��&]O�p�ކ<�m�@Q#��8�R	�Z�u�Ƶ�XȆ�wS2�`!��DDB
+�wǷg���="rVG����5�=��U�G�
�|{��g2i�J�?4<�ԭM�ӧO��U:�G�*�.`����̻GQc9���b��U��#ݾ�i��o`*�J!.� �@)�ڮ���1�V1�e\]N�H�I}:��8�gk�>��(�Zc!��a���?�8�R�U���*�gS�?>��a����9z�m_y�o�4���v��X�㯮����^jÛ�m�l�g	��(����ޢ�<0�r���olxJ
jңXuϹ�[]]u��Q���|ӛ����
��bc;��vόUwB'R�m���y)�x5<#
��Eg>�Ĕ
+P���q���}��N�GW�a6�V=0�oll4T$խenn��)dE��!1�<�Զ3^B�F,:��|�K�~��������4�0`ft�����V\)p�i��[t9*�-� ��n�S3�.�T�ǡ�q/�ɚ�@z�xQ$�Fj���L$�"!�O֔�;��ZW��W�z�G�qC�IU�bFF��In�Hj�׊�,^B�����"Q샎!
+��*
	a�g�a���
+^@��,D �|����(? 
4����H���\^k�N
+dg��j������R��^�H��A�y(�۳ە���6yj%�(���7ON�KDA@A�tA�9P��~iS
=���ZJq��m�RU�w�=�<�\��"��c��K�g��bIa��i���2�
Q��u���뭰<Z�i����lI��dݦi&,n[D�b��O���|�̕�Ǖ��g�~EP�V:z\)I���
<Ī��'��"�nu�(�/_BH)���]�A��4I
+�HJ�{6G��_r�>o`��w�]��oz����;b֗�f���S��m�'�C�E��m�V��<�U��{8۶�
4�������ޜ�=�n8)e�9��+�D�:b�f��pj��{5��_ ��`q�e�mU}��n_�Y7˞]�m�Hj�6�x���n���8�x�i4�~�.��S4�qY����,�TH헴�4�,*"	�����P�`ז��a���+5ž���%��Qy�r6������"	�Z��-�%S�s��R����mO
k�����0f����ȿ�D�Q*LR)�b����jz3�Ļ���"�j�'5��|���fqP
��:���x\^fW�:;��R���*��UZL�M�O���<Y.��Ed$��T�=��5U���:��o٣%:K�(��V�����1M"�
�0$.o��C�u`7�V��%�!��M��dj��b$��,����]�A�#H��Q�" �@Yh�a���EI���:Q��<b��O*_]�lH�Ru���i�Hj�mԈ�#9�GL\�}�����'"�'��7��
+'��Q/SU�ґ+w���#:8Ϊ"�j���l��l/c`3�]�?�I���J����H�\O��+�GpO��G��8"z��Մ��s���ri�6������ad�%�\�72���*{\�I��ѿ"����ao�9p)������hiI��^R"�C5&�C���߰n���>YVx������I�+�($���\����s��T��d�� ��A���A~Pg���}"\�?�!������k�~�8��s�����L�� q�Jo�RDJ�z��\���L�8�ݻ�g�����F��U���2�I�N/�D�Pڕ�GnnL���3�������\���"�n�LQ`���H�"S0�ݲ��a���j��*��,��hM�J��9��fqPI�,t$�� ��f�ʗ��dJ*M�e�*V�w
+Ϋ�V�H��z��)):M$>PǩX���dv���~�� �T���$"����lf:���Ј��I�.�6����?\(��H�	s
�N2N/G�oߥ�j�δo�.�UD�k�S)�CB���,�'�e�i�6��Z�3�<9�Vhލ��}ҬH���}��8U���c6��ai���Nh��YX�<�
+I��TJ���*3;Ƕ|���	L@5 ��y��q����4{ZB���i��r�dW��F�l,�5�r�Y�����t��E�5CGvw�*	���In�H��8S����̒w�a�l簄S1Ci8��<���_�|G����TI�	�k�Lh
�JdP4p�xH��W���Ɠ�N�\�+�k���qD�U��r�#�.���i�H�6
+��A�,�D��(�֚�K��[g)#"�`5�aui��4��ª��Ί��.��" �@�h�g
+��t���,5X��3��Zkb �+6E
+86����{j!�V)���`~��x�.�HAD��3�J���C�紗��G� 
+
�3��J)�R�w���U�Ğ'���b�{�8�T���y曉<�� �FJ"��:#�h ȩUV�c��Y�
+�8t��ն}}sYp�eyS�̎^Ӷ'��G��S�m=9yB��s.�4LrE��:$�\��͍��o;|66<5)9X�K���S��#�VU`#�v�j�ŷBg���:?I���B��e�+4��k�*��Q�" �@�h3Ȉ\�2�Ua(�3�ȼ�[VQ�������i���:j���]ê��"���P3F`Wr ��]|�Y�+�ӣZ�I)�l"�Y�!Ȳ��\��"�!u�2(�X�0���=��{�u{�*g{�Ra�'"�ɋ��,��_PA�G�G��R�#ŅA��^AN�ҙn����F�OO�E$�2�^��LC�^���VVȲ��r]��u�~|Y-����e�OͅVm�@Q3��j@N��:h���	���
+�b7�M=��rL{)�
+�˥�7�X�a��W�����!H��7h�,���}d��?������&����3E�Y�vɑ@vN�eP܄ZE[F�5
���(���k�5ԁ���e��kK$ITd�o#
4����H��~VCO� F��D���NQ�vpU�OD HIr����΢,b��qKe\ER�m#�i(Ϣ 0����T	�X]����(�_���k�m��e����1J�	A
u�OL	�h�`���HD�vD.ODJZ�A��m�&|����f�/�c�p�f�gӎ��zm9��H�0:R0� IDATUϖ��_2�
����k�9��3kMI���l$�m"�潉�R��o곹������=�}:8�̖��/h�B	ARJI��;mlL�&�A��
9�J\����Y�
+�8tE��]�8����+DD�
�k�2WWiu��n��<m.�����߳�$������
ݽ;�dr��]�P�(EJ�o�U�s<�����R��|��ݳA�J�'?�ǧ��GN���Y�	���*j ymͩ]�\u��e�_kV�
oS�ԇl�PE��v�@�8��$P
+c��"/eY�s/𡸬����6'5R	�b��93(�Zo

a����H�rE�1�e9a�.�d�X�k��J)vmJ	�/!(��'�eW�UY/�;D�\�F�ɰtb�b^�i�D4\�3�D!�r9;JU(��d���y�C����:OUJr]"���JG�@�^AN�ҙz��� Z�Ci�󎌜g�дZ�n��ĩ�8�������F�j�R�w�}G��sw���r�m�@Q3��j@N��:����I �8�u��c?{Z-Fy���H+�';����R��̾�]��1#���z��d_y��d��In�H��8S�ś� )������Qq�i����Ͻ1��mp�ev�_a��m�C����AE@$�1��d ���V+�Z�޸6�s��<VUK�����oC�6�&Q���������F@CP^hB��"9@��R���R�.�}���)afX:�/�%��Ie۵���VhZ���^Q��
+!�R[�J�NtA��/�g���������5���H����
ZJI����zs�i�6O��)8���D����Jʼ7t0����1	��V�1S��6�U=���"J����Ҳ��\b��U���h���i�O��:h-�� ayD�ľJ�OezE?�d.{F]}��n�e"�X�_#��ꉔ"%���v���:)�D�T�q�(0�7
iRb��R�%f�
+#x��1t9B.M8c��*K���%�!�r��@�8��$P.����z�T�g(�rQm�?))�r�e�>Ko`S`�E�5P$��6�����9�=��K���\Y��1�6���Uœ};<T�DVW}�
+��I]c��h�trrRb�Yr9'��	�>Y�p�ބ#�gs�k�Lq�&nD�jx��E-�F�s�=�x"�������f.֑��W^9�==#����ADBpE,�T�k��ٷ���?����A!ȶ}�hc��ߕW�g�7�D�T�:T���������9�<S��{e��#���=�p>�y��J3U)!�v=Fݲ!�yV����#ܝ�9�#��
+�����=0#�Iu}j�B�l0���S�,�[����<Y~��j�
<=���T�X4o.{Lk���j�Hj�6�xC�B���3~�����$��HR<�Ң��Y����������j�YTD(-�"2TX���Q~Wgs���N�BG�=�R�sf���Dl�Hj����K'�<��A�X�OD���ut�<*�ҟ�CT��L�̒�Uޠ,S�x8�Y��$)�u�F"�+�	�6�9	�|Y��f��j@�y��q��B���2����f�!2/ÉDNVR4E���P����X��Hei)����d�-���!�(�N�:�L�v�z��(��V��������Ӡl�Q�R�FEh2�E]�©+6Cg!4�X������ (?z��LE�`
�"	�����@7�h�
ar?I��2R���$�_��pn���ugdwײL;\4��b
I������w5|�8�\��R�<���
+�Y� ���+���+�OB��=	c��vx�[J�n9�T��%rP��gP���.@�XJ1�XK��S����c
+:�>�{����a�"�/*sX�ܹC��%9BU+S�,��8�_���k#��*�|�B��+>�"���X�r
�3k���;��D9�R
+٧*�Y�ȗ��R�D�$�-����L5�+uePH��f��A5�S�Z�a6�A~-� ����	5�%7˗���V)!I��
k��1��i,n[�*xsy?�QY�O�!ug��xs0����AH�_��th2.��)���'w*���۟���h�ė3��PEk�TV�.h
�JGK(]{D�4�JY�Ljo��u���E�,ň�8�%��
������F@��6��U�~x�Ǩ�^�7]?�!�U�
����D�V;,�28*����|��ع
 �^��-�����6R�/-g71��`�\��<��#"�
o�c���k#��*���4����-N�Uv֊��+�U�5�U�&�3�p]���蔫�@�����LtPn���i�O��:h�㆞Z%�A���,��S/���&.�[�Jkem�H��W����Z�""!�'K9S'.�MIug��xsVߴ�&��(���H:�2q-kFr�a���qȊڸ���*��t�4w.rm5�,*"	����Ar���є��LUa����)���>Cϭ�J�e��"�����ϟ;���b3�����9�%�}����:�ri��9�M��Nd��2������h6�U"t]�7���Lo�*��6�+Ew���KJ������nuu�q�&nD�jx�����<��u�E^��_]e��[o��^?�v͜.{V$�
&�A�]�|
+S/�5��w�ȶ�Rz6���R��$��A)Iy�R��<�f9����P�T�:T�������ْ-����>K�ƶ"J�aױb�dY�ax_5�o��j4��z�y�\nV�?h[>PAt�ݺ�fD]"���C-�^���qu`t�����������OV/�V�YU�i`�(�?bI/�^��~�H��u=Q
I��F`oB�ˇ���B��6b2.���"iG�&�\5���ެ���̜*����f���M��" �@��{Z�=i���F"����=�x���)Cu(k��r4���j�7
+��"���Z�il�DDʷ�阄�S�<�dBD�T �	��	C�N!5���]�T
���𞚑z雇�����VY����S�=L����i9�UU�1�7�y�Q}V�q�*�"QCB���zm9�J'�<3�n���K�,�����0�\ٽ���fg�W��6P��r@�����/���d�/a�#M��^���@�d�.(���
+<������	k
ØgaA���.
�;�<���eY,Vݪ{/��C�Q,�=U����s��A�DψEDr�+!�l��{�8�~T�����-�(���-_xUs�^nS&�<PdgPȩu����WV^ؽ�P���pkd�o�.P,���\�X;��e�3�,�ۦ���rW��|j���?J`ꎲQ%�v�nq�PC��@\��,�BoZ���e�?^��v�I�i:�_PU��Rc�6ⳬ)Oy(��AI@%�2��5�Xs÷
��G��0�uQ�N��j��:!Zv��j�2Ue~,TI��F�mHS��H���ED�S
	�9XK��så$+n���C"��o\R�N����������W��$Z���"��|����p5���Ϸ��o������`{�\A��tz�~Q~eĘ���Ӆ�?LJ��"��SHΧ�:�2��-�B8K���|�:�59���V9e��xת�^S�V��
+	x�]��ܬ��*DI��6��A9 R�X;5�o�s������os�ʌ���5HJ�F�~}��@}�4�Ś�J��D7��G��rPp����u�U�i�LQ��
+���$���N�+4�hʗ$�[/��U�Θ}����j]iA&T�y=49�c�Ö�%��*��$��@��n��ֵ9�����^Q�J�U�P,�R�]!�9�\&�i�[K�����
�+,TI�F�V�I~ֈ�µ�S��M�����H�����z����L��v�-#q�~PPI�bֈ��7�5��j$��N��Q�Ɠ3z|1��_v�\�_-&�P%!R�:\	,).�F��-I~��l���V[O
+5�ɭ�U_j�"W�/ԟ�9�Zk�J[Ӓ"��flK�V� }��ʬ�X�;��nqP��:�N����Dn�_us�y��w���{�%]�d���e�W�H���F?��MDD��k!x�+"�TL�CE�D�]��:���*+܉�WZ�WVe���v8E������#jQB��9�V��*ޗ;%-��%
��`5�.}#���n�G@����D����T=E�|>߸�_c(�6dDz��MeRa�$�}#�.���K�Xx���e��i�+k���\5@��4i�H�G.��c�ZQK�����	�*���FvW�7V"-���F����'O���ϕ7�)��(�[#��Ҏ�H�U�ζ�>���"�y���d`��Y�p#:hgX�
���W�eU��+'��ǫ�R$2�$�2ݮ+㸍nqP��:�Nm�W�o�����:��=Y!h�ĵ������od�,�

u��r�+֩K�r�g�dۏn-�U���ȫW���~������ؙ�!DI-�Y�����E��~?y$-~�:o\��琙/��GO�%�vA�޹�;�e�����kU�~äߥ���'�Ԗ}�6[+����ǗA@��d�O?����<?�r���ֽǟ���Q �f�^�M�<@W�G�-���5��=�mZ��ފq}W
����{h˟|� �ź��ޛj�`��k�W#�����_��{���
��-�>}��퉯����Ǐ��B+�S�Vv*I�+xZ�����R�d:T�(ҵ��I~��=Γd�eZs��r r{��S�M�R�T2ܶ�P۝�H�,�%
�Jb�JK�t�o�U�K�u�7�ꑕH%�!5����L�er
��%��$�}#���NA9cnk�����m�a���jΡP�
+�D�=U�����_����E��\�Pf�ڳ�s��mG���AI R�X;����5I����J��[��i:��H�I��zGngk�ƀ�g�_q,8+PϭBlTI�͡�`"�:����J�a��b)ص �d�L��=b�)ޞ�*Ɇ�Iܞ,���n,��%
�JBt����څjƭ�>U`p�X�h�Ͱ]�ZMC�f�AZ������	h��/��^$���4�m��.�w�R�ṋ{�Pr���XBM�N&�e��j�U_
�礥�
+�o���<��jo���k�[�S��(�}�`Wq+�lQ�n����yk�Z�)*��g�y|}\���UT!(�li�i�-�Z�Z�*D�QC���\�d/y
+Y���K��5��O}��6Glt��r@�ֱvjC�jv):�W.��rk�)���2���W�V�k�g�I+�o%y���<=]h�΂�*ɴs�(p���}��m%�»]��2VO�lX�Vlp�f]��5��������^�X�%
�JB�o�(��	`V-T��H{��)�'���49�$�F���}#2h�K�����o^n=� ��}����m�3
+��<We|��8���P9�.�/�\�'��Wˈ�Q��9�N-�W�����i�~��)Ut�֯�u��K�/(O�[��-/���U��*ɴ9TLDY�����_l�K�k��%�t����j~A�t�:
�{�\��/��ZA�c�D(	�$P1�Hl��'��l
+����?K�*M�����rg\@�C#My��:���i�[O�U*pU��`<ٰ���ē�j!�]�'����m
��O��휅��[7
;��u
�~X«�5};�O�g�\f�L��NM���a
+�*C��a��y�|�9��θ6�.E�����s���ƒ�E7 a�/8o� RK;���Z��ˍ`��Ou��/&��!�~���I��f/��_�!B�ڻr��Y���þ� ��#�v�][\��F�8(Djk�����}}�!ͮ�=��G���ޟ�{���R^����e]_��X�,�U6�$�Ι��-n!��뷅ch�C��W��`�,>+�ꬍ�g�)����R~;I��AI@%����Wۛ��r�Y.W����1����|��~�10y����v��Sz���*�y���]�z-��w����;�T��–9}�ƒx����0��Y���}Ǖ��_D�����fq-7���>(�����JA��qy�Q�pS��;/-�����i�a�5�yk�Z�).���ED�^���Q�_�[E
�X𡃸5��C�.���
���U.�Q�㏫˯%E]��]���GvZ#6��A9 R�X;����	):����k0>�d//�L	��w-���BߪƬAB]�HLU�ۨ�L;g����t��ǔ�����Hc�%e��
Y�����`uYpFkq����-����$��@yȨicAV�c~��C�Q,	��n*+DK!48���n�qS�H�n��1-TI��F����č������uV��r����n� ��W~���k�����96v�T���\��A���U�t�trB��I� z���W&����	/֕N�,�׎$4g��./osTV���0�ݪt���5�H-��3{:���F���J������b����o?�r���*ҕ9���U�̨f.��lt��r@�ֱvjO�A@B��	���L�n�awk��9�x���U������c}5~j��U6�J���]�X�Ab�J2�����M�����z��\B,�դ�*/Òe�Y�U�F�*��K�V��'��kY�فJ� K���(A���}��ͭ��P�"U6��l�j��2�:*�ua�J��72�LF�����d21-(���؞��Lz�xVc��O��M�Yq��nw55��
`ߧnw�\KZ.��=Xt��=
�
T��32*�ļ:̮D����F|P�E���h��)Y#Q���f�9��
+�Z��(g��m�ϔڈ����U��d����-
G�߾�Ӈ�GY;Q\N[,�[rq�]qz�u)+yY2����pK%YDtĝ���R�e��%5���H�Z������W�4l2����h�-˼N�~�}���U�����飏�\e�2CRUب�L;gn���t0L��쟂[�R|_��r��.�����Ҳ�P�b�
'�Q��Ġ+h�7c�[�*	؆R�Ҫ��l��Z�FK��ZB,�dܚ��0��|U����B�d�o��n�a�l6�0�{��y��U �ɦ_bo�Sp�3�����--[�tz��}3of���L�&x����o�EW��>�8RI��g��}�:��X��l(��Ú���k��*�U"�TWY#D4���v;��l�a��i6��H�(O��|�Od����9=R�:k$Cr�ʾ}!Ht�[<��Hd�����ED����r�*�Alt��dQI����u����o���h]�Ω%�������12��������_����>�ꗆ&O6 \?,��P%Yd���s"���7boEQ4��(�=A��ݻw+�37��c��.9� �^l�Z\o?�a�����NQ˻�[~dgXQ�ϫ؃ӏ�|�����^��K�d�wM�������݃\��$~+��L�$S��H��:�d�꠺�s�����u#�N�V���n�~�ҿ��m���os���߲'Ѷv*Y-�����P%Yd�Q���L�r�d2�L&����N�������`00%'�D�����>���O�lάŬVr�)�G�jGv�jr�r����Z	�A-q�4��ȕeK�ꊕ�ZDW�㹭� f\+,�F8H7�"���z=��l6��/^��曧����N���D����Բ3_#1�4��W���_O˭�`�Uwʀ�ؑ���9�ʢ��/�:�fo���}���2Xt�������.;�_�Y.�&�u�[��Z#�B���S���y��.�Z�w�����7�|�믿&�{Um�J�~�-�|��Sn��㠫�#���Sv�N˻α���k�
��%ZE�^�k������7D�����Ћ�z������X��̍�����[yiS�dwB�_��/�HUv��3�B��o����5�����/���7�����;��)Ѓ�Vu�������X��L/������c{���p8\.������Z�S�+�Q2���J6�A�X�Qj#�J��
+�\������u�7��X ���lUI�L+A%�Rኇ�-�R���}z���-Vi�VY�Jl�#�^egP��Y����a�J��7"ٚ���lz����۟�5;&5�FJ�L�;R-���:���W����_t��u`׾�u$�)veʂV�#��]oɁ�W	 IDAT��4O	]��m�ek��	�
	��WN>�k�f-Z��=6Z#I���p8B$�7!��vt����n!�Wi����K�c��^�|f@r�d���ڼO����{?��"p=ĭZ	9���S[�=�Ȇ�.�����e�!W�H����F;�P8��ugZ����V<&O��eA-*��l�$����F��h4�u��)�W�^��� �KM�/cg�F�%��Wf�����/7��q$�����K������������t����/쬗��T���� ˉ���~+J�Hoˇ~Y�X�3uzzگe��#`�J�Z��t��֝)����3��[Nٹk8-�:�N���U�~ow��x����nw���?��D��9�X�_�_�\���~5�zA(�y�\g��]�e-]e$�O>٘���L���۩�KkJ�a(�L��S�������giB�B4�Zx�/[�1�	�n���J��hl�T��BP���Y�4
Z� $����h��o~��Wf�y�J�e�a-�#�?8����� ����_�f�>�Wz
+�%���7FI:�B�d�o$��`����"���YN��h]�,9��览�\�r�rt.��ǔC]�f�}!D��K����#�j6o��nq��T�)�b��Z����yo�U�A2��s:����֊�[M��֓��˳�,TIY#D���mT?Ԏf9��#��J�|�V�_����_��!��˓�'{4���*���9aa�)��T�%����S��U¢b��~�inn=�h��f�Q1kdk!�7���`�NisJ��o�B�d�5�n�G���g��se�H
[��w��/y!Ǯ�!��}�o���K$3o�y�(���n�vٌ���)u��O>1v5�h�[�3�K,��{ɧ�^�|id�Z.�e{Nd�k5����#o�r�,H��<�&���u�/��������2-�h��t�����u#6�$�)��r��=�"dů��B^4�)ZOD���KN㽣}���~uPnm�t#�z*E��6�ɒ�Jt�CT#�O���믿^u���T���H��:�d�DK���ܖ�G����(r�E
+��ﺳ��M���E?J*�eꎲP%Y��=X2h3��Ep�Ro�Fc窬~�(|�_s�㋳3"���7i� 2�F��rv����Je�h���_��mMzS��X��Q:ӻ��#�d�ZX��3b�J�(R+XŮ�rnfFgRBZw�*�y��K*���������YD([Γ��F���5�D5���F�8(�b?�N��u����7��������t�~o��4���(��7uG٨�L;g�����"���n_&��:؝{���B,[�[OnI�ܢ-�`�K(��B��Ro�j.HKWt��$P6��D��Z,4upgk���Ⲛ0����B��o��mnY��ȝ�uI۾,Z/}���Ȭ���H�8���ˍE�KD���c����������KD��=V�
U~��G�3+��V��
�b?ʖ�:�-.w����'�
+�Q1_˹���D����E�&N�μ�]B��{7������ص�WN���g�z�����Y㗔gMxev���IQ�XIQ�/r�rJ���G�Ã� Zv���,\2J�؏�S{�U�ܚ=�B�yT,x����߂*_��`�J�*vP.�����LU?�
����w9{4���z��Z��O���ZR��p� (	�$P6��/KAR���.��o
	-�St}yh췯��Z��*��H-�$;[�S~��.�76�6!D���2'�����iD^騆������-
��rq�u�W�v*N
� 2�8�j�����(/_�|뭷���;ӂ�g�\66k��������J�gA�Z���H{ʃ 5
p��E͂Z�5]㢞��?���S��[T6�X]u�tyY�]dc�.(�9���0F����f�W�L�x����J��'+���>�EV�i	A�׷a��[Sw��*�t�XQ^{�����,NNN�Jd!o������H����۟���h��~���2�V�2�D��]|��/����'D�Ǐ����Fvm�TҔ�]��BX�J�޽{�G��������j��c/�쬸�?��?��42�l٪�v�"Z~�����,(�^���e!V��������%ѓǏ��۴��/�������~��Ǐ�TIǰn���5N��ؾCIVAJ_�h�O}�Td��938�(�dT?eپ�#x�AF��@�ĖFd&8�}��T�ґ����������c�������B�{�C�=�]��˴�)k#���#�Y�f��m^���?���\*����ꦒ����)K�M���)W�OO/������|?�I��w��R~��~`�"[����F�޽[���htvv6�<��F��(yLE��(���
>2Cns>�O&"�����|0���f�ٌ?b�G1^_��:��I���+1�
+Q3|Vș����B�;F�����v���Jr##��aʪ~��\�o����N����o����
]�g;��L��dU����A�*i��SH�D4����x<�����xkÓ�d8A���%7�(�N��	Ðm~����p��4�M6H��.�=�C��I@;�@!�vw��co�aĮ.�L��,�J�Aj�����'}�bQR���HE���^'p��p�s�N5�3�0""�F�ٌ�yP�QM&�4��f��޺EQ�ٜ�f�Ng>�7��0�A�H��f��'�v�m���u����a���{�dm�&aE��00[!g6�B�8(��J:�	�Zŷ�կb���f=��f>��P��~�vm^���)t���#�v�?=8�V�~�H-���Ȇ[����O��'��l<�@Tk�u��o�`�`��?5��;�N��J`CDl��Oك^�a��L�g{D�VT��IN�j�[�ĆJ��Y��[��W�5�\���!�.�5C�Z���/^���O~xpI�Z���$筑��NcZ��h�!ӝN�������v���f3�ADRO��c�ɤ�­I�8)
+c6��Ǔ�I+�7���wji$w�����#�Wi���H!"
+�
����l�%B�6�������~�o�D(��/_ު��� ��f�sj�P^�r�U���Z��B������D��Xܦ	���,��P���Z�0�����R�d4���ݻ����
+:���ٻquu����,��Ȝ�IZ�VQ�"O>8�w������F���ከ�ȹtJT����Т���!���������t:���Z.���������7|�On�a�5����i��[.��:��.��)9�Ne/I�*��ch�ٷ�_��J�j�KA�R�l\�)�N��9	�j-��E/2�w8���-TI�7���|~h�;ӷ�eaN�$]�-9"Z���O�
�� �,T����H�`�{�Jڪ}����q'[�ZDY� ���?�)ֱ^uKE�?'�����H-�ȱd�)r4lY:�]\��g?��T)2ko#*�^O���Lb���6-��ӧ�ې՜h����E��p筑]��%���W�|,e\�X����˯�N�'Xt����IN�jc�.(۪�=Af�14��פ�F�7���ram���AvHM.��N�J�t̑Z2��J2�/+gw6/�K&U�&��֩�<��a�X��-���AR�dd/��F,��� �G�.���.��~�3F9�da�J
+�d�""¥�\�ɖ�Ғ~@B���R�uy�o^���iK�Ç�ݢD�
�޻��Av�7����r��jQ��q�����t�����v���aA0���
+�L&_~��<���|~���	�kj�n��c�;���,��KRF�C�tc����U�<Ϫ�X�6ym)�U��'�>��ݬ��[�5Aa��FT�xl�_,6v.�X��Z��{�'��L&���z�;w����d"��6�0��ɤ�l~��g��d�b���u�VZ��'�+�:�㊨��IN�j�[�DL%�L��Y��[��7i!��h�}�}��b�\��M�Z���$筑W�^�`35�;��
�n�I?����<���m!�:��F�� �z|���d���D����WÂX�&���.���r��@=���EK,��9j��_����*sI��=�7B�N,o�rl��&Ȉܛ [&����>8�;w
�e��ᱲ�%�}����v��פ�%��ç�8���W���O����F�>�y�
��+�]Jv��h4��!ε�~-�N��hZ��f��ڪ<|�ND�gϞ}��Ǽs<�a�ú\���}�����f����#��0�/���:N�KDB�������/�u��A{IWIrQ\�'Uς�\�)���`0Pu�x<�b����1����}ܹs�����,�$��\H�zm4
���l���p'ۃ�(����i��X� ��i
����˻w��z��l���eox�'��F�Y����[=�
��^�'�#j�w�� �Xv'�/B�O����2PA~;����fI���+��"'9%��nqP{Uϑ��r��v���`�F��f7;ψ�6��M�lg��ٳg�ȫ(��5"z�7�߿OD��ss�myM=�V��P�)��/��[O��l3V_�蔬TIG�!�=R�D{��I��b���9��5�Y��AZ-pL̓��W%��V\%T�09A��.�'��7�d��(� �V�>$"z�t��\s7�O8R,|����셧�+{���"t����(�,�-
j�����Ad�~���rO��b���^P�*��ùy�V	p�W�g)5�� -�riT���?�~�BፔWe�Z��ꊜ䔨��AI�UI<�����ԳoC�|���l|;����@�������Q��N�B�t��Z{�R���.�f�����h4A�vη��܉�33
+!�;N��U6�i�������b�yDU�а'��̓�R\%��dP�q :������1c�|\��@��.I��-�;q��,����09�ߒ�eS�Fk�^���d��
]��)�֦;�㮈ꊜ䔨ND����O'K�C"��f\	$K���h�:���?+ n��TE�ٌ��f��V3ʖ�+��R♅�I[r���S�R%9o�ld/	��mOٓ�v%wW͌���g�G�6��0�I"���I�RbU��3<2ђE
+WR*�;��"'9%�L�*"���}���ch�ٷ�_��HkU�i5Ԫ_S'k�Jr��@-(Iٓ�q���al�(��!j>�w:��<O��1D�V
+i��=>��=��(�%s�!�8���ȷ�~�q��h4
+Ð��N����x���B�^����K�N���l�Js�[�nqRFJ*w#����ϵ�|}�8Pfj4Vi�R�g��D9Z.�;�2뽤���7j5�`��Z��|�
�z��w�ݪ��� K�b�#i}p�w�j��`k�et{K�xC�v\���P�_�9�=�˭�kU;���\��B��U��%���Ϫ���X��(7�F�5v��ay�h��d�����Z��-vq�aC�M�^�]��M���;{B���G���)Wa�.x�m4qJ�K���l�3WK����r-��F��:z9�n5Q��4$(�0,@�8���	2`�F�D���JkEvp�X� ;��7�	ϲ�MÝB�E ��:TDŽ�@T��"'9%��	L@Idɩ���t�^�0�gU�uh�14�������@���U��N�B�t���u����#��~���7◔�{9���Q%9T�;�Z}�c��o$��_���#e$wW���T1	���y�1�3qg>��C B�Ѻ4-�q�Q�⁒۝��١����.���ݣ(�L&Q������e�A��s�a&�ɗ_~)��^��C,�u(������"�+r�S�Z�%�����1M��*���~j^1b��K��Ԓ��i
����
+��k_�mHbAC���2�I�H�.W�����d��L�H�駟��(����ۓɤ�l~��g���`�y�{?(xW#����qENrJTKM��HWIO�R�E�L��p�@Φ���ڑ�yB�0Y�H�"7��a��㊇�� �"���<A&g�:�d2���_��g�}�LJa�I�v�o�j�Y�o@:ų�d��_T?�8o��Ħ���!���>5�i�V�<��m�f���ܝ]�A����Y9��h��z\WNM��U�FN��a!��e@QvM�-�����U�VY�G��ۥ$Z��]ADA���/^$#�Լ�o��os��7�h�\ס��f��"�+r�S�Z�%��$���r��4ԗBl��,�R�PNx	!�-9A��''�:��� �u���o�U��:YS�"RKr�9�v�K�eI�.�HwҺ��XNF�#ӽ[�� 7+WUX�;8������N�������!{9�[Ϟ=���y�x<�5��6������ݿ��lJ%��t�?�dkYiX?@�J�䣵FL���ai�Xx��р5�ȑ=� L�
S4�}'SG�j��A>�H-#7E�t=�R]�z��9�㊨��IN�j�[��.��	��'��T?�{8�x��a���F�`ʊ�ZŷԪ�Z���~�%�o�j,�_��h�h]�]Õjő=� �$`����Js�_p|X� ;�)N���<H���==��h4��"D��9�"����(��D��0E������<8o�|����;Y�z�7�'����Ϋ� HV?䏰�"��ʉ�)����%������?���ǟ�kFjoY��e��K��咺�.��KZ��|�V�
�>����~���7���}�]A�d��<��AZ�����,{��u���RǺ�#��킗��_��)_n���:������v���Ԓ�Չn�J7;��K��	Lf��t:����ή�C|��	Ð��A�UJ8y"gc���r� �k�r%�K����2H���'��BoZ��|
��8�����e��dj�����X���4�|��n��S]��<V���l���{����s�w�ᐈ� ��[��(�U�
w��4�G
iX� U���!@ɝrO�]��χqU�J��ܝ���|�u�|����^��B�������:���Kj�"���	�%�J߳��vU?��<��N���U9k�Z�Pj�f���`0���i���P��Q
���H��&j�Iʞij���!aN&��d���e
�X�CN�sK�]έI�8���:	��K�� �,56�й��TQ�⊨��IN�jaP*I-(Iٓ���U�0�0���x<��	Ϧ�cd<��3k�9�A�r���:03����Գo{�O/�غew��Z�k�d-TI��U	Y�����J�N��BoZPԓ#{�A
+ZT���ggg�f���q"��2j�Cn�ñ&��t:}���t:�u94����%"C�c�N����"�lA���X� ��L��[M��;��F@=9���	2`����v���A>�H-�Q�Ъ0-*�u�
+C�7X:�㊨��IN�j�[�D�*)K�ý�U9h�H��[��W��n����"RKr����q.ׄ��kA
=�
p��{��.ls��w���72b��o$�h"��RFr��g����lm9���㮇�Ό6����@#�ͷ q���O�/����!gZ�$����ˉ��09_0�0����/���{�7��S�!V@������"�+r�S�Z�%�W%qM���[d��oq�_]2:q����H-����ݻw�v��e�i�6���(��]�S�%w��
	�ʍ%w�<���x�����ܹ�;9<���'�I������㉈ӽ�~�v�k��6��u�����WDuENrJ��
T����������wy\tk���ch��w�_]�o�8Y��5u��$�u"J�9��O[�w�NiI��#x�����q6Z�ވ�H�%��t:�B���)�X_]s�Fl�9�)Q-��%���X�0߰[�w��?AV�e7�}zi�S}Ԫ_�F$��bW'��F,0woT%O�t��r$C�b˚���H��
+�N���I[���>{�,9�E���x��������y�
&�rh��j�9�)Q-��%�����i(��R��,��么�|>�|+Y��vL�u:����Y�B�	2�JN�I���nK�(F�f�k�o�N�T���H��F����d�#�Ws#^\\�F��KI�ξ��p(�ȊT��^�X� IDAT'�#j�w�� ʱ�z˱�C$�R�8Ѻ�ŵi)8���ܻw���������������V�U��C�}��ƅXj��JU/��ꊜK�D}���M�*"]%m�iA������$�����777�e��n�)��%U����Գo���D�!�?�#����Z����ވ�X�� H�j��=�`��$�*؈t��N���!�/H����U��-0J@ehɉ�0-�p'��8o��M,��i��]�r�����a�xd4q�D"�����g�S�r6�q2�����
+�<�=��w�]WDuENrJT���(��ܢV��j�o�N�T�ȩ%q�Q��#Kr�0�i���e�w"��N�.?���9Q	'��S�s��hM�S�KI�k=�ʪ䊨��IN�jaP�U�[d��DT�~ku���EN-����j�CIʞ������^OM~�n�e�w���Z���ٴ�0�Ʉ?˚@f�"ӵ����6T&�@nܙ�
`筑
��ֺ�){��1�(����$69�S����³��*�u��B�k&q(�j�9�)Q-t����PI5� �U|����~Ը]�~�%q������
������uӻWR�J�.�	$���x<�7'w��&��L�N���r�,,e[*��]�B]��C
�8�㊨��IN�j�[h��R\%%I�{�M�m�~;�'ȸڕܒ�F�+2�����y��?z�H΋q��v�=����AJ��mgS��W�}��~Q<_�+'�t��Ԓ�g��f�(���plq�V?���ʆ�=$+r�C>�෦�)ow:���#����vNZȮ8vj%L�
,~��i8�O2�%����������t:��ˣ�~��s|��Z :T��Q]�s锨��E�%�Z�z���Ad�Ã>��d������z%Z
+Q]�z�U��~(q��a��Ǝ`�C�]�JM���
+5�A
DP7��A�-��...F�QR+٦�rT?����N�^��j�b
%vb���*v�\O��U^�x�נR��ūW������_��?�N-��j���������K���j9Gw��N������o~��7���
+r����Ϊ9�YRR´X%��ϩU#@�-���n�^�����}d>֖-<��������'?�T%��d��.�K��R��O?��p8����Ņ�(I�5���s�Xnzç���&%W�U�����e���#R�^\�s锨��AXMl�J�U�� R��~�X
+�����k����d��_DjI��0r�^l����(�L&��d2��6/p�L&�嗕�&�ɗ_~)��̦{�"���r#eUrETW�$�D�0�	(�V�dg���w����x����V��l�7VZUnP1=k��M�ȩ%q�����P���T����]�#ھ?��[Krw������^�w���9�L��&�*�L&�f��>S�'%�;���H����;�4��eZ���d���e�Z�����i�߷0�;(�L���J/_�\�Բy�L���ϩ�#@e-�ɂ����O�i��Gܲ�'r~~n�Jr`{:�����޽�KeJ�y���h��V����NNnߕ�G��\�4��НGa��;������<�0��zgggl�p#w����/~��[|�b�u^E�8�nB��H��hd�Qe��	�!�o���Q]�����?���_mZ
+P�J�ّ��T7D4��8G<�n6�<�S[B��j��Q���^��y�`0��0v�!>��SVI\�����m�#"�D��K�!؀I�$#���g�V���dM�k�d-TI�����ŷ�v'�F�2��ג�]�d��ٳg��+����7޸�>����5��ݕ_xQK�9�)Q-t�������	��7�M���!�8�	2�ς�z=.�(c���r�~J=�ZŷԪ�Z���~�%q�т���"���!��z||Ej"E�-��㮇���H�	&� F��k��&���2��r���8eUrETW�\:%��	L@IT�S+K�Cy����y�Fm\>kȩU�~ku���EN-���Sx���Ҧ�/9��'��PK��%�-̺�^:V�!\Ya��4�W�齤��\�xzO�W��{U�^��ⵐ~y{W�~D._T�
�_&V����>8�;w
�e��ᱲ�%�]����(��/���b�joy�N^�N���*v�
+����z�Z@9vP+��AI���c��o��˗[Ȓ�=��h����9QM�N��шs&�̴����`~9��8�IA�K"6Ea3U;��IN�ja:EP�U�[yM=���V'k�_S'k�Jr����!�ŹG��!��J�NN"�q�%ރ ��њ���DIt��PV%WDuENrJT�������=d��DT�~ku���EN-��ֈZ�p���$eO"xnW�C� �ee�CZ'��$��D+��`
/#i6�2�;�ˌ��)Y7Rj��>����L���~��b�m�Dh�–sw��u��ꇦ&Ȓ�FȦ���-׳ekO���ǕS��WٚԄM){���á�������r������s����1�N���R��N�B��r�������x��t:����cnnn��)_N-�-��k9�U�Q]�s锨&0
%������$){�C��5�����Ϋ���t����G@����+�J�����|����������S���s�9TR�2ժ�Z���~�SK�|��
�����Ɋ߻k��J��Nj�ܽ��qNw� [�r����[\������^��P
+�}��W���ۚ3�:��ꊜ䔨��AI�UR��N�'�֮ꇬ�F��|
+�u�CZ�vd��|>�z��?z�].��h4j�ۃ����l0��8L�V�-��V'k�_Dj�b�*Je�F��t?�Yl���,��@���r�,��wETW�\:%��Q�$��$�72X�����x�>
y�`0`�;��T����,�:�ʖ�x��l<�F��o�N�T���H��W<eu�G�B컰0[qdz_��}�fG�Q>�`+���
Ž��������G
+��
8,|��_�
+*��(zhg�Vp\�"[c������A��%
�b��F����t�NPTa����DN����Z�;��o
+Q�e��K��咺�.��KZ��|�V�
�>Ω��7��iw��x,��&Ȗ��Zr� �N��]m�=l����bo�c�ޖSvV�K�������]�S�-���9�,TI������9��i^��~m��/vL��`���qP�|>�<o8�����<�Iْ�]����X#z�t�h��ׯ�G� �{#��`�����w2G����t� �����J�E�d2�&�Ʉ��z�L&aA T����{�7�ϭ��X���
+.��.�������*|WI��x���"����˗/�Z�P��ު�H�T?�<O1�L<���zw��ᝓ�D�M�a8'�I�ٔ����%��bH�^�hY�^��ZpETW�$�D���(U%���'b�v�&Ȍ<����Z�[��5կ���P%U�����_t�ED�XP�K''�r|������{�w�����0V� .�y��w��|�޵�P��W�$�D�1�;(U%q���،X2|+6A�3_�N���N��S]�m��'��>B|�駼3���pȚ����g?�ٯ�kVg� ����P�~ku���E���ֈJ,�G��j��dO�n��rH�v�ٳgɉ�(���6��m"��/F�Q�ٴ�"�C�:AƳc�	2X�5���ˍڷ
+�L�)v��1��j{�C���������[=f>���1<���p~�?"?ȑ`9.�^�Y�-
�j�9�)Q-t���PU��	29;FG1Af�14��ת�Z���~M���*�d�E���k���O?���L�Ş�d������R��7���wji�hZ>�A˖�0�nWaa�[P���KWIB,��B�(�/$WWW���1ϟ?���������]����%����>��h��-[{"�?�S%s�_ɮlZ�ca6���A�YTR�Ae+�d�$K��N���A>��Z�p�1�C�� �v\����F�8(�,*��9��e��X�LD��V'k�_�Ԓ��7�N�ꇲ�!g���z�Ng2�Ī�F��`
g)�%2��p8�A-��f��
+8<����J���
>���F��%��L�.�����v-'w�#9K�LT™݇�!�5F�5��#'�R�P�	�e�(JV?�F��h��7�z*���l�m�%��5��W�JR�$��~(S��2�\%��v�pFΦ�!;I�]�y�i��f�aI��$�@T��"'9%��nqPY"��qk��V�-��V'k�_DjI��F6���"��J��=�%��x0��Z#Ap��x,-�O�]>x>�w:��<O�V-D�V
+i��-W��D-
W�$�D���(�
�T�	�ZՌ�U��:YS������z#l30��sߝ�}Wrw�ʝ5
�\X��8�;�-
9���t�-.w��j�Ѳ��Fr�ܳm�lk�C��!qy��x���YE��|0x�����G���n������`0@�C�1L�.�ݻw��ыL�.7dr��Q���S0Ro����%��]f��K��咺�.��KZ��|�V�
�>�7��`	�A�X{��8� WWW�����j�\��p8�N�]���x<������X.���X6���t:��z���O�S��t:�#�өl<�d�9b,�>8�;w�Y����2�����uz[N�i�@�{ʗ[vw�N���k'��P%!��r$wO�rOba����A�ի$�J�;�ST�V퓥,4�d�d�׍XB�E �P�J�\���#*{3�@I8o�dI`�X�p(UDՎ+r�S�Z���D�ZZ�l��V��j�o�N�T�ȩ%9�H-�C�`�8p��u��ci�۞�
�d���.^k�Bo�P� ׇ,�Z�~J.����`��o$!�-��SWrwN��9L&�	o�z=~�!gAa����?����|�z�p�����S�6����a�#D�UG�6��y���LJ�ֈ�Ws�'��AڻL����	!&���y�^�Ν;�s2�!�).Z2�L�ͦ��|�.K�!:Q�㊜䔨��AI�Gj�d�V��5AV���Z�[��5�/"�$��QKM%��Oi�Xm�����J''�r|���I���<�Ν���1`�^���ԩ)�Ȼ��-X��ݡ�rU;��IN�ja�)P�Jb7�.��aB�#�bd<���tbd������\�P�駟��(��8/�N��G~�����׿fu�BN�\��q��V'k�_T?�8o��$�������_��Ǟ�T?��@����gϒKQ��m���D��_�y�z�p4$i��?��_���c��O��	2@p�y��:��W��K������$���5�c����=��|���^��3L�
�w�#�Aؐc1K�yK���qENrJT��$T��u�LzK~���k�� 3��z�k�o�N�T��N�F�d��bQ��-Nz-��$K���^����Dв�7�b��ח�ܻw/E%�����D�
-H�!7���X%�=ϟ?���I�>F}W��'DL�b_���Z8��z�l�p-vU���Ƚ{�<x`Z��h�Z�w*�`����qEΥS�Z8􃒰D%�4A�TIFCS�~����ɚ����Z����ވ�X�p(x��T�r,|����[�,��i��]�tߚ�}4q�D"�����|0���f����3�J��Fғ�g!Kr�0���9�y���prwy$�*�'��?�5F�5%/	��8@T��"'9%��KA9WInM�ժJC����ɚ��F$�[#	��򇒔=�|ﻪ�z=�GK=�<��N��I9�V����3��	d#dM��$��)"�Z��IN�jarwP)93��Y��4Ԫ�Z���~QoD�5�
�S�eULٓ����`0`D�F$�$�9+�
+"���9'�g� U�"b+E~
+�q�	2Ȁ��Ȇ[�+��$eO��Fa�x��tz��Zu��x&���{��C9��
+/K���܈t���0��u�PDՎ+r�S�Z�%WI�>AV���Z�[��5�/"�$ȩu0��lW���H�,Uo,�{8<��A�J�F\X���\��`U�3�LT}�l6���p8�d2�N��=�N�a�$�"!ϗq�]��.p'pX� ���|>?tbi����;p(x��&��c�|\�Z	��d n)��q��EN�@T��"'9%��nqP�sj�T%r#ݿA;��G�V�-��V'k�_DjI��7��S�������+�P� ׇ�*��U}D��
8
+,|�����E
+j4h�	�1�{�xN���5����� ��c��5��-�Q���t%w�L�QqBw���z�2� ��9�0�.o|������sK�!:Q�㊜䔨��AI�UIG6AV���Z�[��5�/"�$�[#�^���fjnw����(�
�s�J��y'3�<���ݹs�wN&!7��p8�,(�#|�
�&ӽ����7���wf?^��e�2!��H˼<��Kt�N���T�KO���1^3��?�;A&O-9b��'}��� 6<V6�Ķ�~c�������]�S�-��y~~n�J:�u#A@��3=}JD��!=}J�Q�K''�wezw�N��!���N���q���cx�j<{�7�0��zgggl��g�ܹ�_�B�I�RS��?E����h4���L]Jhal�P� �U%�����%�����f��7�~Y��o�_BVL<�����O?e�E��[��6O��B��g?���͓el�H	q'pX� ;�Q��j�C�{��>$"Z,V�>y�R��P�C�IDlϼx�"9���U���?���_�F#N'oC��� �i��W�$�D��-J"��b��Z�
��M)~X���|>gm%m��v��6FE�[��w�}�[Ȓ+��ch�ٯU��:YS��:YU�Q�F�ȩ)�i�R���=���7��{�廼���D�w�W���A�YrjQ���QK�C�x4�M�GϞ=��㏥D�@l�ۼhD:L�����O��O��X=D��
>ȵ�F��A����a�dE*����A�� X���QEj%����M�U�0�
aZ�TDՎ+r�S�Z�%�1ͣƒ#)���
+ުb�n�����C�U|K����ɚ��Z�#������+�P� ׇt��
Z�;�#���y�Hq�%w'��l&s�s�h4��D��=�����l6���՜ p�
��p���O'Grw^��)��(�Ð�p�6N��!���L\њ����C
0U;��IN�j�[�Dq���Y��[j�o�N�T��Ԓ8o�ܽ{���Z�P��'Qfo�CZG٪/���f�N��a88�/D�7!%	������DՎ+r�S�>x����"6TR.ܚ 3��z�k�o�N�T��N�B��5��ִ�){�����Ll2�M>x>�w:� XCH������J!M�
X
+&� �[#nq���$eO��X��'���r��g�gKWN2q#�-Nk�A�$��.�>
+����qENrJT��$�*��'�j�R�~ku���E��9�&YD&w��"J�rOba����A�ZTҡ���!�"�^�c��ǚL&���ѣG��T�=�����F�Ϭ�j&���`�\k����9�n5QbXx�r}��r,|��+Rk�X\���q��EN�@T��"'9%��nqPYT��;7�J��[?B�j&�U|K����ɚ��Z�Z�F���D�B�p(x��CF���ŝ�`�|��v��؟��'�礊�ZS�<ϒ|&M9CT��"'9%��Q�$��$�mݹy�P��Z�[��5�/|#�,���<H���%і?!�42c�cL���`����܌���r9���r��}�������<����6��N���?��[�w�#��/�rqq1}ߏ��j�
+^�q� ׇ]*I"�NM����`0Y/lUI�����������u�r�������uS�������T...���N���Av�7���vߵV$Ҏ)����<!�d2�<���ݹs�wN&�v�
�C��?��p�.ҽ�Q"U��7���gIDAT��/UtU?��h2�DQ�y�����0� ������wy���?���C�Cq�Q��j�v�k�n�l���Hr��|�y^��B�
Zl���!�2��w�}�[���C
0U;��IN�j�[�����L��c�Y��[j�o�N�T��Ԓ��i
t�40�}Z,V�n�@�
+��tT��i�۱�#j�C9L�f�^�'m	�w��ٳ��RE�v���6}���ш��[�h�A$'��>�łZ������C��:�Tl��ɔY���R�	�N��yޝ;��G9A���	���q�W���|��`0x���ݻw��!>�e�#������p8���e>D�}�o��sސm�z=����G�� ȗcQ/Y��[DՎ+r�S�����7-(�J�J�5A�sd�1Af�14��ת�Z���~M���*�=k����qs�/Q�����������+�J��b�x���yc���k�"d�j�9�)Q�Ԡ�j��*���@b84Af�14��ת�Z���~M���*ɍu#샖�u���l�
�h4R>���;U-K>,	�:991-BV �v\���u���E2�;��R�J"��|_�>J�~�N��&�ԏ��:Af�14��ת�Z���~M���*�
���h6��9d8���~��,g�\�UT1�����$a�U��Ņ�g�j���˿L��j�`��^lG�)�ػ/_������F��\._{��W�^���k�}���OD�K-;�5��ի;w���b�����_��/^�`�ԫ���W�^������~�[~���*�ߊ);�^�Re���o0lj�x��Ν;/_��ѩ�@lA�$ڦ�x�ȃL�V:����c�A�T��k8-{�
���-�X��唝�~	T9��|�|������o�m4֪$���"�W�^��i%�$87֍��9Ĵ ���F�.d��8�JP��?���Mː������x��|>OV���(��������ܿ?C.5eI��$���eىz����)�iYv2��^�x�?���Nf�����߸������U�Y�R����`��k���\��W<��-��+�n>�O&S'��^M��X:��͍����Hc8���\\\,�K�o3��֢�g���B��t���	l'�4
�å#��b�dV�T�/bU|�Fa9�U�{����R�����#'+�ۃ3�Fva=�(��%��|>�����Q���2�I�!� P�t����x�ym���-T���ꗊ�E�+>��/�:�U�{����R����f���LZ��������Z��y����n�Be!R�f�9�G�Q���:����6j�����#�T/����vlZ�
��\`t>��p��V!���z\��,���8ի$���b}�k ��|�Ʒ�r�le���rk�tǕR�N���V�n.�bO2�͢(����d2�6(�l����"��Ӳ�d2�Q�ݎ���KJ��6�%���`0pH`���h�l6��_��W�����z�dV�T�/ԑ��a��#�����������^�ˣ%�N��ɲ�j�䳳�f������jOV�n��t�q5��9X에\��䈐*�	l'�ݨ�9��c���l�s�H��dK��X#38�n��f� ��&��
+!����������WE���*Cj�f��*�wr`�8>�ϩ@A�0��;W��������X1��L�FH�$U�)�V�
+�Pw:����o�K�8�j�
���T�D�J�x�5]\\DQ�N���3��cNyaZ:����_|!UA+����;��l4qn"j6�r�SI�@��Z�7�PUA+�#9� i�ƁV������
���Ff�50��`��k`X#3�
�
���Ff�50��`��k`X#3�
�
���Ff�50��`��k`X#3�
�
���Ff�50��`��k`X#3�
�
���Ff�50��`��k`X#3�
�
���Ff�50��`��k`X#3����nZpTDQ��ŋ���W�]���|>�Q��$��|��cR������c��DQ��_���鐛*OEѿ�ۿ�ɟ�I�r�
+|#@?��h6���y�h4j4�F�ѣG����|̏~���h��+E�����0�~�����ѣG���<l6����[��$��h��[o=z���0��ѣGo���h4*p���(�F�я~����3��-��rvv��`	@	!���ҏ��z|�:r0�
��P�uu�l6���t:U�O�S�
�ϟ?o6�B���=�����~��n���WD���S��� �^��.6�(�������(���_�[gn�(
+Ð���G�EQ���ܙ^�7�N�� �(��;u:��U�f�����Ng8�3�&���|rE�I��y��
0�P
+�f���L&��ÄD�y��f&��"9�F#p���NG��<�L�^����懄Uh�qE�I����7�
�
��<�����ǂ\����M&��;�G�� �:ǣ�H��`0�Ny���X���Xn'���
Ԗ�d������.�*��F��)[�=�
9����ދ������� �{�=u ��3e���/���N��z�{*T�0䍤;[��t��B�a4=z�HʖlVv�ar�P[���}����l&5��+*o6�EQ�^,
����ٙ\hADB�(��I#^u�u�VB���(��� ���2o�.�"/R'�09_��� =ztvv�	Iҳ�����D�x<ު��Py��n�6`��<�����9���ilF����˞?%��x4�.�l6/..��)O,M&^;L1�N}��t:<X�����G�l�U�h4����
k�!�O�`���G�]᳤x���?����b0��v�{g���n�a�75
+���W�)�A����H`!�F@����b^�ᮐV94g v�x<�"��~��S�S9�[ddLj���
.�����"�
y`?ur����Qe���x>�����½T����$�Z+�<��560{ e�x�U�b�I��n�ۼ�ElJ�ȃL���O�f�YƟ��S"=��a��95��;%;�}��.�9�Z!��f	ߵ\�
��&l��v�
(	X# <��5bG�Q���h2�����O�24GQ��Rx̍%AO*�N�������bY�y
���v���'��^�'��b��f��l�q����`E�,���MD��œPy�Ic�\��
�
+[ �͓.�:�L<�{��y�<��+���`0��/�Y�6;^x�_�0"����>W��-�C�8��l6�t:,��yBUη�zk>���m9;�|#$��_����d�jK8��b���t��2
PX#���O孷���e�XR�C�d`3�7d�ڤ���
�U�m]���B`��R�L&Q!�	���@�n��a\p�@�
P�F�f����$!��@q`�̀H-�`��k`X#3�pVU��9IEND�B`�
\ No newline at end of file
diff -Naur ns-3.17/src/lte/doc/source/figures/MCS_17_20.pdf ns-3.18/src/lte/doc/source/figures/MCS_17_20.pdf
--- ns-3.17/src/lte/doc/source/figures/MCS_17_20.pdf	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/lte/doc/source/figures/MCS_17_20.pdf	2013-10-26 07:07:30.111364395 -0700
@@ -3,81 +3,97 @@
 5 0 obj
 <</Length 6 0 R/Filter /FlateDecode>>
 stream
-x��}I�%�q�>�;J�&������G��t�栱�=�@�?\b�����_��{��W/��$�� �Ϸ�nn��������m���_?��CȮ�M�c�ݸ[�{�yw���|����~0�_��b(���-���S��`�ݥ��?���?|pwks��������ڕ#�s�~
�k�G�G
-'��0�_�����w��ヱ6�{:�������n���_oC-��f�� �O�����wS�-sd/s�6�{tR'�^��:�ȩ��R'�^��:���6�/�N�ȉuz���!ߕ�z����EN���l�mq:���dޝL��O�ljt��
y�����eN'��'w��WR^�?���g\\���7�����I@	��_@[�=�����ϰ�V����������ɷt?�	����{vƕ��[��Ϧp��#��ݏ~�������>\���=��U���<e���~�{X~̷>�{�����c�?�z̲��o}����o��,6
=b���|˟�|η����i��%��4��c���z̷>s��@�d�����t�-c�w��9s������-�u}Y��L�?��nG�?��W�X>�-�
t����{:��.�3p��b�����?}��/��*�<NWڵq�q�8]WR�zE�3N��*��RٱC��'���tݎR�zE�3N�v�G����8��X�8�5��vT��+��qڷ�
Ve���F�؎��u;J	Z�]�8���e�^'e���F�؎��u;J	Z�]�8����|7�;3�]݈�Qq�nG)A����};�l�6+;vhW7��vT���QJ�B��z�iߎӨ��
��F�؎��u;J	Z�]�8�ۑ2�l�w�}v;*N�����W�8��Э�%�qIr�n �݋K�~\��5#'��Հ6���h\iN�Ǖ���^������J���Ɣ;��qb;*N��(%h�Wt=�o���*;vhW7��vT���QJ�B��z�iߎ9w��ء]݈�Qq�nG)A����};�K�����qb;*N��(%h�Wt=�m�|�p��;3��2q";jN���$h�Wt=�oGaM�ʎ�Ս8���v���+��qڷ�M�z)z@��'���tݎR�zE�3N�v{�Î�P���8�?\����xŎ#.y�Z\2q���#ߣ�{q��~��4N��F
h1��m�ƚQF��:Q�IU9Z���
KOa����}`�b�E��QT�u��� F{V>B��`� ��GM�0+7{y;��:#�

-��C�bĒ�_$��	=s�P�sS0U�쓴���xx�����S ��LV����O����|��~��q�^=_�wkԠ����^sӸ�Z�!Bґa�:(#mP� x�f�9q�:����:�{�7���$kh"D%�f���b�i���aF��!M�,/�ѓW���9*��!��D�,1��Jb
��(�0s�V�y&\��a�Iqـ8�,�[�WdqQ�s�p�7|�[#ݲ@�V?_�N�3{�����%����8��m�����ݽ%���o{��4n�W%���VJ,��ݓziּ鱟�%r�It ѩu�X����pY"��$1��C�����ԣ��pY"\���{Z`e�i�vh"\�H߮�!F��pp������
-��V�?|�ڞ�q��*�:�|�D3A�p]"}w��	�U|�@h^�-��&[�G��pɬPI��+��,z�h�uy�18{�5*>"�s�:��_ag@���#wm�j:�)uw0�ЩN���8A�pH����7=BWpEW!LU;y�	Va����A�����T�)���4$|TB��\߀3��w􁟏�H#X�Ű&��t��
�����"�
��7�m�����R���O6� ���K|}�A��?�<`[�'۾��g��v�ǯV�dr�I";�$��b8ӭ;���@v�I {�$q&\w��&��(�D��I�L��(�<$
-_y����D��+/����L��1&�ݺ�LN0	dW��_Lg�uW��`�Ȯ2Id��$΄�29�$�]e��~1I�	�]er��D�*^�/��]er�I"��$�v�8�����a��� ��������ժ�LN��o}֮r��g)���}"\w��>��#\壻4����D��,w7؆�7��Y��5��?G�?ӯ�������$���O���IR�3�h�Wn��O�r�w�#ȸ0��n�ymnpu6HW�C�ۈޛ�3�f�UnN0,i�p��\�Z���Dx���f�ˑ�Q"�O�Ռ?�}���ێ���\{�=Y+�,�Ӈ���t�����i\��N�Z~��]��
$pD���>���#=i����F��O(#��������]��:d�	\��=�}�[O����uF.x�`�ԒH�-K���1�����hЭ�����J��e-��D&<�6��@�R"��C�!�Ȅ'Ц�����jTJ0D���S"�aK�u�$Z�:4$
-�hS	���z��_"�Lxm*�m�%<HA)�Id�hS���V"fp���D&<�6���%S:dh��	$�gdOv��9�B9r���% r����T��w�D���b5�D���T»�J�Ӎ�H�g�FӾ���d����6M;�W����]�-
�cg[�O�A������O��E�����<��Z���d'�-�,5RGN=�}`x��CB�.�&{�r�½��%�+�,C	����D���������ex�i`��P*��;��&[s����?��y��Ѵ�1�@D��!z���O�E�<$B�1��@�n9r�����V�
-A�cz(�wz��	O "��B$�Hс�tQ�ĩ(���-�V�n�G�v
-�@�<��@��
-t@�\�(��`������誘��m�#�HR�:���ɧ����T�\��h�1���G��1?x���(����)��^���|/c���BM�����{i��9���|3��J���ёoƣ�����@o��R�ꗓL
-��s���q	�x9����_|�[�^N2�����T��]Ǝ
���;d�q������q'�,�}Q�>)��\@�Z=ԙ��H�NVS����J�li�����I��=�F��D*1��~hZ�H:a�7n_�'��H'�vt���Iz	�$�ͻ:��������6�qꭁ��z��ⵗ�C[:yU���Y�����L:1��S�ZXٖt�J��c��,'K}@@#fX�XM�S��A�l��*#�8%t�tZi�������}�*����+�Y���v��(5�ޯr�-���h�T�@�����f���8�g�c�ZtA�т��IGj�l��o���oKBx^�/+A����\���V�v26+�j݈D,n�,���o1l�h����6����8nI��v�|�yy�Һ�~�C�v������������k�l�Am�������qw���ꬩ>������[	�,��m���D^�V�,�Б�e��	�
-��m�ж����*σ�x�wF#���dy��=��
-�O�6m�Dn�V_��q�I;]�2�7~��ӷ��:.��_�4��&h((��K��0X**T��pa��2O *8�MB>��3C�2G5��t9���*S�4P��}��X8��P9d���gDg�2�xP,�VZ�rʶ��FPW�\��2�[�4�C�Z1
-C1۶�;"F�q�^�?���mlqg��R5bC����rs>�7̷��h��~��ߎt0V��	o�Nt�
>j���#�x�l�����_�[��b�t�WFoHyC��q�c�	����1�+g�00�X\nh����}�,��-j��D�I;����?
5����n��
-��B�����!��,�Z.����O��~��zu�N_��rcQ�ML��V��w����-�q���������~N��������4�<~���GD,y=�}b%��F��ӡo����Ԙ�#_vM'#C@]y2������ǿ}��Oh�|�[�MX �,��_����d����Ō�B��#P�R��T����%��^����vc��u���z@	�K�S�L(�o��xA�&&/������[<pb�_˄ě�Jx2�0!��]r2!M���	���
/��ALHF^��4Ղ?ƾ˜�R�o��D��L�P<2�Nj���	铹�)ِ�cR�a6P����¤�+y��ѐ�I
-̄�Ť���)�JLDx}J⩄:��2E`�Rwm����p#����Y��Ə9���&��I 9��L��Χ'#�"1mW���Mѷ�5Odž�	��:�J�5]K-�"]=8�X�+t]��-D@�~j�0��b���FoDc�͞�e2Ɇ�o���c�x]�o�w���u���\���9dc�)����G����=f�jh? ���kE�'� |<���šZ������ª�UE��-pd/s2��T�:�"'��ENրwWkKH'�^��:��)�7Cۉ�9	�^�A���DЋ�X�9y�� 甀^��:�ʩ����*u�5>B���<�;?��N[�X�9��M'��է��D:���\VrЦN�9�N��������eN'_�O>�����\>-?�X����o��͟O�C��O�y.���Ro �Uz� �Fp:����Gp۳
�3�����C{O��?�����4Ϻx��O]
-_����-����{6�9���ym�O���v�)񦅘�~ʍ���'���oy�ן�Š���k���c��\��c&� ��cn�ϟ�X7�'=��齻~zȹm̋n��C��\L�è�2=�ƻ<�v△{�2�d�#�U����ó�u}Y��Wg�w�cȮ�М^0�|������R���Y�7����Z�~����Ǖ��rXud76|hP)>�ǔ�%������d0�kռЮfĉM�8]���0	���)�};z�3�ʎ�Ս8���v&�t=�o��l���F�؎��u;
-	����rڷc�4��ء]݈�Qq�nG!azA�SN�vL��`;vhW7��vT���QH��^����v�G��vlжn������vd	����rڷcv
kɥ;��
�؎��u;
-	����rz��#.�x9�Nv������m��G<r]��L�.�#x�f-�؊G�~<bQR1r\
hwg�8ѸҜ.�+)azA�SN���:삦�ؐ]�6��s݆�_K|]�3>��6�2s6`�v5#NlB��
��I�]O9��1�+ȥ;��qb;*N��($LB/�z�iߎ����c�vu#NlG����I�]O9�`���[ٱAۺ
NŽ��;ؑ%LB/�z�iߎ��Vw�v�Юnĉ��8]���0	���)�};b��ڮ�؎��u;
-	����rz���F��rE
�Qrz;~��+v��u�F<2q��8k�&��xd}���J�{sw*Ц=��+���&�t=�=���������F�|�ې�k���y�g�~X�o�=�]͈�Pq�nC!azA�SN�v���ء]݈�Qq�nG!azA�SN�v�4��
��F�؎��u;
-	����rڷc�:i���F�؎��u;
-	����rڷc���j;vhW7��vT���QH��^����v�	�PVvlжn������vd	����rڶ��Pv|�j�nǹ����@��+v��u�F<2q��x����*_�G�kW���C�/i�fC�.6^�o!B�a��|zT��Nw��S�>�t~�z��������)]��m�N8lNkutq�Ł��j�y�{���:��,ĥ���\v��˔˾^�h�۝�c�C����
�1�>��*�6�?�x�Y=�u��F���5���[cA~`ׯ��Փ��u��w�a�������M���� �8���#t��}�ε/@x�A����|J&���uO���X<��"%�la�xɾ�Τ��pUbmoq(�ƘR��3{�Gr���Z<t�@l����<`r̈́�]��TtWE���K~B4ٲ8>D�������$��3����m�B`�D�~�PZ#e
Mt��p�;-0�N}�=�:
4.K,x��Q��mw<��44ӭ
-�8�ۂ7Z�	����54.K�#U$���@�ބ�v���D�,o��^>��N��'�e�x��z�Ǽ^k�oW�JD�-��!���C^/5?dz�y"\��c^-5��^j,���M�,���<�z����)jh"\�HKtx����x��<�-������mIδkɐ=�m�
@'��5M�����^N�o�
Z0b��%:I��m�
-��%�w��c_��w8�q�
^�m
;NO�
-�	�%����W��ރ�%\F�	C�/��nY ���:��
B����I�X�E��R�̈́���Zj��ǵƖxt�7���D4ٲ8rk�s��p��Rc��a��;�B4ժ4r��aDmD�q���#����V��24��뺾����"Ԅv��j�Ex
-jj�F�������߲jbuoh���f�Fw`g�(LͥYt���5��x�S89lp=����|��]*�JFa(lØ���5�^�D�^�.��-d)xN?Y
-o�2���$K�r����R�u�8=�D�F��1x��Pa"!/����
-�Nx��z�w�N]Y�����D
-�ń,�p=Ll
 �(�YQL�g�ey#�G�(��P�	ף�
-�#J{L(�Md�Qb����%
-y|�	�	�%�PHa���cB!p�[{(�0Q1��8.K����D!pĄB�L�&��R�ȼ(&d�O��ab��&
-�|eI�	�%�PHa��8bB!q&\[(�0Q�A��7����=�F�(䍘P�	���

-�#L{P(�Md�ab��&
-y�1���pY�kμY�0q �	��~�[{���j#�Ď(gT9���G�1b��\���ň��?��f�e���Ꙫ�g�=�Ի�?�Lj=��V.����R~ �a�2j�-ʣ�/�a��B�I/3�2>���~�"���9l��d�8 ��bɦ�D�"��gS
�8F��a��F��b�8B@�~��"�����}"[�gM��Em�dj\
-�tm�9 �ރ.G�&�e�xu�q��k�Q�����@d�`Ƕ��7
-��ax2�P�L1�m��e�w���E��8�;P̱�k=�E��Mtj���#o��G+���%���q"�S�ƻ�	>N)�/Ќ),�3p�t�G�o����4|#¦���d�T��)��U�Y�.�����e�[�2E˄�-����~��#��Ѓ!0u�K�'.�9�Dm����EK$�hW	s`��K%��=R�b�Dxm+aJj��mΝz���N��lk�\�
 ��٨�E�8O�m%|rmӉt���BG��N��lˏ��M(R�hEa@B� <���H���H�/��CG��Avm��s�{U�B�w��@��8O�]%�aGk(aXދ��D"<���0�D�֚�o^��	��x�}���p~5�Ā��Axm+��H��s�j�$$�h[	l)�u�^n�etD��T�ȶ|�pӫ�M�N�$AB� <���ȵ�,�֯
��ѫ0*� ��Y�3�T�i������%n1�U�A�x�O &\M5���6��u�$�Ė�C��M�'�& �(��x÷�U#�����n�+�@�pu�|ضܵi���EޤPƭ�
��W�0��r�(�B�Ɯ�Jز�A��"���EjE<�S�J;l›y#W����A���0���cW�تF@	A��2�	4W����w��������k��L�t��D�m��ٌ=V�=�7u�P
-���Lx�j�Ö~�
-<MnWC\l����C�@D������wpA�RkI��Z��ҭ�@��K�<7�;�^���Ƹ���ZDY��U.�0�[�
�9�Y�zS�3���D!On'�d�`Ԙs����I9^B(g���!s�ƚ֙��¶ؘ]��"��a&�f'����V��b�����$��
-QM5�6��;�a�R2g�
���|æU�7ܛՊ:9�F��7�띴�
�^�ϯ����+.퐶,�8�U�+ƅP�bx/5&^1(ld���0�bܡN��b_3L���:i�_���W\]��M�լ1�c�&�H%����J'�N1�*�J4��N'
��*��O��+�Z�ʡ�u���N
-`���{���sO�j}��I�z�đ���j�����r�*�j���84������)�pt��Z�`�t�c[:9���f��u<��8�QSB*�Ƀ-�<��h+�ٽ}�KT��J|6aK'l�kU�	��Kڷե�JtzaK#�Yn�*`��o%.\!��|ÖN9�7�S]^��
Q�B:����a�a�N�����/C'qHbK'Bm-t��W'|R�OQl�d�{{8v50AZ���"'vZ|l��8g�]��t�1p�6a��s}
����i
P(`�Oy~c�)��5y,��Ӫ�5cD�|m��,�&�G>�O�X�q�|��N+}���Α�C|d��X�<���Y�����[	O��(�ϭS!���[It2J�wAX|϶��U<���[C�D[$�/�rwg�<k�v-������<XR�� LG��9���>��_sq���͓'0�b�7CDZ��KW��`�f�R���c�lJ�G�.]D2!ߏ�W�學z�h�5��zFVQ؄����U*;�{�z�h���VF
�����{�� w�_��D�t��^�J2�<�B��0.��SĄ��R�uK��n��^��7G�[�d~�
����%�p�)�ք_��7��;Gi�Ʈ�|K�,t�V�X�[��o��'��o
-��8Q���	�b[L���{=��Q�Q��'���A�
�ǀ����@
�<�LB,q���ٖo%(a��UF��Q�!,8�9�5F�:A���
��S
�*�H�q��z�&�$�'�݌�_
-��\�G�!�Y62��id��F��`F�Dv�qB����o�So���8'�\��(�&�^��������S�҄�Io�g˩ml�j�S\>`l߰�,S/���o~;n��O��t"�
c����'�O�q�x���J���Q��[>YD��i�f �
��Gě��'�ƹ��80��D�$�J<"��m���~��L�%����I�
��-�����(�i�����A���̫��cC����3�OCm�qN]`�D����s>��k����^]{`���|���%������7XY��~�O���o��sZ
�`[
L��Ś~Đ6� �XOҲ1��wO�a�<���jMo�0{@_ba'���q�������?���?}B�좼eQ�A��2[�C�0,�w�'Y�p���#�r��p�"d���Y�0����K���'(Bm�z%^i��Q�L(w���8���������L�2���������-LB�|��-ڡ�I�}���$수���$$��IH��b�NO���50�����/:	���8
�����ZE
�}�IhjD:��[���F�C's�86�9�1����9H��s�E`�b��U�b��������'� ���[�	��s�O�e�
_rF�B<�a��)��CM�
�L�#�ALɎ��&F�RT�\Ѹ`
IpRc��/����:���#���w5����
���������V��O�&�o~�:NX�
nVx�<��n-e{�*�>
K����xAl�W���� |<�z�&nt:����zYѭj�A�2'�>a�z���"���*
�5>��k|hS�"�EN�ҋ�h��u"�EN�Ӌ���ӏg�n���"��9w2��>�'�)�d�n����2'�)Y<�,>�M�.s:Y�>�x����|Z~��zY��߬��?�B'
�SE��A�5�;G��ظ5K��`����>o}��ͯ�z�Wo�0�ꇼ����i�a�!�p.?���5�k�����'���o:"��с�����k|˹�z�7}�ˏ�M��D��e��v'6���o��g�˜`����*�V��7��i�o�Z��u|g]_֍�&]�m�M�8]蛄�ɱo�|�o��jW�¸��R�֬#��|xPI>����_����x��W2�
;��qb*N�m($LB/�z�iߎ5-�b�vu#NlG����I�]O9��1�c�c�vu#NlG����I�]O9�۱�[��;��qb;*N��($LB/�z�iێ�D�h7GC�Ȏ��e;J	����rz��1���c̯予��cT7\�#K��^���Ӿ�u��ٱC�9�����8]���0	���)��82�Ž�s�dG�������W�8�뺍xd�t!�X�W�f<b���j\��k	_T[`���X�:%I�g��'�]>�&�ЮVĉ
�8]���0	���)�};f�����c�vu#NlG����I�]O9��o���ء]݈�Qq�nG!azA�SN�vL�aڙV��v���Qs�lG)azA�SN/�>Ym�m�68	;JN�`G�0	���)�};����<�]݈�Qq�nG!azA�SN/ر�fPvlжn������vd	����rڷ#UG���Y;*N����jB��q��u����B��GZ��?�~��B(Xy)�U�v�A�xX)Nׇ��0	���)��a�Yl��mȮf�Q�nC�%����}�e�Y))vhW3��&T���PH��^���Ӿ,E�;��qb;*N��($LB/�z�iێ��F�u�-� NdG����I�]O9��Ѹ�FJ;vhW7��vT���QH��^���Ӿ-^���ء]݈�Qq�nG!azA�SN/�1<ʥ�ؠm�'aG����&�t=�oG�[%;^/�v�J����󗃿b��\�m�#��H
}�M{�ȱ��������yP��=��;�{��q���r���(q6!�}�on�m��`�
���r�=nQ�W=�&9�nd���M��{�%t�ã3�ZB��1�h�Tz��\�(I��g5nmH��5��4��C��bv�O��[����Ք��œ�V=.�K�YC��f���q�}1�奵���m��!����>��b����3k?J��:G5��͉�,�a�D���]�,%l�d�d�=�}V��FcCw��U�D�c�g
M��s�%z��{�^+1.K�F%1���}=v�%΄�-�I�}��8��~�pYb���^J��n���q�z��L��yo�',�D2��5��}�
-��%�recmɋ����z_Y�L	��ֻٍ���Y�g��z8JH��7��+mm�V
:��gL˶�p���D4�z�8ZƏzy
BxT$ט�������iQ�L���$b�N�*�R�Q���6��D��
-~|�����s��v	���G9ۧ��f��k�y��"�;����F|�mu��sQA3�D���}�֛��P�,����dg��v�.�x��1�As�D��XN��;F�*�����Z�nvq�e�<R^�իL0���D�W���{W|��ؠ�/m�څ�l��[�"�76�=��mJ˩	8��6�Q<��:[�S{�͋�k��N
*F^o�M\�y��Gn��>�뺪?.��&�$��G�ا#�O��n�p�X"�y,�|:��D���
�%���ɧc�3ẛ78�HnK$��%΄�n�p�X"�y,��ęp��Id7�%�@g�u7o8px�\m&�n^�Ԫ����'�u7oxp�vs,��������n��.��7�~^GĊ	k`����l���.܉�G>��O�߮�G�I�|��5H-��@g���-:%������\	?�A�S��C[þ�p���p����+�����R%�?K3�zO���a׊�ӗ\��!�8p���_���^\��Vg�z����:�<�	��t�Z�J8:�e�p���������K��O��bl;��'֜�|�	{z:��l�6o��9:�Z���v}�$���S�t�E���/�.���
-��vO�0�m;��t�-��t=<������tf��&�e�_�M��
+ٮv��H���z��؎D��<d��=Ɍ��tDnW�c�
"C
YXjۄ"�����[��9l��G�b�$2�	���1��,�Pš1�H	�H"�@�J`g�I	$&%b�Dx�*p��(%��c6J	�X"�@�J$�g%��J���<";�vU(�y/HW�5��1	�! �n�t���z�nD7-Y��)����Dx�s����z`z�p�b�~?>d�1�F]Lx���A�2������"�	O�A����ꆏ`K?�8.�i�C@;`5h�@D��=��ј�qF(�o΀�R�ؠAx�Ì��<~1�ű����A
���˜�"�U�4 �\�)���
�!!�	U�	O�A��V��r$Sj���%F��b�u�D��ժ���3&�������C �7a�gdP-�ϩ�ز��88�]jh8���jpO�'� \S���c��^S���0�zH��y/O�A�
�#���Vé�%������IU�݆}Ɗ����fo�򳼩� ޸o}����tƖ�o�ǀ�������7���K��O��m4rƓ	���x�ME���ͯ�u�77�	*ո�LDD�'��R��W5ދxU=G.��u _U�{~US"�&�R��U�6�ū�@ū�e=M�*��._���xUvJ�'l�^(�+�b��*�
g�ee�z0��
-����ma��-N��85&y���5]�1�@"�zN�b0B��?���6������T�/[uO���P�v$�^�U`16�^>s8[�sn�:��C'Q���V����ɂ;��+$���![:�ڌO��!J|A'���W�l���u��E�X0���
-�W��T�-JLRo��ٚ��U�y���b�+Uq�v+W�+�X����CF��5�KM'ZB��Y8\e*q��$k�GZk���1��{�.UE���˗�#�����Q��o�^=�;F�y�y�^fm�O��X�@�T�����0��I����E�Ϗ/�h<�ѭ��z�oQ/����R�*�?�u�6���Wwc�HmG�!�ұܺ�(�����NK��V]N>J�.UPk����*���Dֶ�…٫�)��6���8a�sө;Lu��h:��Uߓ��wp0�6������c�ى۪JO9�k�S�e!-wy��7��ˈ�'���i�^�'r>�ѫUIa���e�آײ�ZC�R{հ��ix��R�8������Qg�p��ǷiM�ُ^�4���v�%�w.}���q�׎-��ᓑ�����ì��&�[��>Z����������hָVR'�`���G9a�W��#fA��Q��Q�Ӿ
-�O��-ݰ%U�5}]�P�?��W#�7�ת���3[�����k3ݲ��17��}���G;�NH����qz+��Q=�������3��D�� [y�g��D�ͳU?�C��6�o�j׻����6�]G��r��7��� ��^��>��Cʱǩ�
ހ��N��Ҡ�lޏ4|_l*"|�j�8 q@�����!�
-��
-F����nDE���!�]R�ݐ����sj�+��P7��#�=s�hy�UND̦��M���D<0
-~6�0�ai�q��iZZ�']Cx�Ңh���\ny=�~�iH�Ay΅�w̞��4��W�l4��*���m��߿���g�~�ݣQ������?�����3�I
-�!�r���F���z@	a�S�=$�	4��5J2-���9�ŷ֪Qԡ/<3�
--o7��*f&f��i�Nff���ș�13q��jf�.m�Y_j{��]vw��6
C��TKRȮ���bj��=��֣���O�C��a)T�7��!w�;e3'z�uu��,\J1�gJf�,wئ
A�ȥ��@/ݜB����K�ڃZ����
ۘ���}YOz�+���RL}+�tЋ��N�q�.,O:�"'��UN��:
�ENB��8����҉�9�N/r��r5�	z���2��"M�ԡ9I�^�Q��Nz����EN�r��٢��I����5�dվ�t{�H'����z�
m�t����������eN'_�O>�D��D|>%?�P���U����ϧЉ!��ݚ�e�
-�9�]�X)��}��0Il���R�g��_t�6��M7M>�+O�0�9�~ʹa���s���]~NlH��zβ��o8��O��3y�)�����o�-u�9�vP/?g���4jͱ��o��{����{�1^+����x�o9һ��#}�A��qk��c��o>曾���4G���c�Ϸ\�}�A����z��i׿�g^B����n�?�Py3]�ux���/�����G7�z|�􊟅W:��n����;��5��g�]�9��G���l�!�1��#U���Q�h�WT=�=�����˹9�]Ո[Qq�lE)@˼���}+�����bGvU#FlE���-�g���pkE���F�؊��e+J
Z�U�8�[Ͻ;i��*6ذ	%����j��ٷ^�ݼ@��ȮbĈ
�8]���e^Q��Ӿ�LO=tBV�ȮjĈ��8]���e^Q���V����bC�U��%��V��+��qڷ"��Ɋ�WЭ�8]����ָb�}��n-��8]�>��f��BLk�ڄe���l��ѨҜ��*%@˼����Qe���
�bGvU#FlE���-�g����i���;��1b+*N��(h�WT=�oňG���v ��#���tيR��yE�3N�VLx�I�V�ȮjĈ��8]���e^Q��Ӿ��X3Y�#��#���tيR��yE�3N/X�dL�K+6d[��HXQr�nE!@˼���}+�NF��U����V���+��qڶ"�+�GuP���tՊ����G���(d�t!
-q���f��Q��p~)cہ욃�R�.�*)@˼����Ql�\]X�#��#���tيR��yE�3N�V�!�{�Ȋ�U����V���+��qڷ"޵��v ��#���tيR��yE�3N�V�^M���'Hc��c�-G�����{�o�bM���֑]���Mq�l9)@˼�����W�(#V`[��F�P�nAf�^P�϶�j�����@��#2��tՂJ��yE�3N/X�������+�z��V��G^��2�C�eL�.D;O�e�W���
��	_�8?����}�൸�<�gl�[q8/�L�pz2֟N�|=�Z�3���B��es�b�Y��Z���$������`�R�
-�Qb��m����E^����U���@o鮄�^��AmT���v>�(���2��
-1LV�w3!���0BL��#��'^
����0ڸ�jF�.�ޫхW�Ä���+�񱰣K �A>]��hP1B��xzŰ��Ķ��EH�^��5O<ὸy�&B���-���'+��Q��/OА�[��J�R�M7��Spw���:̄�1�IIذ�*�uFhh&\���hTcּco�)��jY�8�4����x��`ﵶr��D�,�
-�-0�����KHӭ�ˇ�7	�K��4%�z�1CO�������D��4B2�*J�'�e�xmzvJ"vE�N���1i'h"\�(N�
��]@��5�L�D�,��U�ƈ�I�Oġ��L�,/¨�z�D��Y�Z橡�pYb
-G{e,o&�	v��4.K���I����p�A�aX�	��%��u]b��� �[U�	�W%cjᙔhB�FI9`X
̈́�-�K�F�pi&��r��D�,?yx�����FI�AV#ٲ<�:�Iy�Zk�W��{O�D�,Q�W�7�$%��,j�>.KL�vX��z�i�`7����pY"�w5K��oz�d��;��[��߼��T��A�M"���D�*���i�o����7�k`"[�G�˳�����l]E-�"V��d� E�.�B"xI=怘����7ʆ?�;A�n]�[8Lj���x12B0(Z�#�0
�l]Es��R(�<eiE٠@���Kh"[�G�b��T!pݐ}�@4���c� M�.��q���nn���{E���E�i�4�D
-t���v�;A��h{�6!��֥Q�=G��A\�U#��m�
��������uU��
�1���=.��孋�J或IN�pf%�~�2�bG���p”_��I�*x��e���9F�R+!�Uz�a�/��K%��X9;�s-���U�X2�U�8YŶ�(�*����Ubk� �{��&��dl�FnX�D�+[%׾~��M�~"�Dȅt�H$a�^[T��C2�d����x&\O7�LK�|K�%8ӭ�F&�R��Rr�%΄�)��)��)��g��|�H&�Ėobq�\bq3�z�id�X�X"%�X�L��o�$�H	'�8�K,p�[H�$�	'���%�8���F*�%R‰%Rv�$>�'�F*�%R‰%Rv�%΄�	��Jb��pb��]b�3�D�%�D�8�đ^b�3�z�k�X e�X ��X�L��q�$�H'�H�%�8�g�F.�%RƉ%Rz�%΄���K"��qb��^b�3�r\M�$�H'���%��D��q�$�H'�H�%�8�g�z2���ˣ�˛��N#���(��)��g�e��Jb��pb��]b�3�z�k��X"%�X"e�X�L��p�$�H'�8�K,p�[�8�\	���K�	���K�F��8q�@�&���V�%1ޓH7����B�ZODɦ�G: ��Ie�:$lD�CM��m�$�٤�M�a��\9'|f�FfGd�d��kl;98��K����W��6u@�{��a"��6�<�aFk�65H�/�֥�p#�4�H0��mj�
-W��7�M�F�X�e�i@*�*M�.md�<�^��6u@��S�92�md�z)c\��M�Q<8=1~�٦7�v�B��(F�j�bS\�g�<��=:~Y��"v��j���6U�tS��E�9�\K�GP�7�T[w��"u%%�K�T����&��rq2����{�e�2%����ű5}��1�i�1]́jc�QS&��G2����!E�&�!�c�R��:�9s������_/���ޒo�k�wz��̄'�����Jw��ԁ 8螑]
��P�*��B�J�X �@�J��0�,��ùP� �H�'Ю�Q)Ӂ	Y�A,�O�]%����D*8���D"<�v���>Y逽������3�+��^�������y1����T"�
VY!���*%"�Lx�*a��V�"�-|O[>�� �%�	����g`I	`�·T� �H�'Юb90G����a ,��N�]�a�j}��mGa�P� 8螑]
pG��1�R�vC�X �@�J�
G!�P"�Z!� �%�	��D�eX�L�ᚫ�+C,�O�M%�Q�����=�'B���U��(�"��Kb�������2�մ(�\ŋ!H�'Ю�ǩ1Y���2����U�jF=&#��^-w�D"<�v�H=&SH�|�J����U"���F��(	:��3��A�e8�Q	Aּ�2����Tا�6���8.�=�{i�@D���,�Ol�9����B�H#
H8����ִdž�'�\2�:-P�E��Ϡ{F�l9c	�8@Y���S,N��;�Ix
��$f���󘑧�c)#��^ZB�'� \�m�Rc�3��J:x6��CB0C�k�@�p9�n0JkS
�`e�!���~H�gd�-g@]��p���63J�>4�!!�F5�@�p9)��K�r�q�9`�&Z:��C_�"��!��L)���s5w���ں;�������d˥zx�I��o��.�v�^��S��0Dx
�U%��6��Xǃ�)�r�=���%��	D��J_�z&@<�j��	m��C@XYWz���@D��e�O�g���Q��U�9ւA�e�}Xp��a�GodYa��SE$��M�ƍm��hu>Xc��ڿ<69�z��2eZ��Xv 3�
֙��C��:�ڛ�VgA��%�G��`@���6��B(��+	�8��M�׋d�(y4��^\xr5�7�7(^jOx�T�V��MUQ�*�i�}�����
3"�SԵ���Naݵez��K�4�;�S����x�/�Y�Ӑ{F�ީ�#�O�Դ�H/��
|�Z?�:����m��	�3��]��ξ[�
����ݒ����>�F!|�rC?����
��C�sy[:Q�)�Dǜ�4oB^1QkNMρo)�u�����R	�H�:�H1l�ĕ������)�$�I�������׬���	���P}����*q�+��筷T�!�-R	k�����
-YR�NdoiTpCP]��0��ࢄv�$�l��q�2�
��$�n�9QdK:��-�,�A�d��q��Q�K:��-��/}��t��ݷ�
Q�K*���-�|�SG��T���J^R���oiJ���Q��^��K}I%>\�����˛S��5�*q-0�ħϷT�ʗ��w�f|s�0���ӷt*���
-re4��J\NL*�
��Ju��7�@h�S�;:��㡓8⾥�Ŏ�j��^�cK�$�N|~K'�W@)��2���-�N|P~K'NRVӮ���vxEe3��1֖N
��4N��M���Z�2�>ۣe-D�:��K��qٓ7�������q��h��n��|���Q��(��Y��0	˱��Q<mr��!.��z�`���I����F�KS��8Qu5m�p�
+�z�ˣ3⭸ڶ����nŨ�����Cʼn����{�b�����W(���'J)�&]���^�*#fO�vA�����������<�uܽ�%BZw��ȍ,r�{Bo�5 �~~Yn}p�1�̙�V���f�H�,rc�0����<xk��5�0�m{��
-��Vf��8QRɕ~a-A9Aи>��Q�G.�m���jJO-rY���&�.w/�:���dX�*WٱE>#��l	Ŝ�˃���Μ�ke��ܔ�[�ԓzXܗn	��[�d&N������Gvp��|$�4�׸wȕt_������\d�^?�X����V��j��V�~5�񦴂��F��]�3��>��Ĺ��6�R�W�P*�x��{��.rI]��a�l\�����ĩ`�R/ʦ��"��T.���9�v��8%p�b�E��3�Pnz��㸐���o\�n@���Lx���թ�>c�>���'���F�d�_��?�������h�������%�XMs��`Yc[������a<hc�E~
C.c�n�I#xf�������+"}��b<���G�a�!�
ɰ"���(����Sl�	#^㾀�
��[��g��T�P�����?�Ç~#��F����Q2�%
��ж+�;b�H�����s�'P�{<qjo��Pap��L�Ӏ[y�g-��D�Ήi?�c��:�������A�̀v�kw����?�"���?��~������4���c��&���o�ś�	yR�W���b �����b
 ~�
�ִ䊯�$��k:|`��_��?��o���Zze��-��vhO�֏s|�)
��>n1�F�c�*�Dȃ#��7!k��δ--�i��m�׵{�W�-*Ϭ]� ��P��|��q�#�����

�O����	~q��&3�n�ye��LL�JK�4l������Q���S#��G�&f��,��qQs�~�ULL�="��ɉ	�a���O����i����f�6&��%l��LL,�7jbvDL�J�&&!�O�T�k�3l�ԴŬ�a�!�#�
-�!O "�*�*�y�Tx�)�op��_BD�5�UP)����M����E:����肜�Ṛs��zs̠b�ƱH�]+������{l@9��L�	8�Pm��O�+�I�[0RL"Xl
-O��Yh�%����w����/"�C�~�9���h
-��q�J}���������_��2
4�����
y�endstream
+x���ˮe�m :ϯ8C�@�^�x`5O�Z���_���ƮXp��x�{�Ɉ�NeV^�Q���GpŃd0��x;�������돟����ۿ����t<�a��o6��0�[����mL�ÿ����z�?��[���\���3�?�����f�O�������|2�h���d���?|�.{��}�g�H����>��o��l��}�sz����d��0�H�z��y~�������oM���o�x�	D<��(��Q"�eB�2��ϡ�r��t���&��h��ay.�)�x8��r����%�LB��r��t��^D?���2B�Kt^W��*�5�-*$��mt�tdO��tX��̣H5Ȧ@7��g?���gڿ�����'�]i�H�R>^
���%:=i�}�)`���'Sm�������7;*��G<�	o�
,�,���
ԔC�_Vpz�Ï�~�~������������7���o9�+��`��� ay�?i�
�=�����6D5ļ>���26����q{�	��2
r�;�c��
�}���0��n�fY�O[
[C|�,�=�P��M�l|Ǔ�Ձ#���s̺���S��k���W�����/e�$�+�y���
��֙a��f��w�!�{�����J����܅T`z���Pm��$R�n�"A^3�.���k8<b�
+�M+��5�{
+��5��b���W�	��S��ڔ����
+�5��b���W �fZ��)b*B7(�k���<�sA��6�Y(��v%��%��
+d��u1��\P`
��i6Юd��P�$tW�L^3�.��}:��W�k���T'�ړdn*��+n�E<�rAq
~�O�ڕk����*��k���<�sA�#�)x7*J
+���*��o�(������D�7��#�:vߙp����Me!�L����$�k���<��?��7��;hS2"�
+T�n*P����yFg_�	��d�uЦdD���T� �^��F?/�ڕl
+���*��k���<������d�tЦdD���T� �^��z8��V`�J6	JBw��5��b�ѹ���V�t�+� $(	�U ����yFg_�刏�O�ڽ��X���M
+��u1��\P�HH
+���@
+���*��$`�Q�p*n6�
+M�S���iѫ�yf߫�G)�Q<@�WyD�f�&to6I��u1��l�&oJz���A��!V�"tS���fx]�3:�
+�1N6�mJF�X���M
+��u1���+��c^��)b*B7(�k���<�sA����I�
�+� $(	�U ����yFg_���c�(v�n>� �
+T�n*P����yF�Ao&k6Юd��P�$tW�L^3�.��
+����]�!�@I���fx]�3:H9�����ɤ@��|O�_6����Wq_��UL�nx%�aϫ8.8����m��/_�ZyрA����aϗc�O���9��?��OE�ё��
+���wY"g���Hj�k#̐
+��or�F��4�9��{�	6�:�xG�yLH�.
P�٠&���^7��W@����[N>�k��g�
r��t��}�i�`*�i����
JI��9|(F��BVC�>Ʒ[#�(�SH�P�$�s�?���m���rE{���^(�!��ל�O�Y���hFDV�V��$��1!J�
8&��xA\��L:|��R,�,���?�K
+4#�rL���j�IՀp,^i�q�c�m�5�KT�6���U��9E�X�{�Þ�+=��24��&�`hؘ��h��
��9�>B
p��
�qd
���.�Y��&���*�Ԓ��1kЄ�̱o�!<в4�%u\L��z3�H˜h{�/@� s����c��MW� ��̍�n؁�m&>n����*���tE�4�2?>����`+�e&�C��^�ұ��1�9�I�gL;��!�y
+4!.s�S͠����8L��_����T�&�e�|h¢�U�ŗǁ�[����M���b��EkN�4���i\�j���ګ��@�z��W&�60��M�����1e�"��Q=n�CoYp�+ �I=)��,����`P|��I^)���ˤ������l
+K�6�B���d��Y�[3o�Y7,^V<n��~�q٬c�mpfݠ�6q|A\6��`�Y7h�
G_��:6�Ga�
Zl���e��
��Q�u��p��q٬c�mpd�n�b��୛ud�
�¬#�6����n֑����ʬk�݄c�*3޺YG[r�Y�@r7��7~�jՑ�J���]�^YLNm鍟��vd���v�l�����4��j��Zl�5����(�Q[{�G��Ym�+m�U�:Dl����uӎ��d��`Ӯ����A�6�ƏV-�a��K�)ˮ��
�1Ee�яV
�a�YpW�
+v��W0��E������v�Ѽ92�`ni�&t���{�jF�y��3��n!�W-`�5���`��A0�`����`�TDk��
+��ߝTZҊ���BK��z�Y�L���Yg��aH�Ň��q���_����¤�شKzsƄ���c4W=|a4v��p6X/�F�\6ص�@�#���
���"Z�#	�D��v$��"8�-GF<
m
+�7��BD���KZ"��x���Ws��H�w��D��)���H20,�HR"���
+ٔ��Ԭ�%E�AĐO@�B�0���Z�ѵ}�C����kB;
ުՊ��"� `TY�Ȯd��@\�d
:7�u�ĺ�7v�S�b�	F<

�U�֠�S�ۍ�q����� �8�4Wm^S�( �iV�
�.v�d�)A�g�
+��@\5�M?]9��|;q�)Ap�/Ĉ'���l�v�mK���>ng�=%(�����'���l3��ߴ	�Gp�H7m6��A�]��	hg*d�U]u��>3�)A��lǚ�>P�-�jπ�.s��[٠yJ�5�Β�^!k��=L��`2�܇�14=%���Hx����(�1�X>=J��љwy
+�a��.�N@��-�m尚�ub���u�����������0��m��6�[����l�l���b[tdn�-��l��
{�[0����{<��,���?l�����s��u��P
u_�b@|}^���G��%\�z��RO�#\���wџʹ�S�K�|�Cԧ:�����ŧ��0�O�z|�?U�'��T����S���ӧ2�ʒ���5)>Ui��
+̒2}����*���?�˦�p�S��7�!�{Y�b@�	/k@`7r-����
�^��
O�{''��)��S�d߷�W̮d�Y�
�)K�^���+���w�D�ƆH�J��Ǚ�<Ey�%��D	v#��wK8��v���$�"�-`C�"�x����/b��K!�+4���
�U��фm<�.�W��Ƶ�c��NEdž�б�OY�
ǍW�݁��"'wν4�Ge�I��-�C�E��t���#��oݛ�*%��sW\;	�Zw��zUa�©���,9㎩@p~�W�����aUo3�C�_;�.-��
��W��\TtPV��=ڄg�^Fx�E�o��/��u���mo���ʚ�3$���-;�-ۢ�N�.ah�gd:���`\�Wm3�o���ζ��
��$�)l�����3źFd��4�3 �>S����5�E��Vr��h(�O� �����b<����V}ʈ��m+}��l�g�v����ރvS���	S����F��N�2�cbˏ2j�>��Z��ꪰ�Fg���澲�b�k�~�� ����u���%2���e���-��a�a˶:�@����F���v]�@���M� R�L�W@�/���p�(��
��
+g���ôI�;ugA S����yJ���ܩ���Q:jS���L��a�����չZ���
*w`Vf���)���;~�R��:Y�2�Ã����<XZlj����{B}��^���uK���h6�q2�橗7��卞�`����a�4G��Â��kl0�t�9��p��V�O9L;�I;�?_� ��J�}З�=�����x��e�-
�D�B/X'Ыn���>\���vuǩ{'����s]����߾��8���������M��F�ƪǍ��S��E�A�
��E�^�!C�'J
+�Ť�N5,���1�xI}���4�S�{���������_����~V�~>���>�X�I볁X����̡oU3�=����0�[�ad%�,oh����	�k��V�'Xמ��Dy�����
"x�#�[\}���-�W����̚�V_���9�m��>������C���z�5�HX���x]���r���M^jǸ�}A���=m[x�����gKqՍ���!_q�Yt��^���g�#
Z�
t���Qj��Z��g���
b����s��kʕ���$-�AO	r��Nb�{��������9`y|sK񰭞��<
�#�rz�췰s��lc}v��bzm���k�
L�.$,�ܐ7�+N-/�9�~�wզ�	`�~�!��t�=:8�5]�S�e+�3��?|r
T�k�O?ٜ9��NJ)�7
+�Y�%�`�*&���M��w=�.�_TÍ'���|�%��T�`dz�%j�	�ܩ6ͷ�/�Bi�]�B��*e����L�(�#��;!�.Rb��R
+��r)�]�$d�F)�<ԧ�ktX��t����٪ۢ$D�F�d͝,���ۣD2��i,^R�M�nS:�Q~�o'�%�-��I�e��m��7W���P����\��sVm2��fզlM�ݪ�2S�b��;�{�L��g��Q�T��Q��Z/��{�|���;N,�v��)�Y�G��ɿ9�wO�ۣ��r �F��5ښ��{���1t��/i��!�w��
��C��0�B.�07���^rMҸ�̯M�>�/�$�e�,�?��%1>@����)]��}�O�1���'��Q��9�8�'�åV�tn��d�xk��4�]C�(�4ӔnO3�afz]�sJ��̙���
�c��F�X���}=2���uY�)��Ѧ�ҷX��+Qb=*J���f��e=���G
+>�z�]و�QQ��G�03�.�9�}=��[ӆX�
�+٠�J�t���O/�yJ�����
+l�m�%�BI�tHf��e=���ǀ��D�]و�QQ��G�03�.�9�z��ev=6жl��У��
z$3�벞S��#�-Y����GE��\����{�
z���D�{RkZƼ힠C�Bsk�>kK��!`�P9�:hW=D����t�1���uY�)mO3Ln����M��QS��G�afz]�sJ�z4��Sz�]و�QQ��G�03�.�9�z̶�zl�m�%�GI��Hf��e=���G|�v(�p�ve#J�GE�������������Qz�]و�QQ��G�03�.�9�zG{:+��@۲
JB����8�L��zN�K�.���@۲
JB����8�L��zNi_��y��vN�qʉ���/��qI��M�=v7e�t�M��C'��>祔�L��_������l�Dk)7S�{����
�)��n�J*5�ҫf\goG�Cl��H:K���<�&�P�.U�X�#����V�W�|׏
/��3\���=�߸Ѳ����!�P���k����#1���<9��	�W������!9��bb���C����;_�P��6L}p���j(G�'A\9|+�=�2R�������?��G�ꄥjL�z�{}M����{�tE��EM|!ol�)@��9�Pʒ����$�%PZQ_M��q�l�~�����fE޵7�
+4!.s�����+���ceD�p�[f(r�C<�RR��(�z��9�V���ao�C�S��V�DRX˼R<���d��m��Z�>g�e�9VwBrĒ,V���15d�[fX�#FK���<V���Έ�e��x�y`;P5�p���M��y�'�&�������T^�&�e�t��=����}��2
+Bg
�x����jg0�ʠ�R;n�خu$hB\�H��X�9�5����pXǴU_cЄ�̑�]|ٞ����9pV���0O�4!.s$��u�EX/��5���1�*�������j���[��+p��fb�$�A�2Gap��hM�>��t�C�%��	CU,�6���lA;&��{`B�\|�W��r}��-h�Y9��?�A!���!B��I+�^�����H��I)UP�sVn2�]j�
+\+()T�G��"UP���:Ȣ��OYȰ�^Y�
k�=a!䆅L���.���M�r����sF��W�2پđ-d���0q��-d�}�#[�đ�a�8#�[�d�G���#���qF\����K�@&�l�	o�@&ӗ��L�&�3⺁L�/qd�8v����X�62Y�Ďmdb�1q��m�a�C6��!��p�[7���%�l"C���ጸn"��;8
+y�������n"����k��Ա��@����U��_��k���H�J��MV��Ѫ�L��1�1��|�bL����Q���W�6�~�5�Wg��T�	�8e6ӯVmd�~m=���l_�l<z'�y�j�Ff��t?@ɦY�l�Ly2�͖0�_8X}��OF�)�v����q�H&p��U륒��!ʜ��Fe:ӯ��G�c,ڏAil<Ziu����Y�
4!~����ƪ�Sa��@-�[����ݢ9ifcu��yj˔���T�_7��&����Xa��:���ez�Xi��!�;V%ϓƒb�i���j��{)��N����������J3	�S��i"O@qՆ�΅N	a�,OB0�82�	hS����F�+I
+� �Ȉ'�M!\��������*!D��)D��I!�7��s�AđO@�B�ܯd����#@Đ�^!�D�������� bȈ'�M!�P<�"�'V�`qd�Ц9���"����IGF<
m
+Q��zi`c\�g��##������I�	p9��-
"�O@�B�0zc�����lq��ڈ�I8��Ʋ7R�<r֯BP�hyi%�ȸn0�	h �z(q�?���N��P�ÃA���x��NKt�^ǵ�Y>�Z��l`���2�V]8F�Z��~4zJت&�W�@[viR��,8~�"��(f
zJ�ӃO@q��IGK�1Ǹ_I-�L��ٴ.@�x"�U�
b��\���&���AO	"�O@eϧ-��Z�Ԗ��:��?@O
�d�T�ˁ�
+!�o�;a���@���D(
+[�Lw�v�ɣ���!{�c7}=x<&�
+z�ڡ�#�1
+|�o�?aC��&›�5�?��5\ɮ5��~n�J|��E'�:߸��_�
+�nq�Q����P�Ɨ�R��(�I|��j�ʯr�k�*�}��
+v
i7�Ⳍ���,Q�y����.�#�����M���.0/2}���J|�Ц
�Pz��w��.���!�-n%����“���~�������ub���1)�r���y�-12�w�gK �("��.�uN�Wg2vOhK �G"��.&o�3	䰟�<|�D�0h]��[!婭���B�@Z[q[�I�ve����T$���ؘZ���)��[�����_��������U�D�؍T1[;
����Vl����t�j'��d��Զjd�r�_�i����Uo�T��f���'���Vu�H�o'g�V}�)�a�����'��
+R�z;���Z��4��W����a�h~j���[��n�
6�`c�'�2�Zz���6jº��5"ۥ���O��f��~������-]��|Ҹ��ŶKM��6s���m:��<����[����2�6��ZhU���\�}��w��Y��-Nէc�r+����oV���blQ�n�V���͓�٭�;���9�r����������\/M�a�A���{G�3� EZ�r%�rw��_v��E�UJ�X���	t��X/��\k:���`l��8u�b��pCPY�6���t��{�t�@X��e�ЬQ~PA�x�F�!���Z�D�O��ĵ%�p����[U�������
q3{o�ív�>O��sc{
*v
������G������!�9������'��b�@h�#{#�wG��ʹ
��uN����NG�W�7�>\G�,Gb��qd8k�ƴ���QZ�ȷzHǵ>g�kh��m����+���Z����;'���|�վ�K�w��<c�2�ֆ�*�
+��#%zU�ڇK����.�Ƌg8�]��F��Ϛ��
 �}Y~8<�%ȓ!�Iؖg!�
�yW"�g�J��w�<W�E<_sa����I�>Rإf�����{z�ĤC뵃d@5׻!�4B;��Q�x2�����p��sn�-,����>�����6�W�&^`�����-�W�+�����E�F��i��G|E
��(��m�7��a�^�d5b�D�r9v�X�Φ��KX���J�L����������K���ף;�H���L���--�ZL�
��c�Ѭw��%-H�� ��:Y�`��~��D,H|��\��� �7��n磫��
y
+H�2�\сvx_}��v���|��@1�?��A_}�b�;��.�����m��:Y���f>/���s''(AnI�f���v%�^��mv��qd�P������7�<�>R������o���
+Ȇ-j��?ُҦ9J4�k� �j�i�¬޸��?<@{���g����d�=_)�
+a ��W�cIcN����m��Ph�)�lj�,!�.Rb�.R�a#ѫ�D���X���|)#�t�4@)	�.R�X/+��"%!�5J����e"�EJ,�UJ��)%�]�$d�Hi�w~<ٛv��.�9ٛ^��{ۣC��o�� 4 {ݥC�l�:�dO��tN��w�ơ�l�b~��y[��'�����C$E|`�!fʑ'�|����]t>2��D�@���"�ؤݟ5�h��
�]�G
�� #���Q
r�Jxќ�����a��x�b�e}���g��|�>�?Hgj�Pr�[�c�m�=���01q��);7�hD��]#��(Kx���(7��{���8�3Lo�����IMZc�G�����L�?B�t[=��yvd:_��~��b�x���x�/�����,XM���`M��B芵aXy��W�Z�T~8L���{�����h�R߹����Q�i�����h6iB�f�$�^���lJX����hO2&D
+Ԅ�)P����yFg_�X�:��ڔ����
+�5��b���V`�72F)p��$cB�@M�%y��gt��`?��A��!V�"tS���fx]�3:�
+���v�h3�F�H���=J��u1���+��x�U
+�MɈ+P��@A^3�.��}&�����A��!V�"tS���fx]�3:�
+��5+�v|(P���/�����U��{��^��mͫ�yv߫0�;�M�y�A�h6iB�f�$�^���l2X�N��ٔk�a�I27�����"�P�W�s��x��:hS."ĺS�n*O����yF�s{�(����Kru2B{��]�q����'T���
+�R\�lJ5Ȱ�$���c��eO�\P>k�4�@�r
BBw��]�1y��gt.(�d|p��@��
BB���]2y��gt�lz(��Cv�-:֞$sSyL\q�,�	���%BswUHw��]�}�|�;
+�^�}���0��5����]���/�X	S��dj�M]2<�$��3��+n�E<��?��]�Is�)b�)B7�'�k���<�sA�9�v<��ڕl
+���*��k���<�����ʹtdS�A��'��TW�.�xB����ЦG��J���	2wG���"�P�V�=�OAy
���A�Hw��=�I��u1��\P`�e��hW�AH(P��@&�^��f�*^	6Юd��P�$tW�L^3�.��}r�.)�vV�P��V~K�_8�����p_��=L��{_R�"��dZ������h�h���l��x�x�|y%�^��Qq8����bB�)a��&�֐�bՅ*�I��n��(���0)G,��v��)�ؔ�Z�aS\�z�,P���8j�N��j��=�o^6vի����Z����p�\�R����p���zĽ>�q��yİԺ�<b ڨӈ#�3Q�"4e}�I�jK;C��O�$H����>��b�x��&��O��+nl���O->p������?�͈���{����$ǀ-��S�A��X�W9b��5G��ǀ��������1���Vq�g��)��d��U�	_��"9&�E_�"_P���e��)����"��"v�g�U��u`N(����c��f��q�c�`���f��S/���b������bhj\A{��Q� �r�M1?�f�2��9|�e�@o��xZ4�h�ҩ��>hЄ���bj�8Z���I�8=�q�cvͤc���I����=#.s���k�؊F��1z�3�2G��?#���4�}C�4����Z�a0yV��G+8%@�2G�%G�@'���M���T�J�����&�M���P1Ѷ��4!.sdK[�W�	�o4{���1�F	�������r���)U� ���.6XE�
��9��R�rL�T�p���_v�H�&�e�d$�V(��t؞��k�5S����%hB\��6��m�b�jp��̭h���F�HЌ�Ώ,\�j{
��[�(cr�f�
[����	q�#��|��ӽP�	�O��n�_��zB�&DU����^��h��C�>�o�~��Z�=��b���C�񸚄X��y4M�r�=�;�X=FR4'CћL�E�r���<�������R[�ZS��ԔkN��R{�(4?�fR�mM(��l�-T�5�틪�4#U��4HUE�9S��s��d|��>�D�jo��Ő�>#y�6~��g� � ��I�Z��$��32Gr�㌸�3�7��g$Z� ��e���A��>#�b�8� .s$o�8��H��Ad�3��H� s$��9r݅��q�g$o�8��H��A$�/��.��đ|F"�"1|�[fH� 1d��9���g�u�q����p�y���o�i� 3$��r!�8#�s� s$��9��(8N��N�p�#9�����㌸�4wPpN#s$�9Έ�N���#y��q���p�[g8�AfH^�`H�s�׽��b0���e����ebk���+��8�A�_��;H>Xx�(G�~��q8�Gn/	�iliU��}����4�;bkz%��R6��%k?r�j�i���&F��9��LB�5��q�i�`��WNc)��f���90�\���k� a�f0�mT~$�h�k� �0�Yy�$�e�P�پ �{��4X.8H��C�1�m��t#�G��J�0��`aT~I_�L}��Kc8!.s��]#~����}�PY$=	�4����7��#�|=��������K*�?����[[yyZ�u�&��Jlm��R�X�VM�p��B�mf[u,y>�WX?�����
��"��n�[����[��wg{C?V6�Zs�h���@M�J�P��v��u�����C.;���R;�M/��PFà�aԦ��c�!.���1D)D���۝ݠ� �H�'�M!���F
j�D)��##��6�@�'&%.R�"��x��-�"Yt(�b��x�"��V������ qd�ЦH�:rD�C
�AđO@�B`c��x�%� �Ȉ'�]!��*�jra06�5� �H�'�M!�|z���u�Bqd�Юh�y�9��͠g!�	��-x-���vx6$�ǁx���C�$����	��+��zV:X���`�sޝ�}��7x.*�rvz>���	h[������P�B[à��!��q9��G�I��ʾz� �� �!���`�������y6@O
�kpF<
�jT��%� ��Iy�dG���N@oU�4�5�55�
+�fzJ��1��D<

��P�	��ݨ�oId
�dlA�ե�:�	���խ�s|j�W���S�L�
�{���hF;��J�.^ԕ�����C�'�����q2x�|4!r��:@O	š��"��@\�B����J5������ _j��
+h�a	��Z�wj��/�	���÷�/O@q96k�l��Flmn>@O
�[�8O@��m�K^ۣ���"��.��?8���P!�tB0=�)P�
h|�2�bi��"��J<�x5��B�y�h'�B/N���ÛB�kΣ}�B�
��t��T��z�73W���e��7��f%?�5�4�睍�-���u��;�r��_�n�+;�*���2}e�cG�+��C|e�p�G�=%_|e�Яj�5��zAN���;��]�X��c	}{�����+cǰ��2^����0��+ rU}�{��}'�`Vy�j���|�Q(��(�kñw#Q0�fq�c0����c&���{�1~Pl�pk	�sN��
+����s!�@�L�p`G����h����nW$�%�E/vD�ౘ�D���V�)�L#�"��["��1V���RB�I�t��ۄ�`W��E*�5h����D��;"՞|����cyH�"!���E�vD*�6+���6v{��,]&�bK&83�Ծ&ףlOp��2d�';2��{������	1]$~D�%��ՖƘ�!�m�D�̐�_Y쉄ᕱ�oa�>�ay�=�@�Z��^a#c1�&���f��t�;�g�5�e��;�b����Ch����fgՄ���k���9�%GK�]����H�
�Ys�9ΰ����;�"�1�㖿���UZ��w8��H�*��[bjzn�s,-�j{��N�tK#5kgVι��	>�]%m�a�fg�\�[���|t��i�C���w/���Cv~�
+2m���曔\������
���v�c�dp!��<6��`ؤE�dwn�澖����v��=��g-�>a�z�Rj��"�bZ�x�Y5x��Ʈ��×�#�&��r��LMq���`^�['�~[/c0p������\�����~f�]:��ɮ��ۙ���ԛ���`1��`��ݚ�d��&�}�^���8_�0�n��&|�p�v�����F��%��ನ2���]�)���~
��{���F�CC�lq�[��%�=�k@��AF�qhʢ%�@p ,�Ko"��)ԁ G�X�DA����0S���ј9����vV�_�(qlf��_�9�L��x�]{��(���%
+�]V ؔݲLѵ ��6!N�����)��U��_U&
����[��O࿡���`��]�`��n��c�gy��.S�������6尹!�a��ԓG�=j`o}3��	k1�O��TҁY�)Px�r�|C4���iƾ��)�›oT:����u��s�N~o��j���Y���?��7�l�����IPToj�ˀ��&@
���ۨ����V��/��ߑb�����4[Ή��^�>P�ɡ}�D�_��ރuw"0{�bOK��𛷿}��q���W�O���?�������_`�[����A�y@��=�ZDr�7�Ot��	�D�BM��Ո��}����t�V��Ͽ��������3���W'��C��)]v�FVJ��.k�E����$H�/�0n7���p�*k8��>����
�>��X��v���1hƓ7�_vv�{s���[sG��jr�t��Zsn���Z�ů���ͩ57@�k.���Ě^s<���1�pm��b¬�RCr��H����<�������\�C�M��@w��Zs��"(<O:�k�9��s�Z�ů���R����s5����:�W\w�� �C��9|Žr��^�U��@O

++��	���20�02,�ojbI!S߱��頯�A��}x��/~�T`pjK�ׅ�ŒX���g|�,�>�ܐ7���Z^���I�U���V��@`�:'�'g`|X.No��`�`�����������f>��>�Z��23�����d�0λ�9	�9LlȪ�0���>���"qA�Z���6�#����QR��_�.S�tI��HI��]�����L�]�$d�H	���
)d����L�(�,!Ҁ\�#�����
{�h�.R"]��c�i`B�
�HI�+^�M�5ȄL�HI�+^�4o�?�m�[��L�(��'�����Q"���1Q����v���-ӈ�^��˔NN��}>�3���z�r2~��z[����ǭ��C&��||�-�ila�W�#��Y�
�|oM�F7��6������zi�5q[���G��ɷ9��L�ۣ��f��fY�;6�� ߳!�o��_�����?m��
����cx�`��z�����1�g��e�5�D�r�K�c<o��=���81g)٠ƹެ�=s|o����G�15��Qn|�w��q�g��g�TP=k��(O
��F�#L1�J*K��_��8zY6`����_�-��rd�t��%��0����~ν#�wnR�'�FM�
��S�I�)ݛT���񆠧��'U�>a��J�M٘)QS��DI~�xC�SJ�J�ݤU��uو+qjwK����񆠧����1��(%ЦlL���)�S�$?q�!�)�}%�*�R����lD��8�輥DA~�xC�SJ�J�*�u
��p"Q"%Υ0�(Q��8���Ҿ�R-��J�]و+QQ��DA~�xC�SJ�J�'iGTJ�]و+QQ��DA~�xC�SJ�J��>+����P��tS�_�����ٺ�1Q��|�.�TYs>|{�����`qu�����Q�I�)ݛT���񆠧��'U�.u8��I6�%��
+d��u!���+���ڣvd{�%֟�tS����񆠧�.(1���:�돷���Р�sW�D\��.��}�y[j�V^���5��$���c��u!��\P^�����^mK6(	�IJw��'�7=�tA��F�R�([�)۠$�()�U"��8���Ҿ�pT:l��<�N�5(��T ��yF��Fr����4ҟ�tW�_,�ɹ�ٺs1Q��\$썼z�1����O�G��d7Ȯ6�Q���	��5��B��ٟL�c��@f�uЮdD���(�T� ?q�!�)�J�i�_�h[�AI(QR��D&?q�!�)�}%b�I��dW�A�5(��T ��yF��ՖV^�l����	:w�G�5��B���V�=���r.h7��(��4�{
+��'�7=�tA����NB�
�-۠$�()�U"��8����%���@۲
JB���]%2���
AO)�+QdC%���J���o)��?0� 9 [w2&J7���{����>��.�_�,%�H��+73		�Z�̤D3����G639�6!b)|�X:��(���0�����_�Íj���E��Z���qײ���J1�0b8L��q�ǂ��UԂј�>�'2~�|�8�ח�J���VA}x.U`Z�k��$1�����B!�oNJ���k%�܊���{5��/�]/�e8�h{1 Xa1�e�!���#�6b��F���0Mk�EW�|�Ӡ	q����]�78���m	�Z�I:�&�e�X@\��c�wc4u�ǘh�[�3��Kh�l}\4hB\�X�
�ц��Z��pN
�������׻Y2y,t�5hB\���p�[�sI��Z�q���VoYq�@��o�ګ\�&�u����WF�.\�:6�У���v�:�0�^U�ǘwГwF\�(^t
�`A��mL�P��
��9&�K�3�r���|p��M���k%�DŽ�h�,IX*E{F\�XRkL�3�z�$8O�����/;�$s���z��ڪLA&�e���`X�|(y�]���>#�s̱5� ���-�$y��G=#.��>�$���|Q�$�;�M���1�]q4n>���3j�� �sl�2�K
��Y�&�e���p��FM�`M�t���a/��VFpHT1��C���F׶g�0�6y�k
m	��9z{+�葼�"{���:#�s�
+��+��ռ��GW
��9�ǜı^�)����:�A�2���.�q�L��B��	�&�u~�1¦M�_�#)>j��C��i�e~�u����aG�x��N��i��Z���X��V�����a-/ z��9��hm��r��Z�Ňo�2�B�J�&�e�쌺�A@>כ[�<k�Ѐ���=�M���������5�U��e-P�\u�$hB\�(\i�����������p<\�ޕM���S��h/�1��""vz-�<&�8�U'�o xD;%SD|%�VN"�����`��kvt��ʄ�uz⏖bfbż��vnw:�2RbI��oynŘ>���
X�%�I-���Zr�K�Z�K����Px�Ǥ�Rj�V�kV���et�ڍ:�^��f<�r9�4�I�Z+Fu� b†>u�zA\�:��q����1|�[g8J̐�N�qĘ�	o=�4J��;	�#��g��(P(1C�:1C�11�	o�߈'1C�:	�#�$N��Q�OGԉ9R��9Έ�1�Ob�ub�bb�3�:�Pb�#�$��`8�G�F<I0Q'�H!&�8#�s�$�HQ'����ㄸu�$�qD��bb�3�zhē�#E��#���㌸�qē�#E��b'���S�'	�#��)��'���'1C
+:1C��Dg�u�#�D9�$8���8!��F8IpA'��&�����q���#��#E��	q=�4�I�c�� �01�o=�4�I̐�N̑�d�o�a�'1?
+:1?
+1	�o=�4�I��:	�#��g���'1G
+:1G�01�q�#5I%�t�A`��z�i���[�Z:u��?�/�׌��qēpm夢N$��n⌷u
%�r�N��:H]�Á���	o=�4bJ=�##O"D�Y����ΐ�J���f�"��@��s�QK� �Ǟ(�L�:��@:��v�~�"�G�8�Z$HƞB����A�M��GT)��BO
��bp
�F���FH	�����O�\nX5^�α��J���*�4@ңϥG�^���ӻY<#eG�S\����p�>"��7����rZ�F�r�؛�����P>|��ߩJ�Hx���i?�u/E��Jŧ�T|��7������%�&�Z�sf����Z�y��M�}.�'� 6k}‡H�E��u�ԧ}�D)�g�^�:'�%��0E�:$��QF�r=��͜2x�����&��o� R4�Bm5�vs�R�;-CF<
m
#�A	��SF�b��8O@�B���ҏX�L�5	1@̑O@�BXlk��֓�=� s$�ж�=RMK�0P�d�o���vEp>�t7!�WN2s$�Юh����n�^�bs$�ж�B�$D!睄 �q ��v�@�%ʑ
��f��#!�����1%D���!$8�Ю,=%b&��d f8�^!�$K��!B�#0$fGh'�mr@�Q���ѳ�H	���+�Io�x{g�~M �H�'�]!��zaG
�!��#!����H�f@P��	1@�c�-�ZQ��PGx8"E:)��8�^!���Z���U�Zd�	hW�ɀ�<B,D~��	��+���d���n��b��x�"S�~�wmN�b��8O@�B8c�Z�4�ѳ�	��+�7�h@���]H!�	��-D"�
[�X��Y
� �諿F�' B\O�%��n$���[
� �| �!�l���B���͏���B<
�ѫG�5�y�����1ˣq����"�����P-}^��ݢ�
�� �d޳�:�+d��JPF�*�M�"��%�S@l��h'��������[����a�S�bx��~D�'����������h�z�2�)A��V���'���!m�I�� 1�x����S���cߌx��QL�L0~��1��o=%�j�P*!���j�Q�]�a�R��SB�}i
�WH�Ze��+.���;��F[� LZL2�^!��(���a�:e8N�hCM�$�S��+�*!���ۊ/��������7�ft���DP~�p��x�T��=��tl�ꬉPk�Oj�����ɶ-�Xk������!F��F�b�)�v�ñֈ�~u�:�4�W#�j0,Rc�����;��}/Ŧ�m"y�v���˷B�|+O�O~�����#yU|Q�N�'���I�*��'�-#S�0}Q�;���ezW��,�:�3%������N|�0����~���P/��� ^}QLB���D�#�Ƞ{��!�n��!�����?n�.R�U^�njy�Y��+�Z�ǣ-c���
&�~e���eo��d;��ns�ZLIؕ��T�H�:zK"jN���o����$��ޒɶ�)e��-���2�u��O��dJ�rH&g�����8�d�G�[29��tJ������8_v�į��D��џ�L�5W)qF퐉�q��F�ӋΗ����N$ݒL��{K���IQɄ	�{���"�[�=���Y5�`����HI�������L┵L`���P���$�'ߒ)���N�Ѐ�_v"�w��/��d��gS��:�L"ѓ�-���=��2�՜��?<d�W�[2�F��1�+�k�R��!�kߓ	�C}�p���9�d���8"�n1z�п��L2K��$�����TK06���HI�1�����L�z�eW���v2ՙd���[2Ykz���ջ
+ǟs�%C�G�~;�k�jk�`[�����"�/0�õ�Ζ�}h�Fd����F���f�E�5FnmwO�(qB��ɨ����"%�
j��p�k:����s��S���T��=��%��5
+�7^/9����A_�D~=xɩ&��J݋_����e�w�/��{��<X��������Z�4���%h�
��_����S�#n41֐�C�}���#D�F��4y�ﰭ�O�d}*Ң1�r$�/94k��ծ��A�h�Y���W"��zYR���
��+N�4�4	��4���!��cQ5k�Vesxj�E�����nyc�%j���k�PUMѱ5:Ss�k�A��u
a����z,�^��^�|���(QT��r
�B��(.�J�``�M728�F�b�`����A�����{�ġ�z��ڗ���%
+j��T |@�:'#6��c��&��
#<�F���ɷG92rn7��Y8��`l��)�[R|v��u�k�.d����,>wq
���}M
+/Q��2ބT}$�9��P'�gZ���^�Dam[_cJZ�fYK�g�J�p�ZNe
+��҈�;8�J��>@`uY�@^C��߬����Q�[����ԏ��TR_s�#�h3,S,)�����k
+����g�7xqhp��Ӝ�
+4��P1�O��1���_!��0��F?a�����z��Q�bCt`;aH�װ�{�I��*Ep����O?�ͧV�z\!N�
+����ᇍ��yÿg�Gڃw8�r9���D�}�c�u'��	����y�O�[���A�L��b��(9�ʾ��m�E8��&Eq>�%��߼���M���w�����i)��������c-66 O�`�|6=��or1��D�G{v�]*�Ӱ���"�C��M���Q�h�n��Ͽ���������*��7��iK�N����
3�L|��Zc��Ya� O��O����Ő�g]g�©�!Y,���q�6�`Rع5��-;	�x*M�+̒�
�kh��oqb$���<_:��AL׃�sV�7��Õ"5�!�0�z���x�E���$�C�.���"O����[�\
���}��l��SĆ�ͭ?���=�j�t��]��Ƙ��v��X���`:��%1�8 �v�j˲c1��"ĂI����a�y�9��
+f=�F���x"į�0C����|2,�olakɪ�9@_wa���/����xW�R���0��f�+��a����XŴ^8,�ܑ��z�.�=�ip��]�t�Χw�x@�`ĮH?��l3��I���x����ӳ���(��,2}�x|�����=�����o����d�0�9o�]Y,��՟>��_�/
+��9�m¡�?����=��0]󛅉��-�_�KGNb>��O�"�;�endstream
 endobj
 6 0 obj
-20145
+20293
 endobj
 4 0 obj
-<</Type/Page/MediaBox [0 0 1168 944]
-/Parent 3 0 R
+<</Type/Page/MediaBox [0 0 612 792]
+/Rotate 0/Parent 3 0 R
 /Resources<</ProcSet[/PDF /Text]
-/ExtGState 12 0 R
-/Font 13 0 R
+/ExtGState 10 0 R
+/Font 11 0 R
 >>
 /Contents 5 0 R
 >>
@@ -90,108 +106,46 @@
 endobj
 1 0 obj
 <</Type /Catalog /Pages 3 0 R
-/Metadata 17 0 R
+/Metadata 13 0 R
 >>
 endobj
 7 0 obj
 <</Type/ExtGState
 /OPM 1>>endobj
-12 0 obj
+10 0 obj
 <</R7
 7 0 R>>
 endobj
-13 0 obj
-<</R8
-8 0 R/R10
-10 0 R>>
+11 0 obj
+<</R9
+9 0 R/R8
+8 0 R>>
+endobj
+9 0 obj
+<</BaseFont/Times-Roman/Type/Font
+/Subtype/Type1>>
 endobj
 8 0 obj
-<</BaseFont/LHVNBR+Helvetica/FontDescriptor 9 0 R/Type/Font
-/FirstChar 32/LastChar 116/Widths[
-278 0 0 0 0 0 0 0 333 333 0 0 0 584 278 0
-556 556 556 556 556 556 556 556 556 556 0 0 0 584 0 0
-0 667 667 0 0 667 0 778 0 0 0 0 556 0 722 0
-0 0 722 667 611 0 0 944 0 0 0 0 0 0 0 0
-0 556 0 0 556 556 0 0 0 222 0 0 0 833 0 0
-0 0 0 500 278]
-/Encoding 16 0 R/Subtype/Type1>>
+<</BaseFont/Helvetica/Type/Font
+/Encoding 12 0 R/Subtype/Type1>>
 endobj
-16 0 obj
-<</Type/Encoding/BaseEncoding/WinAnsiEncoding/Differences[
+12 0 obj
+<</Type/Encoding/Differences[
 45/minus]>>
 endobj
-10 0 obj
-<</BaseFont/NUVIKR+Times-Roman/FontDescriptor 11 0 R/Type/Font
-/FirstChar 32/LastChar 100/Widths[
-250 0 0 0 0 0 0 0 0 333 0 0 0 0 0 0
-500 500 500 0 0 0 0 500 500 500 0 0 0 0 0 0
-0 0 0 667 0 0 0 0 0 0 0 0 0 889 0 0
-0 0 0 556 0 0 0 0 0 0 0 0 0 0 0 0
-0 444 500 444 500]
-/Encoding/WinAnsiEncoding/Subtype/Type1>>
-endobj
-9 0 obj
-<</Type/FontDescriptor/FontName/LHVNBR+Helvetica/FontBBox[0 -212 929 741]/Flags 4
-/Ascent 741
-/CapHeight 741
-/Descent -212
-/ItalicAngle 0
-/StemV 139
-/MissingWidth 278
-/CharSet(/A/B/E/G/L/N/R/S/T/W/a/d/e/eight/equal/five/four/i/m/minus/nine/one/parenleft/parenright/period/s/seven/six/space/t/three/two/zero)/FontFile3 14 0 R>>
-endobj
-14 0 obj
-<</Filter/FlateDecode
-/Subtype/Type1C/Length 2699>>stream
-x�UVT��2ӚtDA�(�� �UТ�*(,E$��GEk��ʅ��Z��*�� ?����*bA	���T��j߹�o�A^�[o��ɽ3瞻Ϲ{�e3���x�C��\�&-9ip�yx�0<��H��>�
��T��'#��ٔ��\=���;��.�������ܐ�����;/��������;������y"_��NKI�O��JUF�Z�����U��dy�jCfj�<I�P*��$�����i���̌\���)rOww�i��'2M�:'[���-�G)SrTIY�w���	��C4I�HeTZ�Ru�������Y�
�Ӧ��{P�Dʉ�D-���e�<jDM��)/*��|�Hj%�ޣXj4eO�1�Xʁ�R��qj8�5�S�FR4�O5sT����
�0���O�ߵ�I�1h�j�A���Mt�p�p�p��4��f�׶�mm�l+loC%�Y��R��aw-�C��d^���Z@�hR�F-���
|�cI

v�'\���z(Ћ;��i�4�K^w�=}]>RS[uFۈ�#cr�[#�w+O_iw@Myu����!���fr��6�ۿ�?��_���b�j}^V~��X.(�<fa7�	/��[�f3��G5�֥8�ԏ��hr��[W"f�zج��n��Z���A�'�`3v�Ӓ~k�5�r#l�G��NMv����S�a[�g�Od$���?|�o��U�t�?m.�Eʱ��k�T�͕n9���gՌ���lY�cz��%�s�N�w$�`�QT=�ҹʖ{U�K��"��v��^|��p�Wo/�Z�0˒뾐�G��.������u����
��@�0܀�5M+}J�gb�G��'���J����g��w������l��-�JM��"��I@���%�����?��� �UN�T��h��_VH[�[wn)܄��O�Vˀ<�p��5�
�w�k
P­��Oճ���}���M������@ع�9�Tiv�'�]�L/���3't�yX�'���܂�����
�����J@!�$���6�]�!�\���X��C�����L�elۘ���Ti�7�;�)+��VW��Ȍ��(a8lHoj�]�Q��K� Тf%�ݸ��㎶�X�A����8\s��ch�	l��l��C�g�r:�)�b���<	��� ���d�/����;Lp��l�I\��EF.���
"��~"Y֠R�-�K�|����j����Y0�ڈ�4i5
-^���
�-��!>��V�c��x/laQ׎K5i���p@&M#6�C��	0�zZ�.�ͤ5�	)�(�,�8�wr���F����3p��1���]hW�!<pqP�b����8AB$p
-��ѽ�:�CV�V~�X��2:�|��]�`�_���+���/�8���>q���7j3��6��r8y��V��]n�Z���$*��"�*�ťy��ǻ�ˇ��fYK{h��f��^�S�F�_�ė������C6�}l!8M�!�\��ξd�g]��,,\.����]�&�
)r�U9�y+�.F�hّ���S�.����(�$�DrCHo
-�
=��U��T�A��}��8��~��ë|]�5��;�ρ��Z$a�����`����8��Mo����8�9��\%k�ĭsz!s�g/h��t[K{A/|t�V����P)y���V�b������qJPR��x��ZRyb$Ah����L�P���!�X
-FCg�N4q���ٸ_0�&3��xn�D�"�e��a&~��g�A�pm����k�����T���+c~�r����F�դ3Igb�"�N�(K�5q�|�Hq�����]<ք���Qs��.O�M�%�3W�n#�c�jH!P�
-:�Xf
-6�K̰t�tu�`�!q��Ҙ�.	���!�l.j�C�BZS8����
L�
3N�$/�����f�G�47����s�˿=��9_~1���mP+6ɲ?Q}Q�V¥0��ky�e�C�a�#�y�9�
-���(��;Y�EC4�t0���~\[2-q�uc-������ӛa?X�2'��+�ýo�ތ��g�����p;�xSA�����Kޢ^-��x
\�o/n�zJ�x�����3�
��{�P()����aqxnm����*���q��`���H��f�*eEx��Kt�S�a8��a���z.
-�����x�Aƹ�����E��LJkI������9�lf~�k �b�Ҙ!���!['�6�����pLŎؖm;_^��1���1�@��S~Y)��9[��8���~�
r�?7
+�����5a�[�����񉁁���ԟo��ɟƛѳf.���Yt����5�lh�(����1
��	f���((�C���|�ր�E0bã�f����N�S'cr���՗_�(+$��.�PZU������ZV;d�wd�ό�OM7�ts�u���V^���J�����|���<��iym�|��Y�dbN��@ij����^�Wi/p����!����q������-k-
-�E�$���|3Ie_�}3�!�@�a���YJ�S=g[���W<	�"\2������ѯX'�WoyԆu:�9T��P���B�(}M�����7��."
W��	liί	?K�4,�EL���:EV��>�C��=}:�xd���>N&�p1k-6Z�U��W@�md…"M.�B�6���
����ή����Xٯ
-endstream
-endobj
-11 0 obj
-<</Type/FontDescriptor/FontName/NUVIKR+Times-Roman/FontBBox[0 -161 863 683]/Flags 131104
-/Ascent 683
-/CapHeight 676
-/Descent -161
-/ItalicAngle 0
-/StemV 129
-/MissingWidth 500
-/XHeight 460
-/CharSet(/C/M/S/a/b/c/d/eight/nine/one/parenright/seven/space/two/zero)/FontFile3 15 0 R>>
-endobj
-15 0 obj
-<</Filter/FlateDecode
-/Subtype/Type1C/Length 1754>>stream
-x�eSkTSW����{P��4#�&u�ZEd����ZD
�$$ �"�Hy� ��F������NK�PU;uV[��97s�1a֚5?��}η�>��ַI�cG�$��L�eS�i+��+�n�c7R{Y�����f�:PЁӲ��wBCo�skP�Z�"ɜ�uz�i�\�%�zT���ww��e����8!��8P�����߱�J��*K�z_`�V���b�*7]�)�&%ɒV�"�*Y�x�R�LOWk�[��==<v�^��Ԅ�L���Cվ��D&�VIO�!bM�4!�pR�����w��n��B�#�@"�#�I8.�zb��D���Cp���!������NP����#�ܧ]h=˖���A�
�J�����G��-4A�'���������G��Cl�{��Kn/{
_]���6�a�t	�ᖓ�� ����G��1�I��\P��
�
3ސ̲��N3ߢ������Я:CA����Q�b�d�E}{v�Is;?�	ɲh��[,�e�eբ�k�j`5��m��J;*e��a]�IY�֠���X�h��ѡ���B~}Te�f��2l9�7`��oPUb�d�&

-��Qo�#�Q�Rc/��s����+�vZ�
-Jʥ�����.iEtSu�VC0Xk�����S��kd�6�5�w="��
-#9���O~�ǽ����C�Qqm•���E�c�b7!Al�<S�ǡ��y3=����0���*�Fݜ�]:[�m3A��1Ǵ�Qt����W�56��i������s����V��D�(��������`9��>�~% ]23�*

p�a�����f����r�ǖ�8&���������Ő�󑭮����B���*����@���]�Mv-!�
-�4
-��$���}K!��]�_0%�:���%��9[k �RkLaF֛^�
f�1�7᷿~��X�/�1�����ca���1
���h
�'��&�G�x씡?���!��in	~Z����[}�B4B]���/5$'פ����Si
-U�F��G�'�l2�CV�_����`�}�!ӈ-���`��凘Ϟo��Z�Θ�m���E���y����/��hӬt�	L�yl8G�'�4�!�1t��ضy�m�b�h� �2Y�o��.����P���-�o\~ܳ�9"*;1Y��ԧ�[J����{�'7$�{O�{{��~|�.`�3<�q���?O�G���\nvk*��\?
]P*�,����"�um�5t[y�N3A�H}7ba�����T�0��r�䞃����c�7[u`����z#�/�E�v��n܏j��p�l���ó�‰E���*�
�cC����/Q�Id’Rϔ��2���n��{�f�q��w&~^���B�
-��.d�x��;����A��p�Д0
{cJ�wdtYP{�ThRg&��!������x��S�d騻��1/�'�%��b��
$����y��ܳ�!����䗿}�p-�5�� ��aH�������ܜ��I�Yal�:u��?��(Tm�U��G�e���b���=s^�#M�}��@������f��ٜ-òx��W��PR�!jI�b��TÜ��r�B���A�������(o�n�8AK�>E�������Lz��TZ�����l�9x
�/���FZP��۳����������At
-endstream
-endobj
-17 0 obj
+13 0 obj
 <</Type/Metadata
-/Subtype/XML/Length 1339>>stream
+/Subtype/XML/Length 1367>>stream
 <?xpacket begin='' id='W5M0MpCehiHzreSzNTczkc9d'?>
 <?adobe-xap-filters esc="CRLF"?>
 <x:xmpmeta xmlns:x='adobe:ns:meta/' x:xmptk='XMP toolkit 2.9.1-13, framework 1.6'>
 <rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:iX='http://ns.adobe.com/iX/1.0/'>
-<rdf:Description rdf:about='8e9e7b9a-d8e9-11ec-0000-8b35636f5510' xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 8.71'/>
-<rdf:Description rdf:about='8e9e7b9a-d8e9-11ec-0000-8b35636f5510' xmlns:xmp='http://ns.adobe.com/xap/1.0/'><xmp:ModifyDate>2012-05-18T11:36:56+02:00</xmp:ModifyDate>
-<xmp:CreateDate>2012-05-18T11:36:56+02:00</xmp:CreateDate>
-<xmp:CreatorTool>fig2dev Version 3.2 Patchlevel 5a</xmp:CreatorTool></rdf:Description>
-<rdf:Description rdf:about='8e9e7b9a-d8e9-11ec-0000-8b35636f5510' xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='8e9e7b9a-d8e9-11ec-0000-8b35636f5510'/>
-<rdf:Description rdf:about='8e9e7b9a-d8e9-11ec-0000-8b35636f5510' xmlns:dc='http://purl.org/dc/elements/1.1/' dc:format='application/pdf'><dc:title><rdf:Alt><rdf:li xml:lang='x-default'>MCS_17_20.fig</rdf:li></rdf:Alt></dc:title></rdf:Description>
+<rdf:Description rdf:about='uuid:a1c3c84f-e0fd-11ed-0000-9f078cac5e54' xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 9.05'/>
+<rdf:Description rdf:about='uuid:a1c3c84f-e0fd-11ed-0000-9f078cac5e54' xmlns:xmp='http://ns.adobe.com/xap/1.0/'><xmp:ModifyDate>2013-04-19T13:05:45+02:00</xmp:ModifyDate>
+<xmp:CreateDate>2013-04-19T13:05:45+02:00</xmp:CreateDate>
+<xmp:CreatorTool>fig2dev Version 3.2 Patchlevel 5d</xmp:CreatorTool></rdf:Description>
+<rdf:Description rdf:about='uuid:a1c3c84f-e0fd-11ed-0000-9f078cac5e54' xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='uuid:a1c3c84f-e0fd-11ed-0000-9f078cac5e54'/>
+<rdf:Description rdf:about='uuid:a1c3c84f-e0fd-11ed-0000-9f078cac5e54' xmlns:dc='http://purl.org/dc/elements/1.1/' dc:format='application/pdf'><dc:title><rdf:Alt><rdf:li xml:lang='x-default'>blerMcs17_20.fig</rdf:li></rdf:Alt></dc:title></rdf:Description>
 </rdf:RDF>
 </x:xmpmeta>
                                                                         
@@ -200,35 +154,31 @@
 endstream
 endobj
 2 0 obj
-<</Producer(GPL Ghostscript 8.71)
-/CreationDate(D:20120518113656+02'00')
-/ModDate(D:20120518113656+02'00')
-/Title(MCS_17_20.fig)
-/Creator(fig2dev Version 3.2 Patchlevel 5a)>>endobj
+<</Producer(GPL Ghostscript 9.05)
+/CreationDate(D:20130419130545+02'00')
+/ModDate(D:20130419130545+02'00')
+/Title(blerMcs17_20.fig)
+/Creator(fig2dev Version 3.2 Patchlevel 5d)>>endobj
 xref
-0 18
+0 14
 0000000000 65535 f 
-0000020462 00000 n 
-0000028106 00000 n 
-0000020403 00000 n 
-0000020251 00000 n 
+0000020618 00000 n 
+0000022441 00000 n 
+0000020559 00000 n 
+0000020399 00000 n 
 0000000015 00000 n 
-0000020230 00000 n 
-0000020527 00000 n 
-0000020639 00000 n 
-0000021431 00000 n 
-0000021106 00000 n 
-0000024557 00000 n 
-0000020568 00000 n 
-0000020598 00000 n 
-0000021773 00000 n 
-0000024851 00000 n 
-0000021019 00000 n 
-0000026690 00000 n 
+0000020378 00000 n 
+0000020683 00000 n 
+0000020859 00000 n 
+0000020793 00000 n 
+0000020724 00000 n 
+0000020754 00000 n 
+0000020939 00000 n 
+0000020997 00000 n 
 trailer
-<< /Size 18 /Root 1 0 R /Info 2 0 R
-/ID [<CF4F248723B70D92296F155F56A68BCE><CF4F248723B70D92296F155F56A68BCE>]
+<< /Size 14 /Root 1 0 R /Info 2 0 R
+/ID [<69C82D581F0D3079F56EAF6EA70AA178><69C82D581F0D3079F56EAF6EA70AA178>]
 >>
 startxref
-28295
+22633
 %%EOF
diff -Naur ns-3.17/src/lte/doc/source/figures/MCS_17_20.png ns-3.18/src/lte/doc/source/figures/MCS_17_20.png
--- ns-3.17/src/lte/doc/source/figures/MCS_17_20.png	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/lte/doc/source/figures/MCS_17_20.png	2013-10-26 07:07:30.127364395 -0700
@@ -1,140 +1,224 @@
 �PNG
 
-
IHDR�/�7	pHYsMM
�έNtEXtSoftwareGPL Ghostscript 8.71?h4 IDATx���鶫(�Q�u������$ C~{�՝c
-*8�=�����V�\4�
H��@�f�h6�D��$��$�l �f3I4�
H��@�f�h6�D��$��$�l �f3I4�
H��@�f�h6�D��$��$�l �f3I�k6[k��?f��W�����Tp�[�2�۪o3#���^��0��̓��k�8#��ocoyqʭ*N՘����q�gշ�8mߪ��F���I̴m���*�k�m-�0�BK�3��#��p;JX� ��6L����>ߩ�٥�
+sշ�h
���س�l�=�#�r���oG��]�ƞ�┛_��1��+hp��i�Iխ��Ԙ������I��h�/{������g�򵆻�����cnV��1�+xt���y{�Z{?��d�3Y�	�8n�k���#s3=܈g������u�/
��͛��lX: ��K2����k��K�B�M���]�#�j��JjĘ�mV�rJ�z��v�}��^���]y��y���@��h�d�db�zI퐺�ɘ
*Ϊ;�Fg�v�m]'�hSs��6A_iZx>����������^&^댢$�cvW��^��h$� ��H~�6 9A}��k�z`��m���:�-�
��
j�NO(LІ
L�����w�7i}so���kgh3:~f�� ��X�r^�	�����ɫő�__"��ev���VZ<%�.�������Ƀ���ϲWWG��ٗwH�)DUEf`z�⛴�ȼL/쒡p����1;*��v`��Gi�nȘ����d�D�F����xJ�]nI��9�s������E%��+B��
ȴ��f�S���i˗R�
-�����#�SQ��4�-<W�2i�	�(I�@�M3^Xv���#��$ �&�f�mB�FX���m��SQ��;
_�;E\��
����(Yt7��M�%O���u������|L�/l9>|��Q+~�x�6A���t����{��B�fһI�@�+�m>d
;�<����mmt�s4�id�y��]�GC�N���{Kw�<G{��NJ�N���M�-�{Qg��� �,
-�+ε�J�,���R�A��"��� W��l���F���;4ɹ���t�^�p��hL��$�{�#6w��s)/���qRp�b?'�g�LrwG��X*���]-��r)�pe�.7�y�r�-�Z]�?6�;�{��5���)��	�D~U�#J���W�g>3<o9�]�3���]bk�[*_�1oW��1)N��ҊSR��OlG./8���'�*���~A�F�����r������@o~���˵�n7VØ-)θ��(����p�����9�9{��D5�( W��.�ϟ|+M��6��U߆�5|+MǍ���ĕ�G�����]��qJj+羝�cv׷�8���I���:7M���$��7�ך*�65Ϊo�qF|+�A��^H�x'�Wɟ�{o@ő��8�%�3W���g��xY�۵f�2���;�
-��dnz��"3����d��F���w)��o#���ե�'mc��y)�-N�r_3I����y� ����
�e�c�-�G���z��2�����η�qa���ޤ�v�Z5���&o�DT�^2I��%o����5?(<�$w%_y�cG�$�{��s�}�p/j�*?ZIu�0�گ�^ث������+�	�a�zMt�����Ѯ����M����w�Wɟ�{oP.s�����q_�wV@9*��b��Mh�pԢ��J��W���u��4����x��h6���n��mND�=ޙ6��5$p�<�YqQd_2�2R{mT�wV��vh�^�ۈ
L)�SO�})G���ʅ5�yG��lR��2#��g�ێB��2m���Q26b��)��f�]�O9���K��sU�t��6s%�秹;{ W��7�}�c-���m�1��9�Lr`�.}F��
������Om�L݂���5�I}���� �c/�I�zoX�}eދ�
-?/���SZ`m�l�]R�'iXJ�Ij�y�v���;m�H;v�wQoB�е4�EU_y��!U]�
/<^��WXL�������q慩�|���0������x܅_���s���Ix�3�^�>?4�p۩���YOX���h�ӮCʝ��޳U�8QQ����$��B�}�e&t��3���K�6�h����sf�h�a���jP�$�{Y���CƇ^4�
D<O��9��ՙ9�k
X(��K��|�h6�K���s����6fF�m�|?��l�o���R<T�٬��g�CG��+α1����2-���:�͊�"�����Q���~��X��Vn���H��L)��d?��It`��N>�5s�ð[%݌aWTԯŦ&{޶�������z+y����L��*5Z4�Fs-Mhd:��o��!�
-4�
�U��	NN0S��"M�-`���9q�9�x���{����8U�%OR;y�$ZV�T~6�#Ǒ��~¼��/���ͣ;�Nr��x�h�6�w��_I�ቝ���<�_�v񿊽i��Jg�l�������'��[�(�dڋs[�EwNug5ydF��Y@���}�x(� s�U��U�|�
�͗ �["�֝�U suI��H
LfT%����ޭ�t��cH��awڪ#�j���k��
9�-�+����S�'ӱ
���Ko�P.��95�
X��s23�|�j��P�!)��!�fUI��^n�Q��D�dZ� ���?����|�%֞��v艞�
DdZv�)OraG��;t2���̇�@/}_���{L��	��~o�q�Y����Q�l��ZRP�ds�	�Ϊd�m�͊�"�����QU��]@��fR��=���%�.�Q��)����'�>�H���[t`�v�]8U���`>��PQ����W��t����9��4v����j3�:^�󚲷��m��rquoa�q{�_/�X3[���33Z��r�2�l�����˿O��3�8�-g��t�z8+�=X�	q@��6����Ͻ���}GK}f��&)��U�=c��D���}�������_�%&7�]˹��L�e���͛/t�
{Q�W��0'��3'�%�)ڱ=
O���#u��=g��.F-�7�?a��REq$۸8W�w���35a:�VX����[g��dnz��"30���ͳ�Cș�_,�f�ܣa2hوBȌ��K�6�D鞗Bq$s���1��%�Q]NA��sۭ�/�Ų̈́�����JI`�Y���㬥z#��f�9�*�=|+�7I8���N���f>ٜ��Uh6h���<��\re;:OR/#4��9�r&_C��z�䴪���ۭW[��3�o?aы�dbneڴ�y��lx8gw&�n,A�Y=�]҅(�daq:^p�:�~��Ø�8��q-6��Qd_2�2R#�*���=q��
.��Nb%��J�FD-�]�=��7@�ho��]d[���԰WOo�!����_�M���n���K+�ǩZnt�[�s��#��G'7�^�|7�`�wO>�9i
�����V��4���o��h6&����fm*���I����?�ͪޭڜ��^4�
�*yH�K[tP����NM���r��,q�^����m��)�Fރ���9n-�}^��
��=�eFTU��2]XO�}č���߈�f�zJ��O�8���C���ŵL�Z��l�(2�/�Q��U���
�L��lD���l�=O���a2�dR�1	�4O�M>g����')��k��r=��.\c��J�/�INr��x�h�6M;^��3/��Й��:so��Rן��F'̇w.�8�I��;������ߞ�6<��]k�OX�����ք��]~����;OBE�Zlz@���N�m\=I>��W��%�+�����f
��>��qN3�ss�=��0E�9P��B�q�%-�p��[��ǂ��٬�fi�������_I��w��m�c*6�kw6���bHѺjnO���
��)ڈx�f�zJ�sH�8�E�c���qIJ2-g-�p��
E��%3*#50�ǽM�\CzM=e��j~��c#��f�T%�^���|“�~�{�x�DT�<����'��4�
��=��N�?-gs�=>0�oG٣/8_D���4���6kuu)N�<�'��s*�肜�r��?���lgD�����ȣ����b&]>����^�U*��f�6K���Fo�A�/I�$cˑ17�ڍx�#c��ڍ�64��۬�#Y�K�Z��m�����:�����lgD�y|ɌJ,��KfTy��ř�T܌]�h��KfT�f3�Gno�J�y��B����~v���s~B7������]jr6�����yv6�d�:@G4�!�fχPϠ���Z΅��r��f; 
-��dnD�QMS�ͧ��n�e�{�[aT��fݬ��l�^��z�|��cuo�v����Y6�V���K\�;*2\�!������4�n��
��<�dF%���%3�'j�u�O�%�+�o���FD�f=E��8g��2b꾯^=x����Dy�h��@_/m6[k�[����ϙ���I�NR>��I��$D�:c�5�Q`���[���g�ou���I���Ů}���v���j��	��V��<s�P8Z�T矱�Z��l��M���o�{Έ�.F-���
-�}c���l뼶8^���N{~{o^[�%�')*��� Q���;6#s��d�.�Q�'tS�%K��Z]�ڈ��z#Χwu��j3����0�Y�-qܜ3�l����F�OO�To�L֧�91�h��G�(������Y����ߦ.��pyq–�5k�\s�lgD���Q�|7�)�*q��a�@�6XC���f�5g�!
����'��`��We�7Nf�`�3/w���;�R�>=O�ab{'�
-\mVOu�t!�#Y���]�e�M��u�?7U�Эv6@�Ų̈́Ē��dF�Q���\]2�Bw4����Y����?�"0���h��w�����G��o�ػ��4��6E��f��h6(�01�o$�8(ϑ=���xlġµ;b}WmD��}��p�f3������~���=ў�
-�-e�".O���'�dZZΨB�`�"��n9��UR=�EGJp�Y���!�8�5�KK3S�m���֑��7��Qd_2�2R#�*��s[TџW��.���m���y3u��m�3K����أ^l`�]W偕�X�
S�|���?q=����������7��K�
�Ў@5u�Bl�7��&m$=�]h6�*ނ���s�Y(i�J���[��ոE��XE���]���Ȭx-Ȼ�l�A6��7щ/��
-�y4����q�#��⬺?�{���5�C�����f; ���KfTFj`DU�a`^�5M���N�������]7"<��OzX��R��v�^����У�{�Դ�����.?��ث�|g���q?L��L�3��J����7�~��yo$��
�	/2?4��k3/���\4�
w�=	�''�ѯ�`�L:�j�}c~7��U�/�B��xA���5�U)!��Z���۠c��*��
��lVo���)�dϋ�v}x��i�`y�jz��f; ���KfTFj`DU�0���n��>{�nI�FD!���)}�>��H6�8�V��T����v6@�Ų̈́�����Jm`C/�J]I�و�{i��Z{��qO�x�dR_e>3��I��INr��߬׷�%��<�'�g종8v��^�������cg��	o���3�^jn��©G�|5u���L�!O�[;�A3�_�i�
�	���s@����}#������
`��m�EpQQ��P*��b���:�oY͵Ÿ9#Oo%�ou�%v��s�w���/��؏��+���Kdz!%)#�7i�D��!�#Y��JH6����
���l�(2�/�Q��U�G��oخuu*�i��ωp&�a��٬���R(�d��=sZ��o��
��<�dFe�FTU+��a�w�o��E���M�&	�R���}����z�9�k]� iq��8�����f�Es��D%�5y����S>������<	�oC��D��*_�>�ōT��	OsWx���B4����q�#٠��O?��Y��7T�S���K��%3*#50��R������s��a̔S��ϒ��<�ވ(D�Y����8�=/N*�.ѫΆ�Fx��6��Qd_2�2R#�*m��.�q�S�Ô��7ۈH��`�ԃO�,8'5NN��V
@�h
{�~��:���6h6�l�+(O��6�0s2ت�����T&��M�sߗN����6���8(�����?�˔%zO^����m��?őlrq����[.��/h������KQ�
6#�����QU�X�"�Y]%��߻��߈0��>,n�K
��iΜu����bk������6���s�k,*��b�J�^p~t����^q�+��R��V�\m�C����.��C���ѥ��Y�63h6mZ��K&����ދ.$$R���W7G�O��4�
�&���_2B�O��h��e�����N4����q�#Y����q��8N]�}��f; ���KfTFj`DU�-�T���s­i}��ʿ�:y������)}�>��H��8�����#���nCH�����"�����QUi�h�ִ�E5�dw��~u�m#"��6���w8���ǐ��R/�N����j3��D�O?�m�o��|@	2&���`����I!���̳��L�;%�.k�[����W��<�Z4����q�#�������E���{��Y��	̄,�8�^2�/�Q��U����������u�����r���[��R��Q��M:�N��%�?_n�*0*��b�8s�y(��wǴ>�����rTTm�V�\m0�{�����}z�c�E/�{� ;������Jڄs��E?�O�9�Ao��|4�
���Lأ��C�47�pU7�Đ��xDpl�UR�!�z1�I����Y�=�%h6��Y�8Șܒu�����l�ۈ=��&��u530�� !v�YY�D�3�O�}�F&�ܾƹd���^�~ϻ���_�M�aU�`]�V��i݃�J���D�Y�.Ém�����G˦�׿�
x#�S.k�7���/��x�Mš��a��s�"�<�|����j���F]�J���;��`j�#�"���f��=T�hA"�����*Nf����p#��%�Xh3o���m�(�{<�Z���ܕ���
G�؈�Ǽ�j���K�*4��S�T}
-őltqfw�]�<!?o~�ƴ���"�2��X2W�̨�y�FŮ.�}WRc�S����):��} ��Z>Ǭ؎����U��:r�t�'�W�s5�S�l�R����:�5?-@��w#W�s��y��L��$�$��39�I{M��3�#�w�P�l�2��g4
�����őL{q���2a�	:3\��q:�Ⱦ�Фd��m�a[ܝ1=����f3�x?����r\�	��y�����hn�q\��1uTּ�d,��f�u��R_1ɸI��D�6�q%��/�a���ru\�gH���$�����5��I~����I9
-'����a[��;<���>y;���bIxg�y~<�^{B‹��XU��s��U�yZ���73Coxf�τ�<�ۙ���16�{��W���縻&������R�'��ߔ�/��f����8k���g�T��7��}��9K���vm	�p*��:�\�;�?��ס�]���saX.*�<���>W�ϳ��a��md��M��!A/ws�Ϭ�Y��������6i6{]t��6�]EqJdz
)��5�Ͷ �	Zfu!3*�d�.�QMS[z��K�7Ѕ�f���y��N�;���ÚOTxx!��R(5��	�����ٌ�l�#��<1:�i�:����������eF�K�n�0�G�|uͽO��􄤼��6����ں�K}f�m&1&=�����f5��<R IDAT�y���|�N�]Cj���ac�>P�Ge�*��΁�Oux����<�{��ո����mx
��4��>���='��dǐLkWfOX��
��j�������p�
]�aX3*��b�;����6���`��kE�qC ���K�6�D�i�őlZq
-oֺ����8�o�����\fTb�\]2���-�{�8�ӕx�9U�����ވ��lVO�	��͊�B�v2���u�p
�A��q?�8��4�o~�l�f30�f�P`q�D��8/8�!	�N`�Zl��~��?���?�N��n����t���h{w���]g��@��4"sYs�ˈ�g�����!�§
-��S1Ij�ID��I���ڿ�jo��xձST�y+�괃�=A{O�x.�4t][���9^��ޓ���W����ݘ䛨�ngq��L�s��w�]�=���(�#ũ��߇�%X[��wBc�ڋ]�ㇽ�W71-���f�����DUEf`D�ʙ����!���7�g̖�5:S�Q�
-w��9z���^mމ�=/���7�&N$������
��b�&�{�UI{��F��A�s7�k���lPjhv��=>�t)����$�����؈�Y�=��J[*6b4F�w4hD��P-yeiѦ�B�����2��(�49�t�ٿ�
�
{���1��LiKϓ�%ٱyM�;��B\mVOu�t!�#ٜ�<YHՉ�l��5{��Afu!3*#50��2!��%�\]��§�g�@��ҋ���x̣ől��t$�nr�?Y����>����2#�*�"���^�6.2{Q��Z�Y�ؽK��^m���z_��b���L��$哿|���m���^)��C=s^ѭ,�>��$����;��
�p�
{Q�W�B3sHUB�{2s�#��W�PG��IX=��-t䦉.�`�='�Ũ���YOX��6g�y^�{�~��J_�<�����rj�h�r�QQ���ϙ��w�S>_���n\�#���h��I�6qk���VeG�Rm�%'�t���صw/���^z��NT���8�
/��dҥ8����h�7d��v6@�Ų̈́��������ZdsTnR���^�b���6���]J�lVO�})G�i���󙯮�
-���c͂.�2�	��i�o��CȬ�eFe�FTU�V�*e��ۨc÷ZL su�E��`M5>gWoq{6@�q�iI�;������f3��
�V�򦳒�|=
�ז�e�%7�}�N�Չf3A66�UE%�|0�B`Kr~��
�f�6{ܟ�H6�8�������⬽	k��
E��%3*#50��"30��"60�^�l�^���qQ�\��g&�]�I��:�^�'w�WMr����&)�Uߥ�/��M}�Ŝc�m���F�c��&�ϯ�V;�U?㵢9�<�ٞ|UR]��K�1�#"9ᅫKBx��	C��E{���߇�����筮��	��w�����ᵖ��"ھz2��]�����j߲
��W���9��l�.>/9���ו� 
����-���ڳ�?�����d�O��,]���K�6�H�9�o:�VM�L�#��~���
-]�l ����~>*���׊�+�ֹNܕC��4"C�L��ή+B�Y=�	�(�ds�>���6�y[gʂʋ�M�k?��Y�ˌ�H
����l���]p������:<����#����,m�cNC�s|^	i���D����s�|o%����\fTFj`DU�{`]2����<*k��'su���f�lYˋo����9��^��q��eG3����&���&��-$�<A�����4'=���Zc�.�l��d4�
lKH��1��^=
b�-7q:[,���m��?ő���ۋC��Ȭ�dFe�FTUfV���Qy��<�UUT3S�ؽK��6������O�@�s8Z��I�����6�Y9��O��8�	K�6���R���:�?�K/�s~�	ǎq.�ޫ�;�Ϋ���^����������9���9᥾:S��7��.9�E+�U�yqPٟ��M�v����sF�����>�Rv现�����7�mx���q<��j�����»�V#~T�-U��W�t���
-W�XI��8��_�Ml���=�G'���͘����}������f�4U��OkjI
W���`n<�������%��%h6�+ڄSڮS����
�X[��A��{�xbϝ�e!�E�Y=�	�(�d��"�ǹz���l���{mm����̨�����J����25�[�ꪊ*s���"���p�f�zJH�8��*��9�iřs>�Kq��7�\�H��dFe�FTUF�%��\3.�'�ۢ�����]J�l Q�D��YAc���3f�%�?
���@�~�CB��SR�ڣ�
ࡗ�
-�w��C���v�����̺�2��
#��/�S�q����2y?
�E�Y����8�M-�'ǎ[&[������dV2�2R#�*��)g8#�z�ڞF5��m�{�RZ�7��޷l�r�������jm�A|�D��-��Rb
-d��̐��_�M���/�3ϩ�>�c`@0���Рb
-����j3���;ߪ0a( 9œ�8
B�l T�
R���RAl�Z��d�"�T��e��$��J>3���dlC\��Z{ވo?F/����3�0I�$��s&��|�$��Dk[����◤���.������М�-��N^�U��K���/��o�̟��嫋�:�n��bM�s��wڱ��wY7�����v�]�Cg>ő��<^�1^ʴ��������K���/z?���8%�l�
-������=a�m�������ʸ��\�oo�r��`�_��v��vUT�M��%3��6���=/��H��8?͹��6��D������ℷ����$�2���QU�،�곝�ue��fX�J}�9~q~E����kI��Y2����;y*�T��F�y`��gG1��Qdvd-*�k6��hp����K�-u��%�۳�����	�U��Q��&r����8��ۗX����-�
�>XEqP�&���u����
��z���̈����2�Ħ��	ĺ�$q]�_B������g���@�8�-(N�h���Dl�~Wr������-��Ȍ�H
�����XXҜ�;o��?�/l=�����N�0�{���²6֊<s���
t��)�k4�{�cd1��R�/wR��%�j3����ZA�b��{�l��&F����[!;�y�����
6�4��V�7H��T�;ϼ�v4w��ߌf�z���͊����k��������C��Q��&}����݈�f^Jܳ�מG=Rh�g�(�d��cm�������(��>ɱʛ���BfTb�\]2�Z+ߛ���N؈/!���n���w�`�&������QK�1ftA�����{!��M�^AGK�}��,L�ߧ�W���-x�Wp�����	�r�mq��&����Hu2s�rB�ֹ.�6N={�H[�L�4ҫ
-�+�QfT�	]
e�vو/!��<�����������I���$�7Lұ\�9k�P�R&����MP9��I���K��ux�k����ݻ�~7�q�Nj��̜���$�
-���-��J���&y���1�c����;\׎}��������#1O�]U��x������dv�5jQ�O)ꊴ��ʼ�N�%PQ7h��7�Kƚ�H����ެ�U#�Z[�s]-��'���K�6x!�7�brZ�״\�5\�z�V}�@_n�ͧG�b?OE��s��oj5U��ud��GH�F�f� �� �h�%���?m�"�j��:(L��/3�3����*�cS�C��>/O�2��Q�%suɌj��TY�����븍x�9��_NV�٥��q�y��0܊���#~��å�6�[��iq�ꑠ� cn��xʬ�%�MI�e��l�W�u����J�OC�S�ٮ&[��ۃ;W������,��=c�V-:xs�~OI7�F���`��ψ�w,[s�1
-N��6�9�z
�ū��b��
`w�,
���%w���|z��_]�a�/���_tٛ��%�^]��d]mF��0�8��*N<;<�2�NsP2��A��%3*�d�.�Q�5su}/�޽�iNT��`q�櫣z)��-sU�8���RM8yg�\[���	ZR�^�U�;Q�-؈��+ȺI��u���#4y�:�U8~���{�ftyQ�i��d//�؈����qߤ33Ӱ�@��f��i�9i��ī5�uw���$Q�mE�;Ik,�ܧ�o��h6�H���<_,�z����N��MqK���X�f�z�=`Fq$۬8F^�IKYV�m�^d�~2�2R#�*2#*����be�.�h6��ٳ:�ֱ��R���zʜ4
̱��O�@bו��ܨ�t(�p]��̍��f���i�u��~
����^��(��������k�]��h6�!�J��G"��Ӗvy�#�
��j�_Ǣks�����;��P
<��;\Ùv��ڬ�f��S�v*�~ye��9sOz5�Z|�Ȍ�H
���L,����?�����F\�;s{��Hl`J�lVo�gu(�d���Y��Y������"�����QU�����r׮.k��M�*��G�
� v�R�f3͎��� �>��}#|>.8&X�e�d��Gq�ȣ�lqܖ���V�m��K�����v���
��W�'��\�$ZV8�ȟ�x���=��?�d�f��c�j$�������\�3^+���������s޸��ï�/5Z��>�7k�}�9�m�ƽ�
-���t2�;��ݾ�wk�*5ő�����C&[����I�&r3˷���u���a����d���DUEf`DUeN`��}������;'�g�Lڈ%MN7�{�̨J��j�N��y)G������)Q���e���؋���!3*#50��"3�+*Q��\WFp`J�l��'��v]g�i@��;���!Z�N��W�F��#����A�����w�9���*�
�Jr��@�h�[����
�f��Sii#�3�0��S�?K[wV8�48��٬��.�BG���s�Z����]Xg�ߙ�en.8c2�/�Q��U�9��f�d��K\=��{#��f�6{ܟ�H&�8��qYo�R�u�В����	6�����#5*#50���2���e��UQ��svF���������8s|�6+���F(Iv4����Y�ة8;�����On�u�ؿ,�Y���:�5��_ �$A���H����.�
d���#e�/뵂���3������K⪽��l��~$Ykw�4g�|����__�����%"�N*rw����������R�#�� 3�hT+ۊW�U$�Q/n҆,��g���%�8)�L�Vfqn�5�G�VGDUAH`^�KF5��_��u��A��*��O�
	>_�n��|󰌦)�YO@��nW��{C�Ⱦcb�h6��Ng^�e�vJf�o�i�p�3�l������)�3:��~�.������:P�8��Y�������o��ufj
e�pHy�6y9�9yߔ�"�:"�*��6}���j���B6��c��-$"�m�l��8�����~Gɞ}�s��i�����;�)>r���OG|�0`o���h�P&�#Dt<���[��)8y1%����{ej���d�O�޷n���혲SdVGDUey`�3ک��܊�<#&c#aH	l4��q��������>̚�8^�
眉�S\���Ζ��/�Unve݌���>��&��4�N^R6����2o��vf*R6tл���6)u�������ޮ��\U7��b?�������qf\Q!
����|�&�iK�m�D�&S���C�l�d���)	��������^h6/v�-7��7P��:1ܖ;e���֚�׿�������8$���=�Խ�d����NLS�t�N4�?n�ȒC��a��m#�^C<l����k�S�g����h*=�-���-��x-���S _ �W
-��M��淯�p�,=�>��l��QU�����,f����{�<��6Kdy_�������L������s*�^DՆ�Q�(�|<̌m�gj�;Y�CJ���[�YU�����%�x1��^��͋E�JUUGA�����ҫ�E7���S���d�y�9��Ef����1Y���e�uj ���`]VK���
V�B�nu�#��^b�-.���v�
�K�uq^�1G���쪧Z�,�� K�;,�Nx-r�k΁@��Z�tPدժ��t�����`\�7i��
����jg�#�#_�
Rm��Պ���c�k�Kv�l�
-B���F��i��f�(� ��Q�aOw��Br�N����80Մ�2�!�:"�*2#��Xw�ɯP�f3dQz�F
-�%sj�8HAũ�.����\v'�:"�*2#��L^%�>G��n�/-���al-��Ђ��爟�?1��i,c����������[
!aކ!$N�h6(%��B�x�����[|�>��t�[��߈�1擰s]]��?V�V�	��|��0���敉��Exo���r
/�oO������>j����W0���5�Փ;^�ꀽ=>e�pHy�6K��5C�P5��u%60�yK$���l�}����8��}�wx�&��9����4�
Ԇ5���%SedʻYMq$ۤ8Ne�6�:�yo.8���h��|�/�Mн2�	rq�d�-�a�[����YU�1�G57���V�3	[o?�_m�N��M~����n�N^���1��ۄ��Coq�u����5P�oO{�kY+=�U�ו��ݎ�K7S�j��������s�7O~=�������!������^���Qa�fs����Y5��^~KX�_y)��]o�U��}k���M��F�1�06�S�۝����>2�=���oUdj�Z/Æ�M���'��!eC��<<2���s=?�С�m��n6��6z�U��Q7�T����ub>�#��f�Q�M�(���s�l#���
-�u�d�^E��vWv�b��t������-T�L�ڈ��=�y��s����]���Zh8�]S0�,�̝��eBQ�G�4�S�p��;e�͊#�1�d���!�ӆX�>%t�w
-.�cM�f]���+es�{~'����i�Cw)n���7���(�,zf7�z��g���0'��_�W��}�&�{%����|�:5IÚ�,yP�	ܙ)����5F�/k��E�Y���Ga�6N��w?s�ٔ,�4S���[K����Vu߭ ���ɌJ��>�%wu	�!x����j�B�aG3_�z�竡��3?5Ow�E�>g�E����&^�M�r�q��R��L}��o����<��!����H�X�C�o����R�i���j�d].8�'�k��z����I�3������+E��haS���~.m�IT�|׸I�ߋYN`�����ڽÒ
���?�4ڜ��!
ɺd�&��MA�NEx
��wpD�,���*�����+
-/3���y�K�\޴���\��]��e��y_߇u��L��ѩL�mކּ�������rg�d��[-��Ƙ��fIeM���<�����|��L0�	�<��f�4}R��nG�������7���{��uqu�־��������\m>��s:7q���uy�@~'j����/��B��/Z���&$�	I�B���E�Z\ѯ����Yl�l�Ni�Y5;�c��3ől��Xs���\/23A��g��Gf�/3*Q�s�2W�s#��@0��.���|�,�Cx��g��ҧaAΕ��t/6?A��>��[��ݰm���**~F��&W�'���
}᳥׹�DZ�;�N��v�M�1gs������\�d<��������z1I�����m���_�Uj��R=Ia��jWt��4A������8�����eF�O5'<O��������_<Z�ِ����4J'���9dB�^��t�ڕ��{a�%�������\��O\W{8�'v�8�<�7)��qKqn7��.ʑ���J�[fTs6����ωn���/����ty���������mV$<�r�;�jr���ޟ�!���o�x�Dj��ўJ��#��	s�mgz���=�A�A��<[d� IDATH��|�?G#u�YL�Q����(�3����2WW<*y-\Ys�Ґܤ=�q�Au|�ýĜw��5w�?�
-���.�
{�T��{|=�;�l��&�^���K��T����
��-俦]�^)�M-7{I�K.�ͺ]�=�gt���f��$tj��	?�0�u�T��{�������8�al��
��dmb�7sj;3)���Jj%a���q�*ܤ���f��q�}Y�����wymv�ől��w]_����,�Җ��Ɖ,\M�.Y��n�v�,�̨f��9�T�����8ū��{����dI�׻s|�J�
W�K���r�w�[�������d���d�$���{xF�.�Xk
�\A����l����~�|���^�9��~���������ǫ�a���N#p�<�C��'�Eݽ��u"�����Q��<2�{C�ɽ?��ə����i���Ź�Gc�]'
#�s�w�+wf;�����Vˎ_�8e��k-��n��33��g��Mq�v�gN~�<�����!�{yٻ��p��}�]�Yt4r!J��s��[�p�Y��9l�{��7���萐w�͸�go΀����qX���>�	�
d�gj�;Y�C�?@���+��
-ߗu6Q�g�����K�=�{���3!\z��7�OO	|�x�50ȓLm�&�k�|�N
V9��5�Njo�
-װ7PZ�i�J����֚pwD�"����@q&���Swv�������u�}��&�A=r�k΁М�{�p�.�lv2��Ub&3o��}���ȭ�:W63Z��<7iW����s�J��͊���ٶ)���ZH���TG㱮.�h^+KV�ҍ>:�<��-6طF�Jk��ܬ�kv�Cfqw�JG��˄��%��K���Ȇ򻸛�V�+��嘨B��*�ԓ��Ђ��+��Uk�tZKlC�]��~�EG@��F�[ݥ���>�=�2	������W��t�昒 ˗�dۨfoB�
;�P���O��_�kBxg��68�>>���_=,��_��+4bǾ�#��g������6����@�.�4[��،���8�#�!_�L�.r��:m6+�5�hC�����y�U9�������i�{�j~)�����A�ٵjq�����%r)=�R(�L�C�Ӂ��%�	�:�|��UdVGDUEl`9��u�
-Lj�����R�5�'����uM��ޟ�!���œ+	@��1[�ƺ/��$ֲ�Q�a�6�2�y����|}�P��!h'�m\��
-��ú
-W�)?*��[���^��	����`��p��X���P�G�5�f찀FUG���{ej3>Y�K���Y˝�|]�N�s�����d&�

�\m.�=� �4ҕ��|馷p��<�q������<s|f4�^c>k��
-@!�i�Ԗ�M��2o�{>=��ͧ���pwr�6&+yH8��E��p4ע�����
-G�Ox�G�^��d�6^Jv��Je����T�9�l3�Mz�(�m�R�0Z���:-�諣��I�6M%����˰�i$�����”�	X`uDTUdvE%�Ԙ�ue�����̔�R�q9�_�������3׎�Lr&�
(Γ�Գ��:�r2u8϶��3�D_�4DUey`�N�����k�?�ו�V�����D��{{f/�l�"zkV�9�k�0$�<��H�;9ǽ	�0S��ٚi�烉�$z7x�(
��p����F&�;�/g�?�����D�?�CB�<�O]�&��p�
-��f&)��1]�s����U$3Is�Lb���e�5��[��M�d����W�����`�|%ao��0����
�=s���o0���R���&5I���9O�=����s���-�m��l�/����O+E��I���]��g8�
���2$:gw���ϱ�۟��U�e���N@��Z�r��;��7c�ejӚ�M:�G��Ԧ e�"���o`��d�M�$ݭ:�'��
-Dk�O���A�x9	�k�t�2S�i�͒�Ӏ�`��r�9��t�	�ETU$f�����̓]W��7�ԨJ�ls��mz��	�Q5�8�X�)�
��ڬ8@���z��:Cf�DUEb`
1M)E�����z#H܈��l�K-?���W����$$]
-	P�� ۠�`s^2
��d��@�fȢ�c�ő#��
lVzɬ������tE�����K/�͐e���(�<�ز
�.N�͊@/��QU�XcT�{9��������'�I��=����ϽY��U��8�w)�_�}���'����
�ej� Y��������!e�%��N��<�qgZ:>��^b.���b�!�g�=\8�pL��a��$Uʼn�$������$/�$:���+:����KQ=����M�ML�&辙:�IC����'b��k�>��*?؟�cg���\�K�۹Citx6x��5��"p�w){�̮��O1Z'?�_��\�8U\2�
N�sH}
����S��Fe�.Vߪ����Ԯt;�Nx��9ڍ�${�Oۖ��_����2�H��{�I�8�OS���Go�M���m��p;NA~��x���Z���Q�Q]K�Eq$�8�m)�m��Ÿfj3+Y_M�|�����QU�XCT֚��iH�¨ܿ����EK܈z�l^,u>;:���u�7Ix
-9����7;�)�L�qs~7_tqjmV@���ڬK���YU��U��)E���v�*��:흙�<�8��r�RmG
3ն�
H�+��ٜ���f\I6:�T�>2M��Zt	&����y
-'���_�t��~�,��He�蘅C
-��;��	M��y�#�x��͋E�ʟ�vGo��n����s�:��-���X.��5=�qU��k�g���d����ש��������x���7��C@�"��7뽀�V��0��8�δ�	��=��]s���k�sU����ƌo5�\WFj`2�*�M�o$���)���F�}.�@\q�ج8��|�!�:"�*2#�*bS�f�K�>�8P��Ÿ����OI�p�f3ݮ�{��
����f3�}ƞ��g�F��
-*�l�,�ʠ8s|/8�t���0�mVzɬ��������������\���?�������I����<S�$������g���sn��q���țd�c��-�@�4=�w�zx��\�_�V>�T%�*<W����ޅ�6�0�	{��2ֆW���ݱ�3מߵ���[{O���}�o���C��8��S�h�q�Q'�VC�6��8<����*��[��[�&�&�:]=��,܁��m�³q��sU�l����'P�]x�'i����A�6K��5C�?s
�nҞ�8�3���3z�{sp?ޕ����%Se(}%�o��u‹`27A����L:&�S�U��ő�
��͚ܞ�us��!|rƝ�m¾N6_�zL(:Z���f��7+�"/\��l�%Gba�v疿@}}��u��T�����.��z��ꈨ���9*k�0������������,jt�����j���8Ѧi�
]�|�y�~�*:g��ٵ��@q&;��c�G~q�lV�Ux��!M�)��<K���e��ܴ	q�U�rwa�N�YU��U��)E�y173����ӻ)-z�ٛ[�s��k���@����Lmz$���Y��%����
��?�|�o\�|��O��Mew�L�I,��&���ס�l
���pd��=�6g����yF��+e��
 �.�$�����3�ބ�!��E74��ɫ��F���ڮ@&Ie�蘅C2�9>�9�J�����_
-{!6"�js��j4���a�����[��!��������y��6+�z[__fg�����^�l�>L���!�e�ϟ��4Tݣ�tz��%޸���f�7��O��^9_vv���d��:���{�,M_��s�B�J}^��V \m.�s�&5��@�]��e��0�6����<�VxU��
�%$]
-	V�����a�g3lȠ���l�,T��8�����0?{6�F|	�͐e���(�a�@��JRfTb�\]2�Bw4�!������L��I��O���Jp�E����"t�<�W:�����3'������q���m��IVfx����g<7�䂇{���Īx��K �ɽ?���fr�!����s��p�pqU�	����X�:ᵖ�hwѮ.��<H֦ /�>G#'e�U2m4v�U�V \m��8�s9>��^b��܄9؛[�y�h$n��MR^���P!�#G�6v��To@7A��Ԧ_�Χ�p�nq�l]dSfTb����-f�_�f�2��+����7�aּNB���/�=i�87h��Z�P�ےu8r��vf*R6`���r�V Fx$����.5���j�C����.�Ԭ��D�#D�`����n�^[
-n'��n�:5�^ɺd>S�.2�,3*�d�.�Q�;�͋�7��S"��rf�����o`���	f��gj3+Y�5`�!�����S�
��l�m�;�R_�����/�(�Rp���OZ��ut�T�ufd@
-�6Kd��t�>���n����ى{�V��[tw�%r�#H��%��Yq��3��M֡�d�)iBS9�d��Q�%suɌ
-�q�y���S��ϼ�u�˿%K�:_�f��\u����E�I�6�d��g&���B��^Te%�@��`���F|�7�	�>P�N��]�;�'�lg�dOӀ:��Ѯ9)����@���F��EE���:�g�_jt&�C(�L�Lȧ�l�E��l��ő%�u�6+�%����X2W�̨��fȲ�9�͊���@��
�_�f3�R�%�͊Ƞ���l�f����
@�4�;zҞ��������N5�?����Y�3g�n<y�@�A��<H֩���}�!�yW�'9��L9LJ;�K��hn�����ܚ;*H���S2�ݬ[�#�sj��86+0���{ej3>Y�K���Vy٫f;QU�QU�R\mV&z��X~28z�����n����vΩ�כ��ެ8���
"ld�%k����Dv��M���n�Y�F���LuTN캒QU�R4��Ԟ�)�vwm���XVd��`�&nt*7凭woxtΆS_�mV�nV`c
y�|���:5�|��&h/�F�a�;�O8�iʦ������̔�R
�H{��jr�δ|��;eV.�3��O��mweg.&W�ކf��|q暡��9{E��J}�=�|��k�0
Ӗ�P֎=�
tUu�NH��Y;�!Y�Z�R6���L"�+?����:�ۻIj&�8ͧ�S��^�m��)�d@��Lm~�u�$Y���|w�T^�����ꈨ������
L)�͋]��UǯԴ�g�S�;�+��s[J朙y�l�;<�\8��I�tG����X�$��ћ-owQ	�DW�6�NC-�$S� Y�O�|Wws�պ�FU^����Sv�O/���E�9DoP�'5Z�w���J�z�^�F��ᥢ^��A�W�s(��dz��2�A��ƌ��k��,;!	!�68�߁:��h��Q.�@����D@�W��(�2�
-DZɯi/@�!���?����Y`K��!�RH�
-W�!�f��)�dF�YU��U��)E��lv>��HFq`��QU�QU�R4�
H���e�5ܶ�b4�
�-g���<�
x�s
	��N��~��0:Za��6뽀�HFq��ejS���?w�B8�AdVGDUEf`DUEl`J��I·�m����������
-��[8�9�����I��z/�8�Q�T�{��Mk�v��'eo��r�.�c�ΐYU��U��)��f�2MYW4kF�qOQG4d"���dmb�5:y��3Y�|

����/�Ds��8w��+u��:'	ǟyJi��j�iM�m�D�-SWͤd)�'������Ţ7\y���nˤ��Ty
�������랩�]��O�G��h6�f����)E5���,�pk��|�7p�]^���8rmwf��?z��~�ȓí�hM=6e�)8L���ʖYU��U��)E�Y��9�۾CJ��pn�\���i�q6;�)�P��}u=mV@��L]�K��ۭ�ú�LfuDTUdFTU����Ţ7S��r��q������[\�#����Fd��q�΃�˝s������>P��	7i<\��pQ'��s�e�n�|)���@x
�+p��H� ��}^���7��@q$�8��pf��ыh@TUdFTU����j�C)�m#���e�F�1f��<@�^NfuDTUdFTU�����d@7�a`k���h6�! i0��F$f@1n[vG�t�{��R�;��G��K�?'q�qϼ�����]�W�MDo��QӰu�N��qU�6#3����/�a4�ڙ����������������A�6q��ѯ򳺦*\P�k��9���Q2��o��i�:x�㸿�\xp�2��Lmz'kӚ��X��3sh�v��"30��"60�h6�sS��	���=�Ir�I��w8�{:ܝ*ӝ}f��i�<ii�Ԝ�M�R��^�N-4����!e���
-�kt�̴�7oW�A�dW���g8Okm�mt*wn�e@��4R����L]8�������u��}�t�qR6��l^,�ԓ7Nj|W�SI�|��Go,'�B7��(�=S��d�ͻ��o*_sj�l��� ����g��|VrKU��q�BS���3o��]aG2�hQpA�sh�6�Z�m����ףO|ˬ��������������|�M.s����a����>��E\���2����'�x�Û�HFq�=�OӦ5S�sg�v�%_��%[fuDTUdFTU�����m?�}b*���OXEONG�Ж�ådf�]���JR͓4m�d��8�L��6�Dμ����+��G{�j+�蛾�p�F�K�^�:�=:�h�6M�����l��@�[�#���ͭ�D��8Q�( ���O���IQ��H溕�X2W�̨��+���f�i��������ũ=�ɕà�
6�؈}�~�9�*������*��M����Z:iЗ�f����r;�������|��:��~=�4
�Nq��˵�� Sg��o
�
-����
Eq��	!�u��?:B���T+3*ؒ�
-7�L�m�6ȧ:=�-Ar4�Ni~��f��
-�푣
�����4g�
�
�n�f��NNT 	�
��60�&W�
�u]��o�T'Z�
�u��F�h6�@W��o�EP�u����n&�����N�	��'��n�L0��C9S~�S7
-��JjcQ�,\o�
�.�1 j]I�V��5���L]REе�EE_X�K�JKt�}��@�"h,�	*�뗫�V�frK�/���A�i�D>!����)?��Ia�3Qym,*�U���!�DD-l�G#Y^}Uy�Mں6R�E�P�׃��!��QWБ��&*`49���HR��ޣ���N�W�Ux���ɹY�
J�*�E�[G6��D��J#g?���U`u�a������n)�͛r��r�j�)����7G���L�o��`3A!�����"��Iad��Xo�D�+	
�Zol6K�WڠPg�~
{�S�ˉXEiC��6o��W�
6�U�eIAo����.T��K�B�~H��C�<Q�JN
-ӕ��$�T$bӂu���6o�L�J{rwmP����ٲh�l�u.WG�FmY�"췙����Px$�~��	FQ&��P���]oI[W�IENЙ]��&m�h6�D��$��$ѓ6�I���k�5>}�
�\��q�3�f3�F*ņ�5��
�|��m���*ܤ
�D*@�7��f@��U��\��U!
��h�6dp@n�4q�}ʜ�&
 Ga�6dp@*�6:d�		OW��1�^����4�
58
�:�o`4�
���N��Eq
��|�6dp@	�� ���$�l �f3I4�
H��@�f�h6�D��$��$�l �f3I4�
H��@�f�h6���<q IDATD��$��$�l �f3I4�
H��@�f�h6�D��$��$�l �f3I4�
H��@�f�h6�D��$��$�l �f3I4�
H��@�f�h6��ou�X���8
-���NX>Ij�hx�ș1o�+�'\"Ҝ��$A��3#��G��;��0�\�䛔��{��y#��� ���-~$��nd��hn�Z��q�6�w�Ά	˧�g��8���DO�W%�3�ݞf>j���-�����v���w�ٌ��ngx{#YyF1f��	��@4��
-����l%7AI��7 ��f3^�c2+��mŽ�B�y��fUhQ6C�/Y�<��؁���A�0��nK�ϩ�Y>�Z$Q�.��"��gU�39z҆na����m
�9Ww3�dDy	�c�|I�Ou�
 ����Jû}U����y����� r�
q���.h�l���l��˱ˢ���E��p~2�����{vP�f3t�Ύ^�Гͮ�E@�	yy��}�4�1�[4����ti��������k�Ӯ��{p��3P�f3Ի�sN6��6��>���=����t;���&4��ӽU˪j��|@��dZ�@	��Ply��n��`K�@/zs�~�g���l�zn��M<m95�P�$���o�I2��A@�hG�0�f��~xC�fe���煮\����,:��x�O�Mԩ���SM�.+�ޤ��A2�k�/?�����2�$WյF8r*eF�:�����	�J�HU�$�ߎ�������
x�?�.�I�@��m��z��@ҿ�
c��oC������M�$�l �f3I4�
H��@�f�h6�D��$��$�l �f3I4�
H��@�f�h6�D��$��$�l �f3I4�
H��@�f�h6�D��$��$�l �f3I4�
H��@�f�h6�D��$��$�l �u�fk����_�:��*=܈\u����7
�l��3a��8��IAjGx�^�l����Q�p�[�򅒳��4��
�P���2B�S�jY��Ĺ|Uh�m��ƪ�k��e��
�6l�����������o;ȰֆiZH�-�܄$��q�l�7�!� ]� �
z��l���m9w����.�5xIq4~vm�i�_)-/�Zg�nHӷ5������%�y�Di!�
��8V����l>KG��u�a�V<�W;�F|Nv>�un��G0�D;B�R��9� �x�
-?�����|����|������j0[k�Q\:��4WH�R	��4�WE���I��@�o�vo�:?_���(8M���3��t�'�����u2W�
����]'?���{Z�h9Je�5�,
����7�����R���C���Z�Ĵ��{��7$������nzO�k�o��q-�
n;v:�}��`�c
�)���7���`*O�.'���[��o�����)��n���7��חh�,�&t�<gYg>���q�q���dFВ/��/Eq���������|z1�U��M谶e�U`w@�%����$Ar4��y�9�aX��Ԓ
-����ٗ�8C�\mv����T��0�j�������s
x�T�6�h�#��l��z�Id`��f�[΅��5����
����i�#�T�yO����6`�Yv������Z���9� Z�aBAV)	�T��y��tV|Acϧ����ȶjxt��ï`bUa�$��"�_���g�$��<e���{9�5����uF��,e�$��%s.��a)&�n��K�st~g�_��S��Ձ������)�|�/Y���S�|~���9�!E�p6Zw٭V�Ÿ�!Z�`�='������Oy��W��:�e�*���`��;����A`x����TŅg>)ި����fN��1\`H��
iN��.�e��nz����C�B��&�m
-�#��M�T�XBo~���PjcI.'�����>\N$�K z��a�>���pf�@/��“_\�g~[�vY��8o�*H�0nG�ƌ&���W.3�+'��*�k6/o*T
�U�pQ��-���To��o]����2���׫鲶��q��㜳µ�Y8����=�*Z��?��ހ6o+�y_�7(���u��V����eӫ�SE��MqF�rJw�x�v��8G��z��{w�d+�Po�������,�ID�Lr}��Qǭ�8�8��'�oP��os0���Y�zl���觿����-yvD��� o�!��ݓ��t�D�$�:�f�������U>K��	�{*u���I�lo�{��w��>ol�?}/ahᄧ(���l�0U�u���#�%���׋�0����Ӗ�Gx������ڋ�5��x�,(��@��b�ò+1M~��0;�Et�� ��� ������G�
j�),��-��d[@��Cڦ�~���*[��.��i�gخ!m϶�aa-���%U�����To�I&��ɑ�ޗ�8��z����fM���@m��U����r��J���h�� ��f�%�\�(RN[wc��X#���D��t
���!5l'��֫L<M����r�9����%�m��U^P�< A�Ros�o��>w�߄J��MF�6'�	�]�1:&a�ɓ$'�/Jl��?�J�1��sPV���#�OKL�$�to���zy�
-�7TQ��.!��&/������
�(��\9ߤÝ�S�a�O�������.s���C
-�^0�:Z����P�&:�œ]��W��I�j�X�@���rp�$��T��;.j�=��6d�g:���݌�G�_~����OdI�a�!mz]�9��;-�&
-�.�rY��{Ԛ��h6��c
-O���x�A� S�7 �4a��}��f��T�|��Z����9wu����
�.i�k�K�.�"HG��]z����Ta!����#?]�ֱ<����S���֪l����ʹ籓_��|AkUV2��
�T�*�t��Y��+�_wJu���� N\h6P�!G<vv�>�5-�r͉�f���v9�Jѓ6�݌H��I�t
�}|ֺ^���Kώ����ѻ���+_x�E��$�ə��$5�3�6�4��L��[�9���{��2H�?������g������%�OZ�	�K	��}u$�g�̞��G-���m9��{,\{~����/�_�nc���^������r�/������������l���iY�*�T�#�ory�&��#7̴�dg!syƈ�/-qƌ�m6E����*[���P�u$;�,Y��2 ��]RE��8��5��^�%!syƈ�����#̹Wǟ��,<EUP�u�z�3���ua�f*ݯ���9�^`�=P��M�ڱ��{
j�܁�h6P��e��]��pH���\�����0����loH$�׵
]h6�Ou�um�U�Z}]�Cџ{������+��Z$S�K����sׅ����_5���o$��[�!��=IK�zi�����
�%�Ŏv�Ƿ�_� �+q�6�U�)'��t6⢳�������{��n3�|��Z8ۨ�|�%�u�+���5��lL�
-��T���3s�5i&K���^��*�׷-	�6���^�_�.��$L�j��Eq��lFa.?CsO�o�~��ĴL-v�so����ds�'�p��ɉA~i��^��=��
/X��B���p��Ë���aߜZZ.��P�H}k�u��l��.��ۃp�U�ǾLr�/�u_!�ֲ���e�k�S-SE�Ʉx������O[�y�r��nD]�Z�U��q�g�n�)J7�/�U�Z}]�*׿�|������r����k��]�#-SE�ɧ��h�-��<�<T�Ѹ�ûS�ޝ�8���@�ʎFJ��p��M�b`����q��n�ѻ����2���f3�g5g	�{�dz�Z�/9_ff��v2�r�l�OܥD�������i��K�,W�{����W�
-�����XNK/VZ�ԋf���E֪l��*\��m�e{�r|���J�
�`�J�:����0���U�Z}]��~�5�?�y�ʹ/�k�Z�oęL^K�'\H��<?�
�;��n3�}<~>��k��_����|�`G"'&R&KMx�mC��!��`++�C��;��������b���F���I�d4����U�^�V��^q��U����qr�������݉��/�ƹ�Q��DZK�z�lƆ8p`�;�?&u.��R�.
-�H�s�9_�?%(\@/F������菦n�����$�96L�6Ⱦ�TRQ&I�S�U���x��z����m�r4;�ǡ��嶁��5����/��~��[�qݻ��y�����T�
�����K��Goع�.$<�?��ߵ�q@
 GpL�����~	
G�\R��S��Y�z���vJ�甝��u�=�&T��=���`c�K�o/tv_�5V�J�Je�e�K�C�z�ټ?ՏC�1Xek^��k�WEe7`HS�"�o5'po9|*;�7g���m-g�Z�ԋf3�5|��qL�`��H�_�ZrA9hE�F�
-���)}��U���*nI�uӔ����`���tJzi��r*~�[�wأ��rV�%N�h6@V�5�w!s�+�U�sYӄ�3�5dhF�?�q���f3�
I����3� �Q����S��<@�y{0Xekf�b���9%'[ί�b��+-�7�qVF�؄ν��܉f��|�ш��J�;��ٌ
�vb�k9��:ӟ�����/��Uؕ�㛖8�r_dlO���`���p{�
_�V���������"ےW<U!���x�NPy�	��i-q���fV,L(�.Xr#�E�����槬o3�,�;-ơ�`C5��2���;4>)�'���7�Td���4���lޟ��U�Z}݇*����2#�߶�����;re��w��K_�
��q��h����x�y_u�Vek�}T��r���U�d'�
�ܟ6�}]�;(k����4�������y�����"���f�|<w������Ӯ�r90GC�|{Y�ǟGĠ�r	F��`7�oK�~ס�&�%ϕ
0��ə���y��c?�ta��|����@�u��O�'y;�N�hYGL"s���t�UM���f�k.��U��b�޴I��3�J�h�yck��{	C�W8�}�IZx�\�>��qϣ����h�?k�'E[����JО��7��V����٫����7U���{������Қy&�?Nek-[�/nZV��8U鈳�d�q�I����z����<��~	�*�mH�R��w���3z�����֪l��_|�����p{!�wqG�k�2 ��]RE��8{+�9������������-�l�zѓ6}
-��2M
-ɦ�����
h��n~�[G�5ܧ�oYW>��]�KLJ,Ks�6�ʄ���sg�T����p�~���u�c�W3����������6�r0���ʫ<�<B�E�y���kc����랪<�=�k�+�G�5i�k�L�.�"HG����3��:gP��Ƭw\�ve����T������ХN���6{��@m�*�$D!���t��vڞ��\sR(�{��n3�
ͼ�̛R��L_�JmY_LCO�6�p��r~�i�����p�Wc
r�z�mɷ���_�Ԇq�m���=~}霓�������YOK�Јf���`������Ty�k!UpQ�K��go�q�נ���<�/h��ѐ��Y���f����v���*[����r͙�څ���g�ͭe@2��� q�V���,Y�
M˝�;����>&��u��w�
�����/�2���#?���rh6�Y}��mR����9)�"��a.?)��yv�#���"���/�v�j�m�U7��M���7P�f���`�����^V�O��|'���~}����������"HG��u�����|F��<�Od���1���ټ?�=X�����U��+��nr!�
-
iTxU鈳��^3ǽ����dy6�s���f4�
�2��l�r�0�)����9��+4�
2:/v,_�i`sqߖ;ݐ�gG!��D���r9[���p�/����ۼ?�=X�����oU�}!���.k��
����"HG��5�9�[�8K�Y��{�q��g��8��ټ?�=X������U��tu	����� q�V�
-
����h�R$��w�1�l>��$�_�)\�ɍ�$L2sA��$u����	��&)�6�ѓ��g���Ѯi�+����m�[Rw��
-\dx�W��j��a�
O{~?^�8��p�����O8�o7r���p�@m��)H[q��(��<٫*�;�y�w�
  �^� ��Z-@�dr�~N[N��W€4����q�6֪l���[���!mY������9 ���� q��%�%j�M0���%N���%�B�
���
����e.�)��0Ɓ�,V=0Yᅠ\�L��6Dž�{�F~F�{��n3�s}����U�+�%�˖72��]�l`]�~�|��O9���	(��ۛ��������հ"4��B���ӝE���v�U�K�3�0�f���`����뚫�����]��|�
g@^A:���c���������(�k�*�=>�ma�����)}��kU�V_7���B�cc#V�Uf|�B��Pq�U�#��^�I�e��p����4�t���Ժ������	�%_�^NdPX�����N��57�
#�N����2,y�f3����3�\�l����b�N$�lޟ��U�Z}���H�Ft��k\k9W��x��8��goZ�t�Pt�Y�Bճ޵�����!�Z���׵V��P�S��XW��8
�����"HG��u�3N7ɧ���of�gJ9o8����*�e�ԋ��,�o�7i?��_�H~v�J�ܑkC��ƒ�-h60��&���3�q�y�P�>��Qn���7�f3}^�	���w�7�G-��W��<���܋�U�Z}���̾��^˅��h�%�g_*��z4n4��g��kU�V_7�ʅw�%������CK�����_o��uù��-	&i�>�����\��z����fk�j��*�0:�zv|���.;�������~	q��B3�U߁��0���#������xux��V�Lx�i��
�i9���<+yjG���
Q�|ܲ�U����HK��gGϯ7wmX�z�9Grl�f���`���([�=��JVY�b�$-�t�,hHp*�����AT,O�h60���d��R%7�
���
-�=y��^,*n�c��L��<��6ND�\�!��*:8A�y_�1Xekf��>�}��o�lfM>j�.��l͏�����+Z��^4�
`<<����^�G�KR�;ɸ��lޟ�Vٚ��8yi|tU��
��AgAٜ�:;-gkA�aԇ���Z��^4�
 m����+���<�dt
����������f���@��</X~�P-wJ!�l���
��u{�|���h6g���`��鵊+�����c�z��PZ�.���_`�'}wյ���d�����$�Cf���6#�-ۧ^4��!���+�/����o��Бٳk7��
-Wx�ko{6�����Qc��qYZ�
�6E�u���z�WK*�,=ɨ`�3ձ<���l�������B�G�X��Q��	��%hG�dk�5���ҲG/�7����~������ɣ„�<�Q7ig��>A;r4 ����G�
-!qHە�fs����3�C��*[��[Q�n3l=F�����m+���,f$��^����ߧ�Q IDAT
��eod�����p�T�U�Z}��:���9b�&�u��
-�4Ɵ�aٟ@ -Yl�8�3�4=ϫM�������8ȼ{R|������y�w�$o'7>ɒu�$'	�	���\���UW���I��Z�Gf��>nl�?}/�rx��4���'���﷐*c8ϳ!e�_z�;&Bm��W�j$j�>��%ߡ��Yҽ���J���`�}��/�у�ß��1B��4�8Pkז�+�
0Hܨ�����L�+*	dž�v��Pe�{���n�u�B�5����c	��
�
�7_�q�q}���6��9�4���'�^������*[���P�\K�棔k�*s��&h��q�,Lq�h��]�ǹ��Ѳ<Wl*Z�O�t7���w s.kU�V�^�����P?�k���Xe��Yu�Ҳ0��y�o>����\vW�7��mh(�����/��ގC�)@�§
-�Ѣ�CB3Y�e��6���>v�$L2s��>U�k�$}�a2��S��_�k���b��=m�d�vM^��oޒ�oh���kh�+!5e���X	X5�'��AJO�~�=�k���Cmnz��ۧ;�����C�|�CHW��{_]���Y�z@�d��I[�Rی���� ��{�7z����u�X�����
U��Xe{�П��� q�6.��W��9ǟ�R#��9wE��sa�"Z�O�h6�O��/�U�Z}]�*'
-�(saJ��:��>Z�Pq�U�#��&��%�uu�G�Fk_��ch�>���L�q����p��M�e��
���/w 8u�y�����sYv\������GRUe�T��F���^:���$J'��K�Ir���|�$e����>����Lⷓ�Sܾ���M|�����������Nx�'a�΍�\��Qx3�{x���l9A���AJx�
-מߵve�š��6����U�Z}]�*�G﫰���8Iߣ��,�K�U��ܪqѲ�Uĩ"HG��
J����O��)ܿ���1�����sr��8������9�ѻͦ(�4��Vek�u��S�@ܡ�]�|��2 ��]RE��8{��{�mq�N�W���j�>����0�
0YUڤ���l���Oq�n�"�G�~���6��,�����l`X�x�$`����I��^r9%~�LV����lޟ�>��X�����
U�W��/R�!�kK@�k�百�?�����TxU鈳�^qzK�����sInղ<��ټ?�=X������U^���V�<�>2X����"HG�����F�vw�}�珟��K�3W��.�^���S/�����a���|+�I�d�$*�T7I��}e���10w7h�'������`���`Kh��*w�U%,/���(<e@_��69�;8!K��w��7$����
*�P�ͩ���Y_j?�� ������9��%���͕ȯ��f�
j�X��qre�%ӟq�C�I��i�s>���Vrǟ�6��̱��t�q�����%`3Ak������&��b1�L6`�!mST?��Z����
��c�_�Y��H������� q��0�Wsn�3���;�ur�g2�?�㊶;-ۧ^�mޟ�!��Vek�u]�����K�O�w
-��������"HG����3,�8�OL}����y�Q=tjY�zq����F�='i�0�o҈{�H
^���Q:�
-Ypx�f3��d� ��۠FQ���$>���]��|�6�:��g��(�����
X���J3^w�8U"4��"����3�C��*[���Xe9]g��r�K!j�8��gov����W��sh�Zֻ^F��޷ȫ���Ϭ���0��I���}���:�ֵ���)3����۪�b�'�9����:���QGw����0�.���g�������K�{�^[�~������ӵ<��W��K	����
-ύ]xM�P�M
-��>�	[N��>z����'l�����MQذT����c��gF�TVyᑒ�Y�z@�Bb�ʆ�����i��?���;�y�w�
�"����j��jy��:U
r�^4�
�?�w���n6���5L�T����O]���lޟ��X������U�����?g'�W���+�v�9;Sq�U�#��F�ٻX��3�=ީ|-�S/���S���֪l���*w*�s��%*�B*�t�ٛ�8�|�+���D�f�I�4�b
������g��k�?�|��^:�l�P9��y�{����M�Ef�9��‘�f3����9��Uew_SR���Go8C<���3�C��*[��V工Z��Vy�^�2݃��(Pq�U�#�ވ��iq~���婗�f�q׶�oa�߅�tMR_���TN���I��]��)*�m�j�7���/s)N��a繸�3��~0��@�^�q�l(<8�J����"H`x��٥����?]�Slx���׻�����)<�(x��a����<;n��z�rsW��
-?o�/۩%ܜZ��^ׂ
-��6;�<��x�
-���$j�X��@W��w��luףȣw��ٳYM�Qx��=����]���]�i����ryl6�lWn�f3}�?�3�3���rN�����+�u7"����ĩ���܋�U�Z}Gx�h�u�p�۱k��:4��Jx;Ҳ0����q�_��i#p�ټ?��|a�����TYP��d�<
d<���eag�C�H�4<�N�lP����ײ}�E��/�Ҽ�Ѵ6�GB�$����紣��
��sn��\w��d�qI
�4�����Po�V�|Z���W�]m�u����?��t�O:�iY�z�lƆ8p����5�n���:J��I&В��3I�C�BR��n��Յm
����!�`��1��gV9���PZ����F]�����
���W�Z�O�h6�P��\�����OT��۷�K=��Ռ6���W*�c�G�u���
�
-�I�D�$�7c���8�����8��qZ��� �m�!g
-af��K �^��r�.�6q�ɹ��{�ؔ�-��_f�^���=��n�_K�<�{�v��8��z(k��#���H�|
�'��$��:���f���K�		ڱ���D��W�
��~d�<���r�̃җ��<���u��Z�WJ>�
-�����U
��C`���d�H�g�o@J&�ٌ����5CV19*�N��Š8����<�+����6�_2j`|��F��s-7R��t�p�ҵ4�
 �'wes��o7Ϙ�W)�\�\T���%����/�mfI�5��>֎�#R��24Xek��9c��2������1���&��
�$h@����r��y�_��D�j��޷�����|X�&������
@�Ý'��Ⱥۜ��N�2x�c���XX�����1�1�stG�m���4���yG'<Λ�8+��"�ܚ�f�d@��~����B� A��2�
-�ӆB�� �Ӊ'
-#~S^��g.��OH�|A�y���5Vq�;��Y�q�M��|�m����$�kg��~��E�9V-O���	Z�e�ԋf36�ӥhÆc�MK�&N�2q�������
GO�g�V�;ş�����
\>>�t�2����Y4�l�t0��q����(p�z'�8��������H����S6HaTA/qw�\��5��m��H�|4�:*��-�m�]Io6�;�g6֪l��n|�_?�#Uw����g@�
DK#N��,φ��z�h��A�����i���<x�n�\�LR��r�����I����I�N^9I�ng璟vT`��ߣ�q��xo��>ol�?}/�rx�'**�~�P�
���?�����O*��e/���o*��aw)��_�?O}������R��-����uʫ�d����߃�;ݬw��.�_��8P�7h��
�
-i.�C�Ӻ�9w�֡y3۴�Y���$�4�yY]���
���-��v��֐�
t��2��'l��k%�٬����GѦ�ԝ���) �C�����\9�ܲR�*GK
-���ͦ�E`�����FV�п��żx-����TxU鈳7-q�����K�g�<Y�ɺ���{_����*[��Z�3j8�C~����ע�����@0�ޖh	�)��� q��0��;��S�^���'�~\�����f�}����p��Z��Y�|9To�
�Ty�4�M���O.��Pځ���Ҿr0�e��e�>c�]|`��p��	���Q��N���/8�
-!��*��i�EI�������OY�ML&n|A�y{�Vek�u��|���*j�k�L�.�"HG��M�s�W�%��k����OE$!ν�k6�q���|d�:kU�V_g��˪���-~8G��K�QHE��8{g����Q�K�噙DD5���du	��0��GH�:
��'���V�%�m���=��
��[�w}��U����Eo��6�A���
6�Q
�i�?�@��NJ��O����$�OL���Nw�ռ���7��+�r�lޟ�7ЬU�Z}��*�-�wݜ�Ç�W������pNɁWE��8{gC�)��ǹd�GՌ���?_���eŹ���3�B��*[���߉�ט]��Aʜļy
��8��go��l��)�Q��4�zDžf3��MC��_��x�O�)���%�B��h6�?�<?�m���
YY_&`��>�vhv��g��Yb/Hs��D!3-��+�"�,-OT�ټ?�=X�����%��x?,깤ԭ��@�h�	�^A:��MN���A���~��,gy���2��	����!�Z���׭���dT���
XNŁWE��8{�g���'
-WW�.�����q����d+Z�+^�-���AwB���䁯�h6��	iq���q��
�87�&�`�f��|��@�k?�>{���;MR39�0ɫI�m���O��D'#;����!��QrL^�2.�
4�DCK �9�7�0�pk�Ռ���SꟉ��T���/|�������?���?[��V_g������W�o�𩌛��sH��\�8�6��������-�^E�*�t��ۜ8+e̻���q\�H�Y���a_�AuG����Y�5�/��-s$��&a80L�����͛kb����i6�V=��c�;���O��v�o�6����#<~���V��
�?��,���
g�X�7��2�9�KM?��W�?(,���q1�n3|A'Α�
�x�z�45�,��fxv�95��ķ*E��mI#�L��f�j+���\4����Ϻ6֪l��NX���R��l�y�����D�rT鈳��q6�͏s}:�����z��%/R�x�yJ_���Z����M�����Fbn-���%U鈳7�qN���J�^���h�m���k�ӮM��|�E���'`���_��ڀ�כ�])Y�p���	}\]�����H$n�D�9��f3)Y0������{$�#��d�Da[z�<ݾ��jF�͎�,I���C�m���QeI��7�1�Ȩ
"�� �6�<�y�c�c��k�Җ�%�����w��!�G����׭�r�g�|��Pe{��V�d1�f��W���0N
�7Y��=wYbv���hw��<�
�~�
���^�BdQvE����@+�;Ϡ�,{Q
���j��׃�^�U��@�	Ҵ��L���x����	�-'7�q��������ӿ��I_�>£ڣ�l�aP&nH����8����Z��f�V_	�/�ڵ����uÙ�P��q���
�q���!�˹�?��%���ұ����Ea��z
�<�Ję�czx9�\�ǡ���]�:�#���4�%?���4��y����`�	X~�
}Y��[X�u��\�ď�w�G��!�Y��#����t5\LӅ�� ���,F�}�q�\���9�q�~�J#?��I��v��x�K2
�C���I�q�Y��>�qa�� ��m������$������09������������f�\k�};Bb�j2q
	�{�;�)
iR@@7�+��V�?;&��d�9ݙ�pa'���I�����l^�K&�@[&c9��Tp�\@�B�7�;�S�ptt��I=ݚ�ɜ<mX�T6���S������h6;�:��N��Lܐ8�,-
k9��b���	I:�k9q�WD���
-׸s/�ޠ������Y���_����Z�q~���	d�%�8�_�O�?}Y�tm���5�|AZx�v�V_���o���7�73>��m��P���3r����~O�w������3!@� �%;SQ�gj^?�ކ��Ÿ�k{������Oؕ�n�Jɧ�s;��@;���0B<�W���1��dZ�PVx�ou<�K�]`>N��8B��P�?%r��wu�4yj�o\kbÊMB�y�Ǭ���W�ȍ�*��
���$�6�=��vF^����-��0�cV�N�5���f�Y��)2�̄�Qg��6�mF�٨�9ry�r��j�����z���:�tdjZ���8�8�CҲ�eRC�Z�n�hsV�t��U��������i���ٗ�8��)<Λ�8��������݃
P�w�Ζ�
�i�E�`����ޝ��r�g���5��ٌ
����f��7Y3h1�tGG-��0�G�ݫ��q���\
zЬ<��_��<��V��~l�
-$��e}=ƹ��z����S������g��1�l.|��i��1�e��
��/�~��100���=�`q�YH��Rգ������g_}^�?�S����~e��#���k·�VΎč/~�S�ܮs���h����I�<n~���'���.!�w�^Vk`��I��[��ϊ6�6���(����وݹ�{�NnTK�����gj���!�x�$/���y��9w�ݟ����WSs�Ѳ9'.�7�����_��d�'�;{��cv��x0r�k|���g��`d�p����,��!U�r�&��)�Z��v�C�%�`��5N����p��q������&��&�����w��shp]CymVڳ�4�*n�֔��S���3q�&s9�\�NN�,ّ�a��{��c��y���P���%���?;V-��UrxM9���!:����S[��z�yu-*[.���b����?WܖZ&���G�S�T�?��x��?	�G�W���ב�
-u���sm;j3k;q�k���&��ngR�
�p���b]��?�ܹ��3��3e����bU�o��8E����p:��˳�ڽ��Y�������{�5��{��C��L��9\?m�q�`Y
xh�ZR���7V��݀�����p�;�f�V�r�������o��[)<����Rn9�j.H����X�4�����3�c�}L��k-߷��$`������e�y�?����j$�qKC�4��7���{�w�7�
-��+���^�*��,ӟo<�m]�哻UӒ"���Ut<Z.|yn@q�y��'3��Ĝ+�}H��I�����
�?��s�d�x�w��Ϭ&Oy����1���B!�jy>ұ�BJ~��С��[}	����#���M��I���L�|I>���w�f���[L�z������fx����8y����d-��8�mp6x��E�E�����
-!^��r�ƌG�:�
��#Kk�^n��O�����#�vd\x�_��d�}���k.��������Zּ؜�XJ3����Mf��nn��}?j�����g�.��W9�o�s�o�5�ܪ7Ӗ�]k�����?ق1���3?�f'�d��h���遻\��!E����gMu~���G�}�6�\Vu
C���Z��
`y�&�V�5V_�ҊX�<�r������K8.*�%�g~��c6~�P�
-�:�����C�wAۤ�|_�vS��"@���.��fUBJ/Z�X�
 �p@8�?)kr������<sO���]�������7N����QԎ�	:����6(_��l^�m�|���wb6-@�b���sb��{��,��
-T��!�i��3�Uvxhy�B��r��3I[o�_&9\�?ۚ�ǂ%�+�-�^s�Xj�=m��A IDAT��t��ž�VB��[�r»�w�~<8'o8{�����Xx}	��;K�=-�^9H�ve�ŵ�fV<�D�OJ�
-��'
&��#�
-)�wZ�c�����I`��m��S���8�NJ�u��֟Y_�����,����a���9:���K�vٹ&_��;9Y��$��Ƚx�HB�C��s�i�OZ �m���^q���K���{̠��G��3�O�ɀ�I�~d;Qz�])ٙ�|���+Y���\����6���W��
Y����h4�͊ݩ=7$�\�S�}�0I90r06GrP�1;7��x��Tdm�����}0��T���C�`+�ʍ/0��=�`4����X�N��ܔk���0Nb�j�uͬ��X����	��AG��h6;�Zs��sH�k�8N/me�=����	���:UU��D�ReA��oS^�c0ny��R�����҉�/��>N�WՅ�!mqο���w�:^�n��.��e�ܛW�/zUP3���u��p[���&�w
!����@N]*7���?�4�������A��F45Y?�K��'��g�֝={H�q$^B����l�5�7������1<Q��[	S�[�޿��}�ɵ��%�^���ak��:.�������^]�&�k���<��=�d��� �������%Hs�R�F��T�q� ��@�v�οw�S˖ÂQ�rtCe�^K~����B�Ss�p�6����e����9tc���s��^�Π��S�|�y_�9��vAv,���j��_�^���?bIjCO�r#"_������q���L㿃�*����\��n������+�k����|���`D�
-z�%�ў���-���3�);Ov��}sv�6���6�:q�y�����\�w�-���޵�Y����-���!��d
-Ado��l��/Z�H�}U�����`
-�Z�I�:z��f�QC/�,���<�ɬ��	��C��j�*/]z�V���,�ʄ���#��*g/?����y�5N%��f�;����S��/'ˎ
-��
�W�`UT��c�m
-�o�ʏq"�f�w&����۫/�1	���8In���B�+��8�qs���v�ù`��b��p���ٿ.>�	�cx����+�/���k�-	��p?O������+�/��PqE�[l����^�p���W������+�K�_�\���
-��V�Ks�v����h�Y�8+f�\姛݋��=�~��z���ey��ns� |eT0�{c3k�uTyk]��?�k���	:�n�J�w�����,��L��
-}����F��}�\�� yy��ĩi�pD��oK��g�!.�~v]�u�X&�Jm���%�Ţ�������ٿ������Nw������N�������s<�A�]�����b���[���U���_��sa����̕��o��Lv_��ܳ�G������WS�Ǚp������98� MK��隸߸�ۢ�˝+�7��s�\��,���''q�>�L4�{̻�i�e.r�98�k��Z��z<	ZH;o&����;|����񘕯���>A����� ��	4������,���R�s�^M�9x���lv�C>���%d�8M�r�=0#9U�d7+
[k�[����{ٴZ�G�Ѱd3�
�U��<'�ה�����J��8������m��	�
H��.��$db_�S����D�ѭ#k�u�<!�H�r{�
-�=]�Ύ6����?��]�ܠL���ch�l��H@�}�ǹ�Ѥ��'��lv��M�'��L�kv���o��C�֖:�����9O#'���ê��r�����ȏO����Ϡ��;Oe�vw8��FO�����.��=��Z��x����W!�*-�H�w��L��$���L���a��u)^��%�>� x�0�/9����J�����A��s�c�ߐ
-Z�qT�u)����PN��S�+ah����^���q�^(Aڪ�ޣ���+r��]���}2S4fm�5K1�m�h������"qn�8iē��9�nH|�h���h�I��M�t����rE�BU��s�*�6f��h��1�q���#����@��DӐu�0E�G�K[�
����	6��-&~��,����+̽^<��}F���Z}ݺ*��h-��Zm�O�6�:������|��	�g_mqV��JOE��d��e�4�qՒ���ɩ�9�{O)U0��}hB���8�"ξ�����?�dw
-h;��l��C���.�
�9�$M/*c��]Bl�f3���;�c�����
���紛_Z-�����2c�V�ŦN#��*�R��ی
��ݾ���:�U>���s�2��r|#Ε~*5�rZ���M����ؐ����׭�rM�C���{�����$K~X��k���Ce���������O?�K�"ty��s�7��,�^q*��4�g���*����_W����00��k���K���8�-d�{�q�Y�A�
&~*�I��^~<�&Ҟ�<�������?�������z]��].<�o3'N&���3z�7�0��I��(�^
-`D��MRX�|5Mи-}�$�K+���T�w��^�IB	�Ó\���r��M�<�_C*�+^��-gax����7l�����ş�bvŏ���x����/��3�2*�t��ѫ��U�C}��s �-_	Ý�qƋ� ���9�fg�5N�μ�m�~n�K�l���}�NN��oe��ؽ�綑�3��J���>6���.O�vε�ڷ#$f��G"̌�^�*���wI�g4k�uk�|<�������O]�ll3
�H�-�{&��^`.M����G�%'oi�b�Y���r?=�V<Ӳ}�E�y���89�����v0�9Xl`�X��[[���n�lͭe�W���k�:�]�1�~l'��=h�<+h~�j-�7�I����^4��s�rm��ur&nH�q����q�+�;���~^���p�"���׸�1���Cʙ4y˺Є�]�V�=�YJ��xι�1�1h6�����7��ԧ�א����q��5��:��r��'�
,�|ƪ��p0���#O����g�B�+�������^�.:*4ni�B#��+���.�7�w{����?񅽉}����9�*��㴹�����e�«-9P�;)t&<uj�A�ĩ��y���k����W9Xf^�d��;M����9����{{3Z�H�]p�J��f���3,9[�`��NX�w�<w��;��N&������/?�,�q6�O��1��L��L��^�m6j��~�=��"�}-Y�sh�@��h6@���4�k���s���(W�1i�g�[wVni'`�o�,&k-/'.4�!������x���&Y^��&���ȿM�ڹ�F��N�ܟ�ݝ��a�`'m8&�%|<�|��)������;�+c��w~��]�{���`9����.���A�V_�������;dw�D��?�|U���6�|����蟩�?�u�����P��s5�H���=��n�񕕠/�ʭ���,sPBn����M���}��w�
����T���*��`�|{WcP�vQ�.��%_���@�6��.?��vB��V�������r}B
-�����	�z"�!�]S����</r0t�O�{}p�@�\R���]�B�G��4�k72e;�6�8�?���N4���Uh6�Q����������O��_��_c�o��vGv���U�
�s�}���(���
� e'�̥㸴�h��Y��>��:ξ����e���^4�W*<�K����@����\��rr�d�.��
��$�Ϯ9��z<��ʽ/9�㴏{��d�2��_=�ܠ.���vw�.?e�(�u��YR-��|��H�X�f�su�87ΗÒ�}%3�7��|���|9������5ii���=Y��
l�c�v�Vh����r��T������,�Uq������KK�z�l���?�׶��i_���b��>�p�����쀂�‰ц�9�*Y%��ڤl�5�f`-���=�̹�;(R���Y99N9ޭ��V��YH�2oD��
���������B��Ʌ�K�rq�T6�X��10�敒o7�S�?Z0�����.��w�嚒en��%��G�[����3����ˠ��U����FK��rU�׹�_��\�r�4�Ur�x�YH����͵�g�`Sn{�Ր���$'^͊���X>�`߆Y\������8mn`MB����D�y����JriK�l����3W
ū�_�W? ��CB���#,�`*�jn��<��˗g%-q�E��ٖ��]ky�Bl�*	I�B�||�
-3�ou�q�f��ii%c���}�l��*6XeFh9�g_�ٗ�8��!ml�g� �q���>��Uؕ��q�"#
-��6�G�9
h�%��<�rʡ%N�h6C
-�ْ��OR3y�$���$���ӝ�������t�e�$�l�ɎH0�UQɒ���M|�w2����-�`��T�%|<���b�=�k	c��r��X���n��
-�Y�x�>)�����{仄`�x��4��㿓s�Nή�R�8,6?G'c(g���]����'�8�W���Oq.~uQ����{b��_���9)[�:z �m��<�k�8�Ã&tA|�&h��e��_����8�`��ꌳ<�ɬ��Qe��g��9�{y��\NӅ��s\���߈���8w�}��]������D=��$y��X���i8��]��^��^IRz������Z�i���`��5Nb�'��%�����k�Y��c��) ξ��	\h6;�Zs�����{����JK����irl'ǩ�{C�0~�q�� �y��w_����]-���8��ټ��L<.
��
Sդ�^����
��U�~�'w�<~��02 �f�s�S�플;f�Wi�^�j0��W׸�Uv9_^�]"Ov	lƿ�L@�`���t�����X9
��|��6�;��X����Z}��*7�[��ʀfwFN&ٚ�\ԟvM�����~�v�(;S-�7���S��hby�w�WJ>�\�����	m��_5u�Y������2���r���s?U�V3Zr��J�߈���q*��$Zֻ^4��)䳶B*|��_�`�	P��˓�S�S	`Ѭ4��i[$��0șp�N�q�٨�9��Aw}uju����ؐ�{����2lD��8�"ξ�ĩw��!k�����Qe؈��q���ˏ׍6�6{�ĩ��w����@;� �Hdj`�ᘎf3@�Ǡ���9A����&�����*���wW���
Y���6�pD������-q�W�g��M��������w0�2y%�p�`
-����������3i�K&N�ae�/yn\���ewk�uT�`q޼�
\����� �����W�s��Uw�r|#ξ��/-q��Cښ$���gb��Up?w�~��i��#z��ڳd���2`L��`�$�����^Ǒ�]����Y�B~�;H��A=>y�����$a4-�7��8���^4��{��{%�љ���]�P�9���*Y��J@?���YۓY����)�a��kٯ�
kh6�447�˽&y��s	�^^e�9=iig�	:~�+�$9�W���3e��
��~�
-p4�/�{܄d�1?�a�7��~	ؑ�
�zu����W�za̷�W��l�>i8H�5i�y���Vs��ވ�ִL���2���oT����M�k�zK+~1*R)��s/^M���F�}g_Z�ԋ��W:~�ؗ�6���&�]e?�7T������1+�j���"g�3�����M�{��~��&�$g5O�p ��%��B\1˗�~0~0�.�/'�5��?BPZ0������Ԯ���ӗ�)�
��;���
-�^B���T����%�Z���}†�=�[�,���O���(�ߜ$�@f}��?%8�?S߄�dm�»�j�=�p�٢���hq�[�H9��$����w��I���
@
�6cC��[�����-�7��C�S��Z�(�ٌ
Y��m���*�F�߈���qΪ���'4�
Ȣ�@]���l�e��-��#r�������F$'O����yn㒵K%�d�qZ�������
��6�p�略���W���K�}�����A��&�9+i�f���*�ϰ���4����D���l�)��9�g_�ٗ�8��٬X�ryx�5�й�����ak�ҭ��Qe�$o ���uyB�ŞFT�vz�o��W�8�Íߘ
-O��J�Ǵʓ$ǟ���`��q��z�����d]��I���f�\k�};Bb�&���59~����4�1���ɺ<m)F��,Η<W�e͊_���`[5���8uF'k����LJ���H�0�kC��f�s�S�����.`?f��4�?���;�J8k�Y����VkN���\x�Zu�vz�o��q��%N�h6��|�*���W��}��y�;sT����Q�Z}U0Q�d}��8Ϋ���|�l���F�}g_Z����e���63����Ypy@�ÂY�r�o�f�}.���=��
��	�����l��:J/A/�,
liB>%e�pʁ�fl��
�Z}mb-��W��r|#ξ�ĩ�s4����X
k�ҭ��QeEdj]�߈�/��KK�z�l����f�w2&+ ���m��ޯ��<��9`�o][Wv���G��G��ܺ-H�rʡ%N�h6?���W�x\&��\&~�#���$`kk����$�����]'��-�)�09B�~}O�v�9^�(38Z�o�ٗ�8������f�eǏ�8�cޗL|M��:��l�(l���*ȸwQi���	�pG������Ir���v?�p�QLN�Z�o��q��%N�h6��o��q2wƣ%�H�p��ￃI�3ʍ6���F}�M����w���$��k
-��i�����d���0(0H�|��h6;W���'�%��>
��5�Hy0<Y�#
�+����?��S�1�W�s׻��
o�l^iI&F~|*;�`9�a����)7��1���>��Bk�`�~��g�{�ۑ�w�%Eg_Z�ԋf�s����%v
-fR&N���6N�r�0쇭��ϴD����kW��;{�js��DX�Àe4�<&����rn�ĕG�|�j���d��\��Ԩ�93u�B�����ky������\&#Dž�=0K�q�8�"N\L4�����o&vd977qs�|/`��L���욤\9y<����R��������_�W��5
�BV����
��� �_9	�Â)]r�����P�������{���f�u��^źֵ�������2���۶�r699-�7��8���^{>��\e��X���"�Ѯ��r�/����w��/*q%��r	����:�6iН�f��h�W���4\���$PV��/��
Bq�9�D��#
-�dF���U�ף�WA�
-���_��"dMhf��l�V���:{U�V_G��}i��Uĩ"HG��g_�	g��̭Wd"G������� 
-	��&��������A�l�΢�2�ns�I��Y���bU��I�P�[��;������*��^�5�I;���r���qQ�3^���sձ�<+U�$/����4�����ΰ�{���������
�G��ص��>��^Wp���`��d��c[�-؏�*_ƅ,�d�B�K�bcy>z��$/O!�����l�w��Z�g�%3���ؤ5�̛EC�2�죙��rd����ø�G�$ǖ#9f�	Hr��ckc��l����0��2T����(�!syJ>.�ccy������7�ˁ�]�>si�b�������(�Q�uU��<l�Y˶�	_�����T,O�r��]��⹕�<���W	>���:�y��?_�I>K��@�q^l`w��6����!ml��'�F2�Ue�7Bo�i��l��Y26������K��[!0�1;��N����$/πŻ�v�O,��y�1X��ݳ�3VqS��ba-�ݝ��|4�c��g���"Jf]��IDATy�MD��&y��-��婋��i���xH�,��d�l �f3Y4�
��T�&A���|￭}��r_3
-�&�b�l�ȥ�8�&�2�/��P���
�H��C�����q��q�\��U!
��d�vdp@�4��}*\�&
 Ge�vdp@*�6:�	�/W�?&Rʽ|��
-h6jpuH��h6:��w]�΋�Y������tm@w�
Ȣ�@�f�h6�E��,��d�l �f3Y4�
Ȣ�@�f�h6�E��,��d�l �f3Y4�
Ȣ�@�f�h6�E��,��d�l �f3Y4�
Ȣ�@�f�h6�E��,��d�l �f3Y4�
Ȣ�@�f�h6�E��,��d�l �f3Y4�
Ȣ�@�f�h6�E����V�u�y��cC'��$7f2�`�˜��'I�]�t�g1��ߟ�>����J4����<+S�=N��*g�~����K2����r�`����2`�\ʳ������r?���!m��ʝ
�OUΚ�y�#�$�r�9&g��Q<�����g'�ߩ�� �
f��fXѽA�X����\�vL��>��7��s�xD�&�m"V��B��3P96ɑP�l��h�2:P�f3��*�zLE�GȒ�7?lV��	�����ճ�Ϳ�ٌ%�in6�*�$_1����b
��cҿ��
tA���ot��jy��9�� ��͕;e��u
vB���:�(���Lǥ��L��������9s�����HvIl���e�#�ݓ'��}u��ϭf�/��P��k̕3������g�9�^�YxyWQ�'�#�lJ^r����eBO���k�Ќf3�B�/O�5���=/�R����B�x\�}��^]!^{9����4f�r��\�@�f���7J���&k0�Ў����hC���^�)\mmk�S�O^�J����G�ǵi.�0�c�,O�<���_h3������3Зr޾���s+���R�K{{���x����(��%����w�
asT��젦�������+5ɬ<��1�������� �%���h(���W�ٿ�Z�	����fXAߒ>����.8���&֐�
�B�`d�%6G_XC��Ϯ��C�d�l �f3Y4�
��?z�{��K�IEND�B`��PNG
-
-
IHDR�/�7	pHYsMM
�έNtEXtSoftwareGPL Ghostscript 8.71?h4�IDATx���1
� ��R��d��NA֬�����v��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@���l3$��6@����:�o=�e,m������6��fX�K�
`i3,m������6��fX�K�
`i3,m������6��fX�K�
`i3�9B-*ehIEND�B`�
\ No newline at end of file
+
IHDR0�]H&�sBIT��O�tEXtSoftwaregnome-screenshot��> IDATx��_�I~���!�����m��F+oe��z{΂>�>w�I�v�2h�AG�q��•�v�`Z�/��|h���~�a
�DܽX�0�iQ{�Ug�
�����,iW��m��N/�=d�!����oVU����~P ���"�Y����_xI��B!�B�ൺ@!�Bq$�B!��ڠAB!�B�
$�B!��ڠAB!�B�
$�B!��ڠAB!�B�
$�B!��ڠAB!�B�
$�B!��ڠAB!�B�
$�B!��ڠAB!�B�
$�B!��ڠAB!�B�
$�B!��ڠAB!�B�
$�B!��ڠAB!�B�
$�B!��ڠAB!�B�
$�B!��ڠAB!�B�
$�B!��ڰ� 	C��+5s{�f̬�gb���B�������s�fi�T�L�縘�^|ϛ�����4xB�"i |��|��K���y�+�<��3G{!fh��~֋��'����J����ϧ��Q�F]L�~ob�����~�a�$B$�����S�h�m/��S� )� H��l텘�>6g��L��T!�X��JR�Ϻyf��Yz*s�o��[�b�w�˸��>�Jշ�;h�A��G���?�{����>�����Ww�1�˙M
�q��q��QH�	3�L���^{}��yfFZ/��N�?��?ɴ�Q����F��	����^|��R�'!��ɇ~x��m=�omm�#���
2����3��&����՚����������y�	?��/N&�滘��k�Ԅ�h>��C!D�$[[[�S�T;K�i?������~�]�<A}q������!��%IR�2�\lnn���RJ	!0�ڸF z�'Xp��-���Z8�����C;���[
�����Q��G�����c��/������&o~�/_�g/��$y��k����;��������ٳ/|��_?���xz��g_Y�o^��_�[��Q�{xx���2�2�۳�Yc����}�sKKK
����~p�ʕ�ϟ���ko��f��X�����֖�www�֭[�}�3)�Q��������NN����#�ЧLD���ߕ�1��O$��y~�5���>�g������mb�W���XZ������$�^�z����Oϻr��˗?����K�g/�˗.�z�$����B&�Y�o]3mQ=�s���Oj� �z������TI����dWP��}�1��>~�\�Yﯟ\�y����}	��}�ү�#Wp����^�^~���yH����=$�_�ח��_~G��/���$	��>�8y�m|�c���Ғ���K��$_<�ʑ�`)��u���?���w��|�Vp�c�M�����˗��g��ֳ��3\>BKϞ��LvHF��O���Q��?��4����#|�?��%��~����p��C;�}��k�R���*B ���[&�|x��0�r�y��PX�y�7�)��O���>�ޏ_��ɏWp��.�}�_�d���M��Kx�1R���ޟ������������W����O�7��;~���k#T���c�������k%	<?���������__�ʫW����M��'o�����ɛ���/'���$_���;� i%G~���a}���?��_b��ޛ/q�4��+^��Hy���
+�+��%����e?�JS� �h�He��]A�Q[#���K��7>Ko��/���H�����=k������#���F����� ����S���>�$y�˗��^�W_���?z_�t!\�����D�Tw�&/w���������Y�v���q9�3�/0�Zp{���/�T�d
��a��Z{�?{�IZ�x��w��?=b<�
��?���q0�q��$¥84��������@�D�immmmmmi��M��wz�����q&6k�YU^�et�r�y�����d��3k��W�˗�ħY/��ƹ"x�Эy��O@
+H��w~���kI?������[8\§cu��%%�M%��,�)y�^�Z�i�A��������������j?��z ���ٳ��óa�u�!�O!�����͏�uWٟW��y.f?NM�b��I!|��G��L?��.%RT���m���x���H}�ٿ�<{L��~ d�I%��H/����I|��w��2[���_9U�kn#��5�G�0�d��_�E��
5yR�>'�4:S��Š|5
�L�];�����`\������W&blO�^NM�b��I�:KW���k?����~>�g���R/�^��ZR@�6rco �!D��`8	"s��S���͂��ȵY�)y
TI�7H�D����:n>�o�����&��o��g�o:��h���L�[�?h?y`Ap �����ٳ�ׂ �ݵ�e��ƣs'���O�g��`��2?z�K���z{��6k�s�����y��*�`��<O���f�����,�9cm�Yۋ����}���/e"D���=zL� H�`I�Ί�<��V2�����w󟭬�$yp-�피�$�+W�����M*h/�l�7���3G�������2a�I����?;�:E2�Lf����Y�~�qJ�$IZ�V�C q��9S��g�YݾF�<��u2�Ŝ�'�66�����Q��Y2����v�`�糉A��O?4ј��x�7>��ӺG�(a�<E)t��5<y�����F����7��p]l����*q���Ճ���GA��*�̇��`�J�m���GK����hGbo��F�~o�>�.믟K�b�r�a�Jz��
�f��D�7��u��N�J�''�"\����z��F8oB���i��	�P)��߁?9X{Ϛf�y�e�N%��RBJl���$A�A� �E+a��yC<��⽟$"�����Ր�a'�p�n�k�ů�灛�\A&�v�a>{��aC��ڵkϟ?�{����l(����P��`C�G4���?N��K���z��ɋ����N��7w&�������aݣ U�	�����RPb���_� ���I�񑿆'?�뙿����HŁ�#y0�g�#$6$��m⫯}�o'3hn��8���?)	�$R
����Q
+�
P�q�{�2y�
+N������_�������Gb;p�ADLTI6�l����น�1�<��?z�+B�/��"_[y89�l� �ٲ��>���999
q��/_�=�J�>�.`��:z�K� �A���P�'WOq�Ko^:
�տ��������T�!�%3J�
+pJ^U�
�l���*NNpt�%������2_�������,��qJX0e�%!!fv���K�'��Q������_[S
+L�r#$6$��-C�45v��|���^�Gr��� �/��+�4gRTI�L�5'J��.��"()S=������lH�"�1.jzx���'r#~��"
4��~�KWB��0e�b�V�L���{W�w��Ex�ҡ��B�� ���g++��a=v�ܜ0e���e1�n�����[/?�
+�a�
���n��^�{#�7�n�S‚)[.�	i++8::�����a�50BR
+�.]�{���o8��
�~r�.�Y�H�A�e>!�/)��hME������\8us������F�
+^�|��>$��l� #_z�}%%D
"\ܮD3u���FO���އ��	��&� .]�$��RJ)�$����u����Ѹ1/rP˫�"
�w�>�H66��KR&kk�KK�>�>}�w����	��i�s�2�{.�t�y��A �x뭷�W�^�{��}�]�za�{�;Z��?�x��qU��7��V�U��!e��qw;���w�~��_�GD�;�z�]�䪝J
+�031
��$��H��vq�>�-�G���~��
��J,�@�D��4m���YU����k�����G�͘�JL��ٟ�Ui:Yڳ���{�����ӧi�X��*Ɇ5$N�4�2aX^��g�aAnD
+���֔B#����=_J
��yW#�8us�F�4!%�J�c�e�ժ���
<����g�^�����T�~ͣ,
nn��*��Ht��Qۇ���u��t0$+��Qg��(��O���Q�$��H��
+���,�p��hi��F*�$��c�J�!BBDJ� ��b�����|?
����"�ĥ �h#�3'�#��	!���
��x�	����qzDI�*�U�H/�lh}Kb6$N�ǝ
+)b��r��6���}��#`?���@��ڹ?`�ԎS7�)aad|���S*	�}�]VJ I��%I�n��	�E�{�y�� U�
Dž��a�Jb�i6���%�����#�޾|�˿���=�����=y0Xp���10>NJ�*�X�;_���_� �j8�y��L�ͅ�
�@�dC����ToAe�4�Ԟ��j����Z>�������qo"=�Wq�y�D����zO���3�E!y��|K?	C�l~ː{~�<���pBrP�6(���.TNmܓ�Wo޴�?�H�ΉB�m/D"D�j�o���N�\��M�܅��ĕ+W�n����Yj��>�
��Gn��,A��ߘ������R`�۵��m��^���͵����W/S��
t:�"x����}��C)�ʿ���HQ��hGbo����00>NJ�*�X��#��I;�?nw/�C��gp	?bF����lH�"���_��/���|�q���J�LDJH	a��:�l&�B���mI�%ei�_�	��2Ԩ$'6$N�4Q�}��ȫ'G��?�K8[F�T�����$���n�"�u]��?N�\����%MHI8����w�ea�HKY����e�������F��
+Z�é�k�Jb�i<#}0��P�(���1�b͓s����$�����o62��V?�]�&EsE�0P%�!!����5ѳ�.
}lr#�n��cͺ}�V!�r��#�T3�,�u���>8K�jJ��Ԃ
�S�q�B��Q^m��'��w�4-�H��sv�nCQ�fON�\�����qRN�$8�]��� �
 Xy� ��S���܈�������J�2����$�W�^����K�y����k�����
���^A+����㜂�;�B@A��F�l	J��z���~�K�YѬ1�}:�	�3\�t��!T�p)��h�E�kAmcL�j;��8_U�E%_?N�ܥ����0א�����~�w��w���`��8Aܿ��dT��* eZӐ�900a��U��ÍV���D�F$�sU�U
+���b�T�ua�J�!B�T|\��R(�������w�~����A �HE��B�i��v�x�_y�n�S����8)	�T�.SX��x|�h�!����!{L@��]?fj�*q����!!v��_��� ���wT�0��������9n[(B�a�;��Uq��(e�v=Y
��Zܺ�+5=� �{�$:Z����X=�$"$���~�}�9B�4�0D��f��ٹ)����Y�2��/_�C�,dbύ;��=�h�
���'�Z9N�D�w� �8��>��W����o��v�040B���\�z��!T����!T�"�k$���B��P���~V���N	�$I�ժ{�"�RI�c�e
+ۏ���V�	��~��w�n)� �����n��*�)[�^�����g���Q�����ryR���vQ~$r��#F��IIP%G�[��[[��d����2�w'�Rg��"���	�`�Jb��!����2���}����ȟi�&=Q����;'Bq�� ��'��o�5��S?�RB�v)!�a�A�TI�ؗuAy7��Z��[G�p7�w�tѭ^/ooYE��ĩ�따0��	)	�T�.S�
������;g;�boCnD@�U�%���5P%1e�X����Fb��VjH�b�����y�f�h5+n�<'%A�D�B�kkx�$��%�d2Oꕺ��)U�
B&��'DѠ�E��zc���v %��ӣC!��΍�D��֍V� T���
)��R
+3%T�� y��.�hf��b{�v���"��vrV�����HH��$-;8w�Qj�t�/Q��5���sI�+o�s�NW�}���0e�b(�P�V*�n����鼋Ӆ�J/)��n.S�J��q2������̫ �υ�	���m��"#00>NJ�*���R�v��ZK�_�|v���G�����߰�Vq ���*Ɇ�S�(�,x'��#
5��"���}�S�� ]�w����8us�F��!dA���6+ON>��^+���V���H��`0)Z;���`�\�t��!T�p�QP��r��#F�������m�� ^d=�S7�)a
,--�=RN����s���#���
x�d�ZH��N���jj:us
��1e��B�!�)����Jf�yS�n�	���qRTI�5��D��Iσ��f\u���zr#�����Ȃ��l��8�rʂG�����6���C�j�΂�-J���B���N	#�Q�R�B�"�q�N,%�z�h����{�A�zb6$Lٲ��m`|b�>��垯���F�n�S‚)[.qzz�K��S�Ԟ��y
��GVl� ���T�2��_��z�^P��p�1K����Q�����V3?2e�8�RixD��Rj0��F*�
`h��x"��IIP%7�<+Oگ�vFr#�z��i@�K��������l��0e�b��W��ܖ����'��n??љIy��n�S‚)[�ۑ�׏T��
��WH.t�)Tx?X\MӰ� aʖ�.�P|�P
g�
+!��*�gH?R�!!E�~��ө�따`ʖK8�#�c�
+;
! a�*��B�šN葉~�`���8us
��1e�8G�}��?�e��p4Y'n-���U��J#����8)	�$�2���2Ͱ�2�������e*�1P%�!q���r���>�����:9uq�N����!_u�n�S��Hw!�����3��IT���<�@�bM���)[S��b;���8F��Y�k1������O�7���N	�l��S>28�\��SɶiO�t�
�
+��̭3�=��s������Ș�E�#V��z������`0�� �Hg�.NQ/��b`|��Uq�L{���e"P�J�d�idp_��'91P%�!y�Ⅾ�nf��b{�u��5�E�T=���S��O>y�ЏǏ�g�ۋ�n�'%�B��k�sM����\����ܧ�[RX��B�@��^юv[A��!��W�g>�0�`�V�a��8��&!� ������V��wB�t��:%M�@w)�k׮=���QT�RʝL
+��~��ɖ��R�+��9N�ܕ����úGq
"$��D����K1�A��
+5RB�\K_!��ԲF8����!-��
��q�̽�%�q�p!����5pY�
�S+U��N�)O^��<��DŽ+�vP��v����:
����uJX���BJB��: �`P�_�Nէ�l%�y��O*���)w�S<J�7
e-� �b:�8�	!%Dv��:%,�tG��p�Gǜ6/��N����B@A�m=<m�(�a��Ѭ�w���#��(絶Z8:„��O-v�GQ9��)p
�;P%��#Z�e��<JJ���R}���0�Z��@�dC��)w�S<ʔW�S���#}��-�b��yЏ������I���N	#�Q�R.�}:T�q�R\qY�d���I��`�0e�bJ�7�[��Ye�/8!�V^�Ύ8ts�L�r	�|dp̹@a�+����6F̪��� �����F�W�;us
���`�2RBG,������8��'�bE���l�Z΋R#z�s6�)�g!D��<��L��
+��}�|=߸�=���o"[ھ��� @�ݘkn�B
��I��IΞnn������nh�
֐8U�]�T'���F��?�b{�*�C���JMZp2�T�ѳɸ�I6��;)	�!!Dӿ	I؉U�oN�U�T^(�P|a��}�17q
א�S�,�
+y��.�z�i��E�Q1ȃ���MƵO2S�܁)[CagB�����y�_d�[�������:D���M IDAT�FΝO����l�!�;�,���ݵ��ܷa ɵ�/M����1�EJ�*���f�i����N:W#�=�R"$�q��l�tTI6DH�rG9e��By[7.8o�;�
騌�g;ǣ�B�&��'�@w!�����.���yPqPR�-�i���01�lYL5��YrBޔ�������.VQ��Sz��e �}����N����s���J�L���ͬ~a�{��V�x������l0HY=-����	���C��Ԓ\�ďT�4+bN����s���L/��hz�v�P����z
'����t�S7�@�
�S�(�,xT%��������!IVC�p�Tr�'�8�E�b\�$�"����kٳe�i�J��I\�k��P.���b�A�;�)�+���b;(iPB�K[?i��I6�EJ�)s.P�YIӴz�5�$�l�9r�
@��Ճ��[N�\}d6$N��N}aP��m_A�׿�|A�2�:���"�i	��ƵO���?)	�|dp̹@a��碧/����Qj�a蝈#|��n��>2��%$%۪)O������ ����)����HJ�*��~T7
+��?6�]���0�n�B��E�j�J�!Brzz��RJ�\��-� {nz���@��E?����PŁ�F%	"%�^-��M�y��u:�0!q����������`h�e�S@?���*m��\L���5P%�!�v������EE(���*V)o����T$Vu�ц�;:��I^YY9<<�{�
+!!d�lK��O� �
�b�ݘ���xJ��=�!)�v��
�j�MW�u� ���5v�g�+�6,��ɵO��	��RJ
��c�>"��.�R���+>#��
	!���ل^/���c#��hَN.E�	i6Lٲ
+;i��ngJs{z?i���VEH)�dp�����50e��ĩ�ߩ/*�7ݳi�
�m�>as�9)���'T*l(�}�
��II8��c�N
+[Z�^_��J�J]oR��;pR�n��A{�f��0�\��l�r�/*H2NX�pB�†��'��ٟB*C'9g��7��j�bC�t4Iҿ����c�ABHQ�$�m1uz��AʞƄ��%!����=�vRعѵ��%	�C���D���ڪdC�~�\�J�u�00ho�A�����l�:��6I���u����_��c�B
+%�hd�†��'��ٟ��SA{8����vH��M�hG�2H�	C�
��G��Wz�Z10hoC�_�X$��͞L�� �dR�����l�l=�X$%A�D�H��j�!�e��� �X;+��T���m�1�����	%k�J�!BBH��
��(�<�-"���w-�6El�L�58��c�N
+[H�����i5!��j�R���KYNNZIb`���ĩ�ߩ�5���<������Ta�,[+fL�>����<:�N��C��������g!D��<��L��
+��}FQ=g���B(_{�;�
:����
H�xA�8I�������vC#��L�"d�4�,�p����D��5���w->�P	���\�,ہ��qRTI��c G:Mˏ��^�ӽ"�
+���E��E��l��R,i��J����$K�*wd���L B�i8�ǐ7�n(좴�
+6���Jw�ב ��ȝ��
��`�85�;5�&yS�Ŀ#D��F�w钅8��Bd�[�ƵO���?)	Vٲ
+� i�s��/��
�{��,!���Kw"v@;��V)0>N
+g�Z[JW��=�:�~��%���$�����
�E
	=�Ӓk�҅���$"$��G�k�T�Ms�� B��?uy!�R�
+�ñh'�]!}j"�/$qzQ{'�D��
��
+]H�20ho�A�����l���M�N�Dc?���,R�7���s�G�M5H\�$8���`ʖ�P�"�����%boc�A���Zr!q�)[���8)�0��B����V��p0�<����Ɍ'%A�D�d*k
��p�0JAe�N��$"$����٤ђ�;�֜W�VI��*nB���=�vR�B��ޜ?Y�@Ry��Yj�ʼn[�m0H�����
Q��i�Bgm�8����"�g���V�>�}�
��II0e�b(l1\ܠ�V���G�UZk낼a(�^��)[6$N��N͆0@^��
 ���ߒN��Oc�+��q7��}�w�b��	!�bt*�f���k7_�|(���"�6զ��a�Mb6$��D�a�YI�<�]g=T������,O����p,�Ia�?*>i��Ja}]��
+���.�+�QWqs�b`���ĩ�ߩ�u˛Ig�8��u� �N�'�+cna�h�G�a�]gRN��X�������z��y-����BT���B�;�BX��30ho�A�����l���=7H�A��O�8K�%:ܜ>]D�ƭnw�l��O!գ��^���#؏.,#��
IΑ2K�h�zm(6$��������6��#����=U-ԫۡ��,�,�
+�ñh'�]��JU�|�_���$L�������c&``���ĩ�ߩ�f���'�ґJ���'�9*.$���g�.�	w�J��II8��c�N
+[P�P
+��Q<��V���'�+��#��$��1"!��X|�~I��$�a�B��rj.�BEJ�*���x^��_?�����S)/�+�0T
+!d�#)U#$
�5�r����(�*]~�I2}J
+�ti{�s-.l�����~g+�wpJ%���2�-����=T�^���V�$y��,q�@��	!SC(�zq</W�!��h*���O"1�EJ�*��<hE���_]
+��S
+B��6L�(*��h4��GHvwwwww�����r�&I��Y���P���	!��V�!.8φ���G�Uܢ�-�F$�=��ݽu��ө��S�b�!o�A��{TB �V1�J)�P�/�3��V���qRN�$8�]���Ӌ�O�/��3m�5+y���<h�Ab�Jj�A������������し�*i�T�#o�<G���oDn��0a�0[C�leX҄��S*	�}�)lѧ<"�|a������Ig��g�W�?PQ4������a����޻w�޽{w����ٹy��dABJ�|�RJ���Lo�ڏ"��y�B!u1��T�o���ʶ�����N|P
+�g��Y4� �u����2�����ׯ��������N���;�(���.���,�`]=�k_kܘ9��]�4mJ���/�7slm��Rx��;S����EǼ���9���cok�����}�8�;����?�������C7`ʖ�P�b����l�-��\ŒS^]�r	'�����sa`�Vc�lmnn�����ٹ}�v�K,iB�c�>$ہ���5�{�@ɤ�yKu��~`Dq�1��	)	�$B��y~��i�k.�C�C"%�Ј8�^��܂���fDH4���;;;:TBH5h_߿��?ͽT]� j�"��n'�B2F�F�����
󢋤1����ݻw�ë����;/���O��z��R�}��.k�}��������&��*10>NJ�)�Ǿ��p�?by�pT_'q��p�˜I^!p���^�`�JjL��'e�gm��1�Q4[�8玊���
+"�n75�l
��IIP%���������0�G�����&&n��!����i�J)m��[�A����g:��X��v���w�߹�s?�A�s���e��^o�14���?��t�04�E!f�7C�P���0��H��
�D\I�z�j�C�)e�C�s�"��H$D�$@"����>��V��R&@��%u?���jh�Zu�Tĕ+W� B�y��r���5���3a�+H��ՌH�<( ��7�>�(�j�ܼ�
$ApР�*�x뭷�`�!��d	<$I�!��T8��ꩵ��<��_��a`|��U!3�yA��D�W#yR�j'��*�U��@�dC�!�e���H��Y��O:UUo֕�Z8��M�1	!�X���E;u���>X;ڔ2mT���ĩ�&ʱ��Q�6��F�{�⿚��KV��{��#�cS��ug+�kH��)�Ǿ���s
��a���?|��1,Я�Pcv-3US����x�����ڂ�(� �X������J"d&Ffg�,����R*aZ�-�����@�dC��U��s��˞�A�YzGkk�\")qgc_�R�v#[o��V�"��	���>{��Acs���; 7(Hbu��/Vٲ���@��p�,#�\k�a�D�
+�3�l��ʖ;8��Ǿ��$F+&)Gy��WJ
��B0US���4�J(H�y��}��:��kM��Ygͪb
��IIP%2+#���qO�o˃ O��	CO�F�E��lH�"�J~ǫ��p�ە�3�+bLp�B��qZix����5#�V��ll0H�*i����)oV,K�Ѭ���V���a�0agY3�lyp
�;8����w�–E/yX/��5��ȫ��_Ib�J�� �t�R�C��X�����k}��f2����f���B
+%�V����rXZZ�{�"�RIp�La�:F+$qg�B��/J^�G0~u��*����*ѹ�J&��Y�!f���`���\r�B1�3��I�(3A
5.�R;"~P�˯��`��x����n�qc^䠖�@A<�0��s$r�}��-��bo#Hm�z>0%���1�}:]��ٳg n��-����2�_�fp B3/��Ja�J)���AS�Xe����/�ѿUb~j��@)�a��pK����J"d�����afh��g�ͮgu�O��-
TI6DH��.z?f􄤵�jE?�}�Bփ�A�t��5k�!r�2����`�8w*^��U
+Y�d��LoM��:�������V6�Ζ���qRN�$8�]���16�З��?���z��+e��` �$�l2��#���v���CI���YX��Ӏ�'%A�D�|�KfV��a�
\xU��76'Jvb�jXU#$
�)��"o�=Gլ��V�]nuI�qg��@w!�Ǩ�Y��}��␺R��DD]��55|��c�A�T�w����`y��u�х���
l�Z�w�Z�{gK����$���1��-
5������U�Z(�GE��y��.
���Y��>2���Sw���gCN���*�!�:+�����$��Kt��Ӊ
����<��t�_gRN����s�–��V��v�zBm���к�Q��y��1��qm�#�a
ɵkמ?^�(*B)�Ԅh��J!ϫ����@�����x�"{gKbee����Q�*�B�#\�Th�L�z��X�>=%�_F���-�Zx�݋ŋ�kHJ�)w�S��`��YT��p\t���I�gm�jN�+I���%a�;��S�,�–����&R*}x����%�,�[��*��%GG�,&``������8�]���#V�M ������J��\
�+	i.N����s�–}ʑ���G�/�穪��5�%ɛ$H
Hi�*��l0H�rG9垁��
+
��Io�dV��C�V
+��m��1����(B1�
�@gg��:�㓖~�8ð��G\��m"6$N���r��xy���	?B<�t_EHԾ�BJ�G*����c�;���S>28�\���ӋǝV� աE$�*��㋵�*�U���`�`������Z8�۫�k7\��ԋ<P\>.!n┏�9(l�/G�+��E�-U^!����	(u߈z[��l0H�rG9垁���HB�\9�xU@J�����a��@w!���\�q�t��Ph��Rm��ˋ
�S�(��30^��ѥ���MqV�a���
+b�&[%��HI8�#�c�
+[թG�7D;��YNZ��b;�e'�a���`�pcD�\���_zw����snJX�%�H�A��n�h�un��#��S>28�\���#����zQ�m�<>+�ȫ
��SsuM}d��a�ڗ>W����	�P�9�N�"?�j�
+ ���c��z���W��k.�Tb���_o�7��l�pcDw�ƈ�,„�zU�~mW٪~o�EHG��za���rG9��˫�+����{>0O��8�o�[Y��	(�^�F|�����e9q���c�;��S�,��֋h`�H*�7���KM�:00hoC���(R#�
%��։�A��.W5['؏d��P�rx�l�$Q?��HIP%� ���A�)��a%�ը!�N�� ��*Ɇ�S�(=�b��i����Q��sbH�)Ϸ��,k��;[,��!�D��x�_�+�*�[
i�D$���4l0H��e1��W�������+�Z[�^q�Z�v~�����mĝ-�l��S>28�\���SZ��*��mU���@�
	!�s6Eνkl���#�$���cִ�,���1�����c��K7޴p�ߊ�M�$!����&1�Gf�A�;�P�Ei�/���q���R��tu�	H�=�@�v̿��b�;�B�er�cl���7�*�� I��1�8�
�S�(��3h��J�O�T����$A�����0f>�(k�lʝ-
+�Q�$���1����ɫ1����� ���Y��{$�K�+��#�� !�^t���DO���,�^��{��ԏSBp�Gǜ��S�m`���k/�c\��V�HYe�0}d6$/^�pg��n�۸1/rP��A� {�.#ٿ3k'�nW���2��+� eI.��)�j�}:�S��g�@!�4�^�Y#�A�_��܇��EQ
+ax���|����6�I_�f�w7�����v������Eu(�܉P��п�G�0�����V��O��m�'I^+++�����bVl��R/�������3G��V�W#�hYq�lY�����zGkʑ�H�h��u�{!H�Q��b�V^����7vj�r�a���٠gO1j���ha��"��'e�A�q�&��"0p!�����G����]��R;"~0�U
�G,#I�b6����$ѩ��9f$��������׿~�޽��r��{͑w`�ٟ3M)��fMDR�� IS�lQ�"S�w�Rjss��ӧ��唏�9(le��\d���v0�(�/p7�Gf�Ar||���������U�X���S���fn��1J�	��U�Z,H��lmm	!�޽��-N����s��„�	?B�=W��UCA��c���,����������n��8�r�=��țNa����p�/�y��B��Hb�t�M��Ea�;��aww�ѣG�U�L�Ƅ��!���WiH�3j���`֭�L`jD�z�2H�_�������<�A�;�d�E4E�t*Q�9WAA�I�ޙ�����dB��Eq�eS�lQ�"S�*)��L[/N����s��V�X�V��>�s��{�)jU�1�Gv��
\����s�˩�ߩ��h��~g?���A��t�#�a�t�~a`���[�_
��c��O��_%��n����u�Gǜ�&�Rb!f���.���?�@�Y����=�Or���_��b$�@XC��� ��#6-����]/m/ąӠ;[��d*:���ѣ����-o޼y�֭jFE�#��~�Ĭ-���Z)f$������L%M1jcO�&��8N�̓�d�Ov����K� ���#���$.m��7�u�SA{ԝ�R1�R��
���jBGN</
8�~y+�l����Y	�<R܇d&|a��A���z�$�}D?ϙ��ߛq����� I��l!8���<}�TGHT�������޽{w�N�SA{8���U�aB�W�W��t4�&ȋ3M�y�����YI����f�S��!_��h����z�#���{}�{�!H��$w֘;[��$:B�����[��_��_]^^H�:==���?�����;�a��v
��'d���l� M�����^�����go�o�'�?��j�}:�O�,��}�ka~�K_Z]]}��L#1��w��o���T�Hɏ�I"DvH�|�
���
+ZA��B���L��}��!��VI�����>���ի�
��Ks
��
9ᇪVF�91A�$I�H|?
���4�V�UJ�`V�d>^�x��RJ��$���q�����۬1/r0��!H�+\�(��r�S�� IDATt�s
A��w:u]�/%�:Kr}� ^��)�j�}�N�����(2
���ۏl���|�޽�����N��X���V̔u��c7*�c�s���8}�Jې�����$I�c8ggg'[Ξ��7�x��O?-mP��%�xz��#b�2~���lұ4y�������Aݣ ��G%=}�T�oe\�v������K%�)l�x�u��PȍHl�����)c�{Gtf���+Wî���x��1� �$�<��`�H5_ɬ���0�D)1II�!h��U!2Y�x�Ƀs�d �P�Z�Q�Ab�J2kcD���GH\��e�_
M�W�w�H�����4GF
+��;f�Y�X��"��V�w�N�:>>����!."�������j��֐���޾}{����J�u�7(��z00���>,���m=��I_�\z�����K��7_�u���*��8�#C�b9��5�O�zP��4E^(=#�@�Y	��d\B�����oC��
���R)����LEW20��B�=!7�f�6W���3�s�V$��3-������^��z�v�a;/ΎYkH�[���
+B�X�K��^�}��}�wm���	����2)�Bι��qwvA\AH��:+�ԏ�yH�,#��1p
�Y�|p�'F���.�k�a��$�Ĉ��44\�r[91p�'%ᔏ�9(l
�����$����u&91E�J0�Gf\�!�p*M˨C̹ޢ�+��e��ԊS���z0
+[RN��#�z���y+��e�6$N� T���k��#�4�ߙ�Ƒ¦��{��t=�9�R��"���B��d�a\�2;6$N������Xy���lMKoMKq)�Ab�l�y:�
�Ng�PC����"%ᔏ�9(l-L���L̑����`�b��(e�4��Dgb�_����R0'����1����B��2��i;�g1F�
+0�Gf�A�;�)͔W�i��yjk��}�G�@�f�4L؅1�E!��k9��w��#���^tQ;�V�"�x��z�F$���&4����AO]���4V�rVٲ
+[�FF~�R��y+�U�q�tN�8�*5�bKY%��"t�W?'�q�1��c�� 7F�x̀�^��QJ �����37F�"$N���K<+���#g�0z��V֖�3AشC}�#�i蝝�Q�$�'�@�r	V����@��Z4MC�6o�����!B��
+B�~���p��t�]c�5�����'7HC��������S�1�M�
+[=�����~2!��x
��\�h�AB�i���1,�w�Ej�D�-�S
+�@Jlo�q�|dp̹@akA�tԏq�~��YL�����`�8�rʂG�����ܙ��.&Y#��Al�����
+q���t�}gg�@w!�4�@�‡	j����$76$�^����\?Tl��/�?���s�老�
��/��NG/›������m���B�g� 丞�/��;X����fgp�G����n(l]� ��=��Oa��ec��̆E�\AH�B���}��y� IR�
+�skYC��^,�h� �����$��)չF��R���@�dC��)w�S<�)��5�
+���YJ
jLY����/�&[<R��?��}
+M���`�;�B���۠�a76$N� tj��)o�R��o
y6S�A�� �����[T2�Y���"�����S>28�\��52Ui
���7M�R1�Gf�A�������7��'���Džu��~�OV��
��O��soĆ�ٹ1p�'���
���1��cޏ�Z�s�̍�kH)����������� �H�WK$]"�����]�,&쒒�J"��B"��k�3TI6DH1�l>�����TA�x-����@�4���'�F�
+�cțn7�d҄��*�q�.��A{�f��0h���֍L(��m���qfe)�%�����wv>��II8������㔼.kd�!e�����a�Ήѕ
�y���qV���qRTI��E_�0���*Ɇ	!f2\o�<�)������5��)����8�SA{8����3��*�|��� qj�w�K�Me-��Tlޢ�
�������+����II0e�b(����ݟ��͓wnLٲ� qj�w����+�Y�V���5s
++� �N�"���C���8�B�e������d$6$�����/o�r㤙`�wY�!�!�P�
+�ñh'�5�G�������·�A{�f��0�[�$Xy�_ئ,ϐ�&�J���
0���(��II8��c�N
+����yh��s``���ĩ�ߩ/�/o:�����A���)������7��Ί��?!�X�zp'��a�AB����Ub���S�~���Is� �$�w'!�����v:�0u��߁?9X{Ϛf�y��$�n�۸1���y��?��灛[� ���0�={ða�k׮=���QT�R�)ײ�o�q^(�b����j#�������&esAJ�nTb���������úGA����R/�k*܇���e1�;R�3��@��~Ǎ�p�:�LF�7�t�lBH5,R��ԅ
	!�����2����S1c��P]q��
+��B\��6�s/�oi���b`��f��0�E^�S����*T����=@�iF����#q8e�8���p*h+������ ��̤d�+���� qj�w���=Oa:˻�IX��DE~�+�tq�^����Q)gB���^�����I�!������\�@���0f��i�
j�
+Bf���=l�c��6=p�LA���;�m0H�������"yUopېa��+%�����0�ES��A���rgRN�au{
+k>Z����u�c� IC���6$N��N}a`�����1<��>���X4����sg�a��O!������K�|��
	!�3���¯�9���Ѡ�v�np��/q
����(��
+k>:����/����F�;�m0H�������"yG�q~�⦪�P؏X���T�Ō�a��OJ©�=�vRX�9�/���n�&�;7�/�=�pj�w���
��璝�V����#����t'b��O!�1n3bg�MS�!BB��[w~^�w�DW�hZ�ܠ������(��
+k8:Mk���i��sc`���ĩ�ߩ/�7���b����>���o��4P����ٟ�G��	�P��bf����޳蛻�2�f�6W���34�Ez���d��n��\US-^�$u�aQ�x�O?���Q2	σ���8��s3
=�4���^Ǯ�1���u��T
U!�pTI
���������=
+Br!�����~�9)���ЦH�۰a������
����50h�H��ѣG���7o�\^^�c��S_�$o�W�?p�B|���Ng���dq���5wy<���$����J�L��Z�S�Xg�1�ӧO���777������~������{�S\�ݞ��B䮳na�^><ۆ$�$�\8�B!���dww�޽{��ݻ{�����͛7oݺ���u��m0Bb5�țV�řWX�7f+J!���ʕmH!q�T,���@a-�)y
TI�0Hnݺ�������_�>�������j��y�w�R�n@��r������7�Ejy�� ���~�R�v����7GϏ?F�K;i��Hllt}66�R���ξ�f�y�ӽ��;a~��_]]��O
+�N��@�
+k1N�k`о1U�677
lmm�����HK��F�y~$���b�Ya*� �UN��Z�썫6;�4!%A�D1UR3"$���坝*�ǩ��S!E�%��#Ľ��}�9�B
+�F-#
��Q��fz�*�10>NJ�)��f�PX�qJ^URc"$����a���(���qo`+(X�[X@��r�B�K#0�EJ�*�b8��&EH[#�4��@����M�M���N!��i�A2�/^�a������8XW�z�l�Ƽ��l}p����.�.�ܙ{�����\
�$b��Zz��c��t�N'�gϞ��
S�,��Z�S�2e�'M��Fd(��JyH��������v���$��!�c�J�!BBH�P�#����\��j�-E!����� q*>�THV��,���_��+%��{>V�>;ʾ�}���qRN�$X9K���Z�S�����EHu�Xh��BO�A��i��P@���'%A�D1U�
���Sw��熞��%���zфR���$����7�j( b
+�5b��>�^�n�;���˗/�M7�CȞw:�������횩�l��\�v����u��"�R�R�H,�7��*�s:D Ģ�6hYx���1�ƭȟ������úGA��)��f��PX�qJ^U�
	��Axވ�,����DQ�T�y֖6M����8)	�$B����lH�"�Yh�a����(��]���H����*!�B���ĩ�&ʱ�jN���V�
!����S.w�B�_o��	��$�RIpl���㔼�$�lR)�j@��6����<�)ٔe$�Y[(��q'%A�D1U�
B������r�r���̲BB!����ŋ���v���"���������k�s�ml@� �����1|P TB
�5a�s�NW�}���0e�b(��8%/S�J��q� T�~m|�t�[͂	W�l�Xͭ6��$��!�c�J�!BBH�{*��|�Җ@��Yȫ���"�B��ĩ��S!E�!�6�����5'�3�Φ�T'��'%�J��t����5P%1e���HL������zJ��{�y"�Dc�Ҕ34g��|'%A�D1U�
BF/F/�r$�(�>��Gs=�$�v�!�BHE�`�8w*�[���T��R"I҇����\=��؈�WnܝM
�����
���8)	�Tl���@a-�)y
TI6$�^�r����K�y����\�%���ـ���}5�Pm߬}�*����0�O����8åK��B��6��㔼KKKua�!!�r��Sr�M٧�
h�2���-!11a��U!�pTI6DH����
��NyS����b�5��M�ʽ�
����pJ%��Yz�b���@��	!5��\DJJ
”�y���OP�Q�$��!�c�Jb��a8e��^yG�	���J��|�&�nHi��`�;�B1�V:��
+V�;�K�aUZ<��+7UX!������`�
+BRN��`��h$�b���@�
	!��l�R�Xh�����]�{ �̆S>2X�6��Z�S��#�� q��{�����b�=�R
�Z�
+�$�*FS>��HI�|�R�z6��4{n���s�{6V�n����*���	��0��,k]�^�^����I��7~��\AHJ�ڵkϟ?���>��/~�E��Y�m+��b��wee����Q\$i>W�\BH)��I��[�A�����docH���1g�0�j�;(e$�p�c��tA!Z�VB�`ii)��J|߯{���0�[lC�D��.]���/}�����������O�,xX-o�a=�_.����†���<*R���"堃����#���-�\�
+@� �v�i�VWW������8l�w=8K�L�Y�!�
+�멸���\AHJ��e����������ׯ_��)�����6O�>�w��ݻw����Rw��}�������e����n���ܼ}������۷777���vvv�����_B��
�y�f��Z�6��Z�S���ĆE턐�!<�na��Y	W��BH^
+���������������aSD�����<}�tww��ݻ���~��i����xww��ӧ�	�L���������坝������c�,�P��

+k5N�k����dqw����׿����͝�������͎͑����J?������?��������M�g�*!S��n��|����￟s�j��n;�;<�&lf���
+�k�@w����#��>2m�ѣG����=�E����|�֭�'������=z�����J�۷o߻wO*���Z��p��eׯ_�g!��
+�� Y���@{��R��o��o߽{wggG������)��,�]PZ[�W3w��'sG}����9T�,xX-�P!.�/
+V��0�6�A�v[�A�S�h��@w)�A�R��G����Bh��o�h���
��2�D�J)�y������͒���p��m�,�~�zNy-v
Ca-�)y
���`��y�#��7|D���E677����p||��R����|�������7o�̔����RYc0��Q?�s?��
!���9V��"�$�	}dR"I�G�#}lnnf��͛7oݺ���{��]�~]?ё��'2�
��@\�~]�-ɂ��.{��~�T,v
Ca-�)y
��ٰ�}��}��<bkkK)��ѣ�7o>z���ӧׯ_�f����,������������]m��y���Ύ��W�W3/������o���׿�����9�uj��W�p.]��J�?�R��q������f���(b8:\?��_h��k�a“[�ne���ө\~��~�)���*�t3B���
��1��v���͛���_�Vׯ_�)X�VkggG�����ѣG�"�u떎��u�/������������_�c�Y^!B�E
+{�+
���fQL���[=�"%QH���d��	O�smB'##!3�l�<Q_��Z�S��#�a�*��땂ٓ�?u�0��7�L�X+�E5���D�&��ׄ!��8�_�������	!�p�۰��ŋaU�M��%�j��nvGM��g��n������s��Yۛг��AF��Տ���1�aߟ(��"�F��I	�� �B	QϘ�>]��	��ٳg �B�(!1�XR ��-�(�k! ��M�:KUx��[��_dw�v�����G�$5��V��f�R�����]YY9<<�{�a
	!ME)@��x���>K�4�!N1��H�d�2vj��.
|���gn�wW�w�7���/Fr������jEY�K	2Ns��a ���0lqv��n�H	`����[M�<\L�C�C�E�J���a�bt
�؅ij�H
+2��F�J<���N
��vn����M�ш��>�&Y,Vw��#��`0�f��sXM����*[j������0d+�	B3�o�_H�C�&QI����n�;�N�ʢ��=Y�9W6pmx�-�7!�	BX�y�5YY��Q(�&"������gj���o��6�N���h�yZ�n����9�u:�w�y�_���N�3��n�U$	���O��ga���=1�/���tx�_����_�{��5���W_�V��H�۝t�T�*P_E��gZYi����
x;
+2�G����!
��ל]��8i@�\2�w��V���o}��lr����{�����s�����n��7�並�掔I��+us
�-�J�W�=�24HB�=!G���k=�����x�
�T���v�<|�^���;�'��mr$��~��"�:�g���<�.e�Tp]���}":�G�	�#�<4��:�"�n�\2�s�z饗�4�+׸3�����oa�ԑ����ʖX��+�Y$��Q���Ȳ����L���v���K|�A�WӆNH�Ƚ���J��H-n�����τ_��p��p��T��P_kż̨��Fl�-��+�7{���Q�N��~>�dj����>��"����Ў�Sҟ?�|������0�2<����:��\#����:x�_ZZ
+�k4��������W�O��{�6�Գ�,�
$�X���
x;
+2251��9��7S;�l>b"occ�z��t[�M�	��+57*[b����{d����S9{���]�M^��?���/|�ѭ��BK�hz�6�8D��x���b�1Z8��#�L��6w�ߟ� +�F��Pt��ي2W����>1�Yb2����������I���Z�B�T}3�,d��R�,��9����Z$+� IDATƞ�52���*C�$y�w����dg��3�m�T�?�����c&�ʤ�G�g�����I�US�tTV��*[b����{dex�$������e0�}���z�,�4������4������f��k6�����v���HD��R�Lҕ�K�R7P��T}�#+CI��Q�=$)#���}jbD3s��CBD�n�W����~���o;ee+Ղ�*�7p�t��u]R*4먐����fOx;
+$K�k4�I�HD�&�0�D��zo��ܶ�����
��ߎJy�'"NY851"_����w~�|�,����~���E�T��Q�l�l	iDT�
x;
+2�G�8�Wi�LJ���v9ea�Ĉ�~�{?xƔf�L�ŷ�̬*49
bT�n.��%V��
+�GV����o.�fat��BbD�Ҡi�9�IJ�]�<0MO������s ��dkk��hLX8�����-AE�R�""�9��
+/�ٷ���+�w����8�G}DP
�{dѼWi�LJ�8z���ɉ���=����!��6�]���h�'!+us
�-�J�W�=�2N�kZ��]���\��x@-����������w�̠^"j�ۿ�����o�:<�W�h���u{�^��u]��ի�q������V׮]��7��s?�s��j	��
�.Ù��q���TN��H3�o&*g��C�~x������H��2э�ݺu��ի�n�2M��h���GML�J�c$�e(:�gq$����O���^�����_��_����	^�׹y̓zͥcc���	W�F�q��\�++}���lZkY3�VN����g?���ó7Hf���VB�Gl�,=9I\�9a��AeK�R�}����ݻ�w)N�oii������E�����������}��;w�L�l�뺓V�,+嚥T��*k�(��*�<�+���F#�"��,--ٶ���O'���b���������#����~��K�ri*�-W�fssS)%0$U����g-��knM�L�����8�V�TV�b�����0
N��H�������E'�,.�C�i�Y�Y#Nj�@%(e&���"�
�-�L�|F��Uzj�J�T��*U_̲���Wn�,�M��J�0T��5H���L�/'�H@%���W��ԙ��TRHJ���P���<�J�Y-�A3U}�fCK���Y��3�P�R�T}βU��ԫ���O��g�1���`0��o�h�v��
Wꄡ��w8��.��T�%�W�QtȐ�'F���o��6�N�ÿ�Z���mn��fL��y�wLۦ���J�씡A2�������#���'xe"�t:/��"������0G�W_}�[5�#�\�+��c�
 "�i�z������"Z�ߍ�Kb�n��j����o5�M�F��{�7]̽�v��	�|�M�kZk�ˤT����DeK�R��i_�I������݌׊}7h.��x�
�����nll�����z����V�M�?��8Z?BD����N�J�0T���?V��&�\n������l���?d$�i�y�Y��B�&"��伈�I����^z�%�Gfps�Cw��r^���-Lz6�R���l�U��;���]�9�^���&ˢ˗����h8�2�����kkk|ӈ�$�Iw�k>|���fp�X]]�Zw�]�]��j�[�n���0�HL�
+w������M���J�0T����8+b�S�>���xNI���l���?,F�����̏++����w:Ž�kkk&���n�VJ���������~����������ahG��huu��=���O?�����0�
+d�
������sk�_��uB&]���տ��6�n�kz��j|��ל��\����������ⴌ��W
&T�7$۴O�OX����Y�~�P�`��bp
+�"����t���m�Z����Uqx�<Ћ�Л���Z��"��P:9T��*U_���e�C��7v<.�c�>_���`��~��.屩p��~��������ܨrN\�L}k5R����++V&�	��#i���|��Ĵ���4yH�����`&��24H^�gM���%i`��Y�\]sT&
�g����!0$�~�
�N�Y\���:{k��-�J��Pse�j���,�[�ĈeR�	*P��T}�*C��RW�J�0T��*E��J
��|����?ddjj�����KT��*U_�󬔡Ar���Ĉ��9g�����˿�˄Ĉf�x������.�����~����vʢVꄡ*�Wݰ�J�����2�W�,MT�<�<��իW9�յk��Al�v�J<�#o0��-Il����+C���R&F�v��4�W���k�ZZ�hbD~����k��5I��<=�h4�я~����\	Y�c��M ^�Ӟ
��K�D%�����֭[�f������p~�P�v"�i��?eBoDŽ$��>er�J�v��%V��
+�/C�$|�7�u�]�G#��m�A��Jx�w�Ї#r\�����5�M���p�0sj�?>�1V�N�X}�ʲ��z$*�͒ȫ?d$�i�����)�L��nZ��֦�>�����+�8K/'_�/�01!�&�e��To'*[b����N�24H�{�o���f�/��L�|۩�n�������E��
&F�OqY[[�Zs��x��{7TΟ?����:a�R�u�u��6@��Y"y��q]����K&ej�Z�f��l69�p���Y�L���f�#��z�B�ij���� y���K�\����%�����۽^���kkk���������t:��/���Ĉ�Z�C��6e6h�!����>� yN-������/��FJ�eqq]os3�2+��/�ѐ��S�n}}�q��T���Y�đ(�������ֱ��9�;��F@��YlH���Zi�g~��-�J�W`H*C��Ĉٙ�1��Rpe�''�Cb����-1$F��\�$djO�(2�|���#�,.C�D`�Y#F�(��_�N���N��=�#�e(:�gq�l	4��[�@(���fm����J
tAeK�R�8d�
�W��Tꄡ���-1�W����X�ډEW����l�U���Y)C�$���8'.���e�1�Y��$�Vta�ۍ��R'U���l�	��C����"1bP�כ�b��v�H��)C�d*s�t��{b�^x���pB����_�yR:j���ܪ1Ḓ2)��ׁ�Wq���ߝ{bD7o��6�m:�7���<�79���t�y�~������T��NT��*U_�����.�����������ǯC+���Y(1"?nΣic#�TS�Ĉo��R���Y���_�F��“�Z����<E����g�l��&�T}Q�x����:�u\������#��J��������"��o�}����w���H�{�="��z�v�������m�›o��ъ��&���y�A�:�Q��T}vڗ�A��G
��8�!O0��
WWW�A���V�״m����cpfw�5�(��ֺݮ��[666��1�L�
+w����ܶ�M�[��*V_T��^�a1B����V;΀|=	G%�j�JZ��h�l6y	'	F�`bD��x饗�eb6��Ζ���M���WWW9*�,��
fU�![�����H���IYq��\��֫���V9<<�+���|��u���ؼT��R����-1��TG�yV&
ߊ5�Ĉ����ԐDD�ϟ7�����H섐�:�Q��T}����!q�}&J�ܯ:����$��<�������/D��cZ�
�‰\S�f֚KN���$�$^�Sf6e�Y������o����&Ol2/�&F��QA�/
�
+'ru�#1b�F��Pt���
+�.�o1����	�+եH�/*[b��!#Sc��5���J�˨l�U��CR�{H�N`+f��:�����'�,.C�٥L�HG���Ԋ����L�)��Ĭƙy��CBD<�"��Y޿��og]G(��Q�'l4�CL�D~�L�ūqT�y����o�F��m
,@$g�O����""�6����'��8�!���6S�'=���[�gT��F�я~���E�T�"U���l�	����e�V��d���4��T��i��#���
y�LJI��7er�J�˨l�U��CR$�<$��)�߭�`�ܓB��7�666�s�z���y��a|)�̸�f��k6�<0/�f��������������R�EeKyH�#&$�j���#������1ŤA�+��&��|���&K�ֺ�lv:�\�z�;LLH�Y��T�\FeK�R��ʐ1,4�֤%��	�C8]I�����`�)l9�:/!"΍��իW�v�gvo6�׮]��7�9��� ѿr�,	��1��`00�9*q+�$��u�ͦ	I;;;����f��4��Heh���ǣ��G�L�E��q�"_[[3�
+����j��z�����}ނ	!���
�tt�������\����f&���T}Q��?	���d�i�L�J&"w���R���e��(�������F4$�Q��4��Թ�ʖX��+0$a��S
+fB1Y��6�48�
+'ru���_�	I�hQ	����ex�$	������,߾8�����'|�2I�A��+C�D`�Y/�){Ʃb�@P��ʖ���qȈ��t�Ĉ�?R�s�-�J�W`H�ʐ-�5+��@��j0+��ՑrȖ�$<�(~�
�N�Y\��4&ϪE�Mb��y��I��v�)'��I��Eb��'������.&��씡A"01�/��I�8���_�{����q{{��W_�DT�#���Q���R����-1�����9ܼ���ܶ�t:��@k���͛2
�N���;�FN���J�ʖZ��+0$�a��P�P���}�ߧ�"�he�VVN��4%F��x4��Ɔ�o���7�PJqS��z���G�Q������(����'m4�y�y�Pe�3'�T}Q���
+2
+I��yI��"�˗O|<:�+��D%�L�^���}����w�é{�{�="�9�9A���*'$Y[[{��79Zq��i���A�:�Q��T}��24HB���p8��sI����gEl�Z��{1EL�9w����L<�R
]€a�G)��#r��K/��-�)n�����/tx���U��!	�S�![��Nž��$�[P��I�8����R��7����
+��^]]�n�����vLB�5ů�c�^��楪T�"U���l�	����B��N=iBE%�D�Q�;@8%�`0E%nEp���45$�����5����H섐�:�Q��T}%�$��Ν;�����r�:J�J�s���ߟ�ֻ�{���;wx�؏ܿ������-��p]��}˲���VC�J��-���_�ӄ$���~9���d�II����n�C�_���ʖX��+0$xȖۚf幏LN�������2i�`F��dK(�^����0h�Q)91��$�Đ��!)�A�,�A�O�)��
?E*�?�4�wl��7�CVC��ʖ��dy0G�x4T��Dq�g���o�R�2*[b�����T�	�9���v��'{�V#��?���g�ɳ��x��a�Ǖ�aeW����%�y	��<b��n�Z��:?k�!���!���F��J�˨l�U��CR1$���^��,��&	�h���Os*Tg���yJ\N�����}��'9��8�� 1��)q�|���'k����O=�ԧ�~��SO=z���OD��0�-?|��g�)V�ϲ��Ŗ���[�2�z�D�M^�ӝ�O<���Ǐk��g>�^A�h��O<��O<��$����i����3��L��|ꅦ�ŭH��g���|�-����Vd�����Z�&6$�A}d7� /&k!�N�Ɋ����$Lo�0&
H�
(�'��O�$�2�����կ~5�����j���\f+TM�Le��q0t:������~:�d(X͊|��~�����K���ɚV�˭��կ~����W��U���q��Ă5�v����>,w �ȅ+T�*|�����ol5}���A����M%����N��Y�V�u���V��wA��f���v��wA2�iE�܊���W-�dM+�]�/7T����n�┈�v��rL����HC�&�Z���C����`{{[k�o��V�ׯ]�V���jV�e�S�״R_ne������kZ��m�̠��,�������ֱsT�Ƥj��~�� 	=PXV�j���v���wKl4��[��fE��f���v�0r)Xӊ|�7�vvv���5m6��v���n�Z��2�d+T͊|�FEjj�)��-�,[!�~���� S�n��l6;��)��d��h�����n�o�����G)J_M:���˿QENۊ��9�R,������o���Z��l���0��7*��R%�����|�ϻp��w)2W�jV���V�/��������V��լfEjM�����
�M�!
��*�3$g������z��ju�]��`0�����O>�d4��m�
����z<����*�$"���f
	cl�=$���L���|�F�;w��m��E�E⨴��aB�h4�PœH�	���]�v�_s��g��ɹq#
+I)�8N���$"����v����
"�����hĝ!f"<܋����TD����DD�v��l���
������f�z�nzEVWW��P$0Q������DD�zQ	���������b� 
��`��
�
$�4H 7h�@n� 
�ܠA�A�r�	�
�
$�4H 7h�@n� 
�ܠA�A�r�	�
�
$�4H 7h�@n� 
�ܠA�A�r�	�
�
$�4H 7h�@n� 
�ܠA�A�r�	�
�
$�4H 7h�@n��]���Z������F��FDT��S�^��/VWW�<�� T0^'a�Pr�B�^_[[�s�2�C0�N�s����8��`�:����~?a#�nw{{�V��j��W�NZm0�:���綷��{�F׮]��^���9���}��ի_��W�j�~��ŋ�N���moo_�x��ի�n7���h��F���v�^�ʻ�t:W�^�v��|��V�ED�n�JXG)���&ogcc��N��f���Z�Vp���[����z��n���
��Ν;�z])�`p������m���n���ܹ,s��)��`qvvv�]�6�3��NE�,�h4�z����h����&
����&�Z�F#Ӫ!���5�uC�RJ�Z�Ц�L!�x!��� 
X~ܢ��$���"�n���t�R�':�����ۄX[[3-nx���o�-��q�>0$�h��h�cL{G�=ze��[p�
���ɍ�W��6<666:�N£&��+�[�Z;7�N�m��f��;�ޕn��x��N(R�xDd�z��~���k�B�rP�G�L9C������Zooo�������`�a��|�p� nu��*����nllD�"̜Z	�]�鿔R\���m�`:����l6��&��n�{�ڵ����f�ty?�U�G�|߯���f���
+>��]&*ݿ�����NhM�5i;�ȇ���B�9�GI���HY������V����	��}R�l��l��/@zH �x����������VWW'�@U`BF�^��O{���%`�q�$aPVz�z}gg�֭[IO1o/�dn6��z���~�+_��f84H �x�O)�%�ZG@5qDH�����F#n�Lzz�#��ح4666�}�]n�����a�!|�ommʹj����8�w
`�A�3����]���(�#}Ѧ�`0���h�@�Y��s�����&�� I����흝"���)�3��&�d��ָM���N��*C���	\[�V��n6��6I	��Zc���0N�Ji� A IDAT�Z�z}0\�v-a+~�ↇE]�v-���lr!S�(�A�R	���B��—$���5+t���ΧމQJ����F�`?ƤaQ�2��I�.7xz��ŋy�W�N�����^(�������)�iiL��&A�כ�*�v�v��%�#��
�P7K0��
�J�����%x�/����Qd������O��@6���s��Ib�����z�~�ڵ�hd��޴�VWW�	�`����1�E���j��~�^�]98�syJ��.SeM�l6����6�͔����&�#}��۝N��{��wOQN�5O�u��@	(�����k��o��`���}4��Ť'!�I~H��l�����f�n����ydy5~��hrP�����<��ڵkkkk���*�`0�Z�.��c�~QJ�<���l���M��Ci���f��5'�����:|e��3պ4	����;wVWWC[��ο��ߣ��BL�Nt���Y؍���PF�����ߺu+!d������u1n�&1�Ν;�֙i/Ⱦg�Ȋ�8��(��a�G�x��4��i�zQ�k׮ӒQ��4��f�t��ZSG�
@�%�\�i�0�7��IK�~�h/)��E���(�#}�k
�T�nw4��_�
+� �L�����d�����!"$�z������y�
��$�B���>�u͔V�n�Ν;��r'�ֺ^��(ܡ���5���]�V#��`����f��G��A�~�|�O)�n��m~����F#~J$��}0\�x�֭[��	$�!�|�4��ŋ��vֽ
+�T��V7`����~��A�a����� �|p���
*ϐ@�H0����!�9h�@n0dr�	�
�
$�4H 7h�@n� 
�ܠA�A�r�	�
�
$�4H 7h�@n� 
�ܠA�A�r�	�
�
$�4H 7h�@n� 
�ܠA�A�r�	�
�
$�4H 7h�@n� 
�ܠA�A�r�	�
�
$�4H 7h�@n� 
�ܠA�A�r�	�
�
$�4H 7h�@n� 
�ܠA�A�r�	�
�
$�4H 7h�@n� 
�ܔ�A��YWH��RĽ,R�U+�w��U�S��p�t���\v
+�
Ǚ���S��z��W�a/�܋�̧�
+�F�-����n��,�b�\�\
+�8g*թ�<�T	�r�s9�g<ȧ.�*��/������~��O�+����x#�;e��{I>�Eً�.�-f/~�o?y�d���p�N��%��|�;�����gy79`��ݳ���I�x��8����
U�ɭ[����ͧh�R'N�|�:��e�8���>�Rܽض��<~���m;���+��	�v�֭�}��	���_v�/h��M���weF���]��e�V~+XY�q~+��.B
+� �s�����[������^T���Y�
+����|?f���%{�	'Ĥ�PMw���}?����$\s��H�!����m�IW����\���� �0�t'�\4N���[�n5�M���m^ȿܦ!N����O�A�5�������
�{i4涗�
+��K��:�����m�ؽ���3�%x�*v��W���@eqH�}?��%�ш�J��P��5��Z4$��wm;�|7z
�gһ�bA�P�wcT�Fr�Z�A�tOw�'�d� ���(l��w���,1;����?���j����K*���D�n���J)J�H4�M�
+�ߦ/P�D�L������e�s�=���k�l~�,��3��y_O=���K���>��Ǐ��^�n���裏�{�9^�����>z��q��H��L[>�F�?~��Of�幗��?��/��/ez4�R����O=��Ç�x�O?�����g��Q�����6�o���96��۠����|����C��
�ڢ��	�ӹ�
+i�\XȈƩ,v�f�{���j����Z�&1$��"J��j�Z-��C���&x��l�O��on�Ķ�c�2i�4{i4~�����K�
+����P�W֮�v���t�A��ܸ\����2���_Z�?���ݻD?,�?�����v���._�a�J�����“�~�ɟ%oǦ��3��W��v��D���Q�d)J9�Buyy9�"�<q<
+F%s��ռ��3�n$��Yߍޓ�3�wc#N�#����{)�Yޝ�A��0F�x���iצݗ�ʾ��o�����
���'~��G��KwMN���
�weyײ|�򗖎���{�Wν}���	Y^��{�'�Z�{|4�U��楿��Ԭ�w
+
+��IEj���흝�u���2���	�I#
�E�^ƭ�_�tצ��)w4+rmڽD?4�ދR�����?�V�˺K*xŌ-���8<��RN�PE]ZZʻ0O�	F�S��O�j��ϐ$��gs�T�,��0�� �9�E<�I�bs��Й�ti�%�צ�/?��N��}7�IJ|�ҿ�ޙMC`PX$_dH*L�v��j��R�3NDJ�e���xˢ�wȬ`��+4d����6Y����2�6)ub���^��˼�����g/J�����������^��,�l��=����Iyd�O��dѹsDZ���.9����"��>^��#�#�!W�z�Y""E�%��.V�l'+�K�RN*TQ�|�ɼ���n��(�&]٢�=�^�Mg���/��.K����%��q�������0�� �FJ�
+�{�g=��-�� 'E�����/ٍ���øk9�r67ǥ�hܗ�T��+�{�ڣ�<�/��E�'ߧ��'"E��֞��뒲<��pH�������J�n�AA`�HfHʻEtVi�YL]A%N�]ʽ$w�
+�wb�z/�mM�;�ĐN���0�`W����ܘ������^��ˑ�oU�r��*���q�H�� �ݳd~H~We��,�Z����Y�=�A>�a\�A�z�n�s��Ňb�R��/č)흗��s�N�f�F��NA`PX$_dH*L�$JQ�����֚���+E��T�l{Z\�H+EJż��e�F,˻t������2i#��`�F,��
+	G��O���?��6:b	G��+a#��%����ӿ�t#�Kׯkˢ����
���㒇zQ<�5)�IkMZ+�����~tۊh�h߫ɹi;�����֚'WК��&�h�-�J8�^8���ʙі�^�?�8�q�����;��d�8�Z���}��Ǚ���v~4��m]7~�J�K�n]0�w]�V�o�u���q&�\�I'��O/��O�r�@ͺ儠:P�u��K�C�Ѭ�8�����Tf�&�9tc�����C�������q�[GGcb����[�=�w]M交�v}��W��x�h<8:b�59�C�9��}�	�"�I7i=�9��^g�+3�4k.,dD�T�K���֖̐T�Y�<��3?����.��87nv.�ik���c:</T����6m��Z��2=x@KK��\�;w��x}EZ��#�.ܽ{7�R�" $A8NR�����ɹ����)�#"����o�g�a6y<&�jF�$4H��L��tt��p�q������u�3P�x��� $
����jYt��q����5��}���;�5"�m�<R��ލ	�pCR�l����'���Q�����ZT~b������BN~�G�������u�����y�sxE9�E)'��<����̐$�dX$B�RK.R(��j����%���K��}�j�JD�G�/����s�Ky
+w��"0$�� I(��x7iRJoy�_�"�/���O_�u�J��	�AHHV��GL���f�s3�
bY4��Ͼ��O��&e���*8O�D`H*CɣG����E>��-}�)wǏ���3�Z���S�j��F��i���zI�<���C�oGAF?~�_��_Bl�p�+�����O_���<=���"������5"ڤ��GZ���<qN�GC����%��\�����]&qgM:�����_TQ�'J0�ӕ��g����/=��d���*�Q-J9�B��h�]X�!I��"�H>J��Y���u�+O��Ze����y�cg�-فʎ���![�E�њ���� KtxHK��MO��sx0&�2��p
+����y��7���������X��������t�pCR�l
d-:k�R�޵Ms>��h�ܴ�։���K-��L;�E�mey��I����=���%�Oө�deh�Ȝ�$�.�ߤE)'	(���S�~��
/yɺBo97mS:ǡ�^N܊$���
+TT�v!2C���E`��Jm�EOb���-��D++������m��[�\I�0�봲Bj�����>h�E�wn��'_�,�օ.���?AH8���⺲�� <����I`H*C	@�x.B��y�g
�<"���'��?�iM.�Wy�@
+����%ʊi��i锡ArxxX�iC����[歭���l9�!]@E�Ү;~}}���ʹw<����l"��Қ��Ń��֔�{H3-3��.�W���`?��#�jx���i�y=�-��̡K��k�L�\�����~�x��.��]�O_�.E�����r�z	i��0	y�_�!	C��Ϲ�顽�����/���ED���>Yz��,��u��"��� $
���:y^�rLhy:CRzH�q��J��M�w?�����~F�
�tt�����>�h�x}s1��� �9�I,]�Ӧ(�$�E��׿x�𐖗i��`��2=x���˖L�!�*PQNi���,�D(Uj.��R���"��;���C"Ҥ����J���"�Ȑ�![Y�[�%6yل鶪G`�8d!	`��9�//}��ᗔ=tw������2����޵�Ȣ��#��mrr��
+P<ݖ�Ƿ����Ï~���=Kd?̠
���d��E��$���7$�Z>P�l{hYDD��O���<��V�8�U�!
*PQ��CFd�$�'��"J�Z�E�䉴�mn�G�w�����o:�j����ݑȐT�ɧ�~Z�i�R9NB�~}#����rHs��ڿ��G��۷VV�˗�~�o���?ۣ�t�!w���|
ͽ��=���9��ͷ"<,A���ל�s�������(����9����%W������d�DD|o�&��#p�I��`�w��C4i!O�K���M��H�.����
�YJ�R�8H=[Z�BF�2�u�Q���
�q�O��;���&���C"�<����T������{���ˍ����u���ԯ��er]w�r]�z�H��gK�ҠU`�8dDfHx�,�T��\$���������O�����C�wG"CzH�ŝ$|��dץh8��M�q���^�RB���Q��$�Ũ�Ȍ/AM&0$���@2��_����oݽK�E7o��]�ӸQ��
�RjU�u"��"����
���d��E��T��*E���r<=����D��4iMJ��}���K!)+PQ��CFd�$�'��"J���"�.){�_�6�<����T
	*J`H-�����W?��ۇ_z��w��߾F4~Ϭ��e"�2���0z���mƾe۴������������P�*J9� E�A�,X��=��Eÿ�����M:�<Q��M�s�f�����oGAFd�$�'��"J���"�����c֞}O��-�#���r�B�$��,���G����oy�M���W{��%"Wi�h�\B?IY�AHX$�I�,oo�rõ���7i���?�u�Uw��
]$0$����ѣGEI��-����w��i�?���
۶����5�R�U>Ք�q?I�~�|��q�<��� #�?�[.�������ߕKC"���W�d�����jS�~��/7�rn���w_fQ�(�#'F����[ZZʻi���wR)J9���W����>�O�۴�/��p]�|"_)��}��/P�B(PQ�F�E����,��T��*�	��O)������%�p��RdQ��0d`���wO� �<$.9���r���h�Vp����q�B��=�<����,q��ɉۉȶie
tL`H*Ð-�b��!�/���4�</⒣HkM{{��
�p��|�Dt<S%���G����*C�D�&��x>�RN*`Q�o�Y��|���?z֢!7H���./Ik�ղMTR�CZ�B6d�$�'��"J���"qL�i���MY����k�=�j��!	�!�@C�l
,Z��
Q��14��#�÷�鹃�g-�n���[#�2���`�)E.95=���0�85��`������'K�����j`����T���1wLbo�h^���ZW~�Y���D�ɴF�Br]E��H)��K����ACY^>�Deh����%��.�(�bu<�u}HDJ���c�D�!++�����*�!�O`�8dDfHx�,�T��*M���x`�p
]�3�]����<禽Ȳ�:P����![9p.x4�w�p��dg��3q6�q�Ҥ�#�@,����$��(�`>ĭ-�ys<��x�ʊGO�!�=$ų��IE�^��GO~F�u]�y�-�w^�Y4�ފY2y�x8�m��'��
	�� ��?Kf�]TQ�I�-��k���ZG)R�7�n+aT�I��Qɨ������!#2C���E`��JM`��K��
�Ҟ\n�DG#�VVHY��,����Id(�!�
�O?��q�5����Xx��(�2��|�ldz4��4�THE�R'~�<��$�旿���,"z��Oڲ��{J��W��{H3=�o�Y__w2����/]�/a���O]�ХFȵ%t���_�9D ꗜto��EC�p��謹U����][�vn�[[^�-�zal!s<D[[[2C�!
ȇ��M���k5�,)����g�n�8`2���/���ieE�&7"����{��]뚣�=�
U#0$���Df�x���RN*rQ��[|��c^���p�t�4���S%�=��	����IO�E"�*5�E"S*k�#��#�V,m]'
+$kW����ge�[ �@	I�!
�
�"bO��N��鶘����Dt|��x;
+2���;�k��k�a��[�V�Ie�!
(�q'I�su��;It�d\��(W��P��@Uٍ��k�
'�
+���ì�g���(C�Df�x,�=wQE)'��I���}"����Y[i�����j�C�*�X*���qȈ̐$�dX$B�RX$
+�j���D�{�����=!m�od]$Q�$�ȓs��C{Ҩ-��K�vݸ�h?=��[tp@�E�/c��,��!#I�jte��������1ZZ�k�wpiy����sD���CRzH�+���[#�4���[yP�eϢ�pX��AW���ء�<�Y�v�Qk�.у�ss�N�
���d��E��T���6Mh��w���iǶ^�/[���Y&���$�2"3$	<Y�P���N���"�?{��S���H�&�&|O�T�ퟺHrI�������-�&��V���Hr'�2�� D�F_~�����bp�^��x���������"�S`H*C	@�%͵���w.xi{=\�ulj
�ɢ��\-T����]�N���Ϩ�24Hd��ǒ�sU�rR)���!QY���l���v�V'<�z�ǔ�������
+$�2"3$	<Y�P���"�Zy�c��*2{%M�q˹sp^EB`H-��%̵�o�6y�+d�>e�lS>	$�2�� ��Դ����{���;�Z|$�H����C���#�q�������Bl��[RǡZ���&���3^G��'���Y�]�E� IDAT{])���٩{c��xS��-�zw�����y��1�r~	����[��F��hx����:W.ݦ=/���<
����o�[[[BC�_|KKKy!-�u�.B*E)�_���J���=k��R>�:/�������/�N7w�|e�={9*PQ�F�E����,��T�	,�W*���|׾^ss��w7w�62��I�!	C�r�J�u�q���Z�����#�
���"���q�B��K���c�8�pp��Ч���DCR�l�|�0��>�(�R5�Nx���"R�5BD����׽k��{	�@��!2C���E`��JM`�(�TO5)��79�p�v�Ssy�]���C����Y�].�[#	�L���P{��jG+t�,���Q��$Q�k�G�m��J��I�t�t�����KF`H*C	@�g�2�u�Z>�C3gQ�-�S��
+���~x�O�;�{�V���%l��T�����X2{RN*KQ�/�D�k��Ac�$q���{�@��OdX�C*���qȈ̐$�dX$B�RX$�P*e�h�s���z�ϘbX��0d@}�X=>�C�?Ԟe_�G��B�����N�X�S�H��CF�dq��v�ȢᐬP��Z-����Gׇڳ�ý�N`H*C	@	�N��St�^�K�^���}�N�ё����|`Z�D��҃˴G�.e����Ϻ��>��B$2��c�칋*J9�\E�}��j>�g)=�/_&"Z_������?�t�-�!�C`�8dDfHx�,�T�	,M(/��pY�R�n�\��(b�gm��Cz�oO���%0$a�� ѹ��P��ӝ���Q�r�_�h���CF��X_'/0����>]�@g���eeQ��P#�4���2����R����(pA��7O�A���~Ƈ���[#A�9c���ѡ��%�'��
){X�ֈLeh����%��.�(��u�TH��Ӻ��?�t�<㖣c%)�!B`�8dDfHx�,�T�	,ŕjww��H[��e8Ԯ�m���.W�ܰ��gͥHI� K�F��ܻ�
�~��6]������YN_��7�?AH�e��ydSd�Ut�@�Dk����7���le�=$e�(�n���$"�5���+���1E7��h4��+��G;kM�R��uIM���
���d��E��TʢZ+z�4KY���Sr��uIkr.x�{D%<�����IO�E"�*5�E��Ry�G�z�ȫ���&A������:E�r$0$a��,<(+��<M�3%�)�7B5�ʔ��q�B�@��K��'{�4�3ͣ�\8�`i!��2���	�J����49���yƉ���v�We���n?}�
+�0��h��x��b���pveh����%��.�(��U��Ic^g؈"=�5�g��!͈��qȈ̐$�dX$B�RX$J,��S�Q������qo�s�V��<�:}�r$0$a��8S�b�Q[fҭ3����/H �2�� ����8qp�<Z<gWѧ����C���#�q�������Bl��[]�=/y�/7�"��W�k&�:c����i��䩔�ѐ��S�n}}�q��� #�?�/]�/!�\��a�Yl���]�t0i}�N��6�m�mmm	
I~�---�]��\�ͻ���~Y�����:���]����;��X)��w�~q.���F�E����,��T�	,���TD����b9�JM�Q��R)C�l
ȣu�Q���뱜
�]_�-Ϲi�e�,��H��2)3#����q�B�X��Ͽ�ݻ�+'v�Urnbc<�����R`H*Ð-��QJ�����uVV4)"��ǝ�g�-�����g�b(E+��%"r���01����rken%��24HdNiK䏼���J\�i�����d��0hM�E����~��J��-з/q�.dCfHx�,�T�	,�+�֤��
��м���鶦�Q��0d@"��q�L{�L�O�fn��8o�Q�YDD�?AHk<2YMp��7�(�����CP>fګd�΋"}��$�ʶ�@kʄ����D��g#I׫���Zc����A"�<�̞�����J_�����d���7��C��t0��EZ9�Y��g�@߾��qȈ̐$�dX$B�RX$J]����|�/�c�<vzk+�A"�@	I� �S�>��q��Դ;�n
�io�n�$ey�p��B`�8d!	@2��t�&���3͠�+ۗvؘ{Q�#0$������=�N�:"�\"Қj5���Ա�ݸAJ�x�;I�S���h�D��A�V��x�7�y�
���d��E��Tꢪο��N��
?�a�g���9�"[�g�V�
+������IO�E"�*5�E���ZYѤ��i�$S����s�D��a�6e(�!	C��J7
+���b:��|��[�=��� �2�� ��IJV#E��c"�)Fmk�-�!	=$%��U�rR���iZ�u�=<��0��&��\�o_��(Ȉ̐$�dX$B�RX$JW*3���&NM9^g/m�Ck�`�k�J`HB	�\�4Ӳ������6m�VV�3i�q'�v0
�Y�AH�V#ei�J��3e��^�M�/0$��������hM��ID�Y�ظR�_�/��,���)��2V�&��(C�Df�x,�=wQE)'����Ҕn�����H�C��4�4$TN�H{�c�
+�U�o_`�8dDfHx�,�T�	,�R*Mj<w��;S9�{�#2����![��{�ݹ��ͧ�SӚ�|O���1��N�?AH�<�^sT���Ǚ�ҙu�	Ie�!
(-�U�����a���'���*�oq�h�@эh=θ5!d���7���"{D
+�
���d��E��T��j�J^a<��s�C�>�:�v3P�o_`�8dDfHx�,�T�	,�.��.M�Ŷ��I���^~�"�d(�!	C�D��7osj2��cF�N����S�(Mt�FO���� $
�g&�J�F“���M���r�Y��΂��T����`�;,f�3�Gf+	?����m
@����f_NXG��m�P6��+�
���d��E��T����ྑ�_x�qH���$��9ΓH��-�r[�o_`�8dDfHx�,�T�	,�X*��#�< Y�0b+�#2����![�9�C�YS�T炷7\���Y��`0�������n�D`�8d!	@���f�8�&r>���@�i��%0$������ob�7�dQ��|�ݧ�V��@�̜��g//�gN~7�Ҏ�/"Z$2��c�7�(�j��#���w�����Z�ikr9�������g�@߾��qȈ̐$�dX$B�RX$��T��b�
W&E�Y'���$Q��0d@�t�k5""�&�;�)�o��*��cA��CF�
+��14�-�BQ/mr�tQ;GCRzHJN)eM�/�[;J�h�d1іR�hY��$��
�J)��6���v��6��x�gB�����
���d��E��T��*E��$����S|\��
��������+WȲhx�쒓�t[����CFd�$�'��"J���"����WV�����O�+W.Ͱ]�u��4�`�x��$�(��#y��]�Yf�e�8��O�G������Dd�?AH(��}��6)0�94�=7s�/}H�(I�\I�!��z�^/�R,�����S�j��R��e7��>\�vwI)�C����P ܴxͳ�H)ZY��5�څBwIW�I����z�����X2{RN�NQ�Nx`�u��)˻����S=㑲��6��s�)з/��(�d�$�'��"J���"ѩJ�=�Ȯ��C�̗5ۖ�SS�'��/�T��5��z��i�Z��`4mllp@�8���R�?��hHV���؎c炧����ֺ��&���-���q8��`���:��Q�w~�w�
+�g�	�`k�Z>��5�߂s.x�C��n4�ʕ�QI�h��z=�u�^o�Z�n��j�E��m�3(��	�g� 9�G�]1r�����éqH�����ގF%�$���p�h8�l���1�����jP\�t.x4��_)�b��Y���b���ب��DT��WWWC�>|��…���_����[[[D�?��\�n#���q��-�+�����1�-�9�B*�]ɧ���A:r��嗿k���]oo�����ۼ����Z϶��T)�t��Ǐ�/�8�/�b��ST�_���8?��?�…{����	I��K�_��/�t���O]�,���72Ӆza_k�Z��!⅋���_ֿ^�~���,��mY[D��'��u�_�����cMj��mnn���>�/��D���+���8�/��/
I~A�Z�V������N����<J�8D����J������
+�K�nVs]��w�~��)>˲�.�ǣب��P˜�vM�b�5gsi���	I��!a�z����Rաi�R����?NY�<{�O��$}��"��i�P�J�fg'"ZY�>��5=��d�Ʃ!Ya$�v��j)�T�o1�S�Ē9+ETQ�I�)*<�ۣ�0Ńq���'g��w�r��%��]�3$��Nig�n��(6*�IO�E"�*5�E�ӖJoy�8�b%�v����^t�|	I�x�=� �*0���!��ȵo��M"�5�!7�셙>:_� �� $
��i�*M�[�%E��O,Y����C��
+�C��ѣG��h��xtJ��,b�E�r�*b.�JM_����=����H��lY��?%8�s������8oGAF?~�_��_Bl�p�Ö�eMj��?^�a�F��)f؝R/7�ҳG�,��֖А��C,s����w�r��oQ��W����M��x��<�fx��t�?�纋|v�@�~��Ȼ� 2C���E`�|�*5�E�OU*~蜟mW֮�vV&�W�/�뺤D��"0$a�@a��������7Գ����w�S7�S�*�����$�ќ�K9�'2ǩ�HY�{w����ٿA+��Q[CR�l�|�0��>�(夊��	I����_
�I��NWNޅڤT�=�Y��}���
�!I��"�H�R�&�Ht�R��ϢT
ey4�?M�\�V,9�L`HB	@��|�V�u��v�~��D'I�/,�%�vd!	�X�å�5G%=׾>Ԟu��v".�J`H*C	@���Ţ�!�y�f����;I�
��7?��W	�R]��W��#˓�I"M$���E�e+T�9ny�e���Z�ј˖�R!������i����C���l���ݝ���Pk���s��"��d�
��"<��G}DP
�=8˖9���S�9�������p�m.�k
^�r?D�p��������sv�(�WtM�H1}��J
_�~|�HfH-�BѺ�4gm�gy!���K��\rD�L� �2��P,�y_�F�?u\��>����<�N��S	Ie�!
���/�Ӹ����G?����j��]i����
N�Dp��+L�����j�Ђ�OT$2�4�U�_â��*[����|h:�
+IS�3����7M�T�o_��&��!I��"�H�R�&�H4{��j����Yޔ-�6��tER�+�z���I�P0��������k��fq�s����(�"�?AH������q��5rFj#A�	ܜ�a�)ӽ���-o!����p��{Af�oA.,-���*�Hu�Y5�E����w�{Bӊـ����"Pf0���8�e��X�E֟S����Xu��"��{�=T���Y�E��ҎC[fU�^����d���&�ͲRr|��Z��Fq���il��������e,
+��Ή����>�^*�:L�B�-Iy*��lsI����Nw܊���Ieh�Q��sR*�t�\R"�������:�ܮ3�l
� ˖e˱�b1W#ac�6�X�e�r�~�px�׿��֤5)E���F�"��P�Rŏ�ʺD2M�l
P1�&DZ�p�,7�|�\��uS��<=LB.!�����I�Z4�j�|ND�ĞI��\d��Æ:�������MR"$�<��W�v$"R�����5-Mr��k���|@J-�E�&�
+��ta�MLP�DfJ�Xt
���*:逥�7LP����c��i
+H-��ᓪЧ/0�	�	�&I��"PA�5%Ѯ�L$_�jJ�֖,�c%q�.}�k��h�0e���h�"���Gr��9Jq}M�yA���H��(�� '`��<kaX-�ڧ�L>cY����:DH84���ˆ�rY9�����~�x\�"��eҳ���c""�8T����g��?d���Ȍ��"3��*:�`��4�(;ܑ]��5�\��ʚ
+}��� 'd�$�7�@IU��D��z|B�0��--�\Y��J�d2a���
MR�ׯ_W%��R���|��l��jdҲ�%�FԢ�ˠ���9�b��-�~��f{I���<�sN��F��9,�CB`�_s_g��ΚC]M�W#ac�����5���KD
D}�w|)j+?MD_[�#Rk�8��g_�{����ӷ��D����5$T�F�\�j&Tp�bK�	�֏8Z�]��]�0IT��EZ7�ld�,���U�*K�&����XB�X���[�e{���m>�A�*��֋���Ч/0>rB�Ix��DPe�@I��*�3,fm�� ��W+�}�<R'�$!B@%�O�E��W[���zQj�1��"p8
+�LUd!�;
+[�d&i�8N�����@�T�	�"�l74T�`�
+I���	�����n����wO�L�U���Ȍ��"3��*:鰥j�Υ{|�����tI����]h�B����8�	�&I��"PA�5%Q�Z���m&o1Y���
+D�I”-*�"X��ֈG#ˋ-�.�Bȁ�F9
�@Ei4H�����Cn�od���o-�Nob1���Y[MR"$ ?���"�섷�m,�O)�@@
+�[�?�F�2���8�T�
�5���d�:8$2���qF��N:`�[��pv?�U+�WN�4�5�w�����AN�4Io����(��V�6c�b��"��xNIJ����MRFUZ�`͇Y1�1Y�ZW���}�����:~�L/�z��۴֔����ò�h�?
+# (�h�2
+#ڷz\�%����;�t{;ך��ω�\��dn׈�g��[������0b�`�.8L��v�~xm3�-�X�2����ΘXN�9
�@E	-δ1SC�y�t�T,�����,�$�!B"3>KȃKUt����:��r��N/���wI���.V��u�
+}��� 'd�$�7�@IU��DY��nDk����뫖�,���%)Ez~R���@��	U%T�i+��!�-�f�b͋ �!!p8
+�Lե�XU�ih7�`���}�����h�!)�#
+Q��� uٴ�^J�򇬶D���fYQ�O_�p�	�&I��"PA�5%QF�V�H�KD`3�ZW�	���\�,�h�!
��4�|�>lY-#�T�Į�IV� 	Ye1�	��@N�$
P]�&8�s�!=>�d!�wКT���m*���-f=�(h��!
����?I�s5�&
+�����|9#�E����YI�@�v��!��Ef�3JUt����ܘ��6����J�|�|D�{D�_R{��AN�4Io����(��P.Er�x�!���HZ��և8$M�l
Paص���h���
R�]���S���"�*]���29
�@u�&�olN������?�Z�I�C��CFk�F�f@������)$Y�-p1'�=:��#R����0����n�6�3w]�����N��;� ���],upHd��c��R����mvi�~���d�#�K����
}�5�.���sy�
+}��� 'd�$�7�@IU��D�ڡ���
-�hj�Y�)h�����~��q��^$h�����QJ��r��
�^�LZ���BވR*��
���
��'�V�Jk:?�""�x�5�\�Ǐ��NO������Tod�����N!i��C��%�י����PWS��Hؘ��.�c
=7��P IDAT.�QQ_��E_
+F9���h��Ϯ��j����MmƊL�pr2ך��_��D���2M֐Pm
R�+w~�g0�M8�!�=���Ck��c���9:R1N�9
�@�Y��ߞ-2�r�k�<���L̙�
+�'�����@�T����x,!^,U�I��'w[Z/�xA�yʊB����JчN�8;T��Ч/0>rB�Ix��DPe�@I���ǫ4���ղ�'L�N+i��7���!�$	��x��l6-w�p8dlm߃8A����o�r}����)BR�*A�6_X�8�I�p�F�J�j����$�Ȯ�a
FY�Iz�l
k�F#����e�
�&�@-�!���VY�"�I��LQb6�|���D���C&	�$�Th�i:>^�%C�qHVFY�2h�"Ț��y�p8L��ˌ��"3��*:	R-/����"@|�vQ����ʌN�Q
+*��������$	�YJ"��F�$�N��{d&6�4kkI+��[F~�&I�CBD�����dbȽ{��ӓ-��j�P���ବD��hߠ��/��l�8ݱ��􏎎ʖv�6&I��"PA�5%Q֪�!~�di��b_�M���h�d9$�v{2�4��T�?����h}����e�v��x��
20I.z�0NH�߼a{xz�b����rH�h8*�����!2���qF��N�T��|���fg��R�P0�V�Q�%ݧT�>}��q`CmL���E�$�*kJ��TC�J�j]����ƌ9�'D�ϯ2��'��Z�p��&ɗD���}���Xrtt��"*����+廮��J��[��W'��y!Vz\�
�j�ʖR��a����R>�vK���YiXX�X��7M���d2�N���-�ʰ�I�qp=��q�(����aիӊx�	L��ҰZ����;�8t{KDtz�:��ӏ2iV2����*�;I���"3��*:	RW���yѻF���cν`����)�oU�ӗۨ�Ix��DPe�@I����Z�;F�M��tuEDtuE�ԢNbv4IB#�f3�9��B�E�4�r�A�u��O�a�F�`���೻.)���T
�U��=0I�Ct;w?�6�Цx��8�Fn��$Y�x<.[�a�[5;O�ZѶCAٲJF�T��Pu`�84�U+fA"yO���\ꐤ�ŋ��h����7���5�a��j>??/�jdҲ�%�Fr:�y��tND<�jk#J���1]�ַ��l/��u>9�kM��}��E-��#��������� p�|��?t9_�`W�y�;k����	S�Y����J�D�����~�l�����|k�D��>���6}vi߸Y`���e���%�i�dM��dzٌ�W�E|�E`�,��D�!��I+MT¬-��qR�̯
+��`+0I&����
��n���̋�п�fi;�r�R�I�!I��`X�Q����z��ڂ�|2��
+�$�M�z[m�j����˅��6����d�����n��d�4�EW��T��k��X��Z��������k�d��j�ڴ���4
[��Ix��DPe�@I��*��~�}\��xQ�8#IkCuٽ;�&I�CB;�Hݻw/%y�*2�*:	R#�H���1��?{p����ظ�PP�>�����%�]��Ix��DPe�@I��*��H�̷�����K��!�tB�@�$�!i�ۃ�`2��-���{7��5�Zt}�rZ�;��Rƿrµ
(
�$�ߏ:Qbg���J�X%W�ς���-��u˖`EUt����w]�w]��DJ�J���.����VJ�7����W����A�@A�4Io��|��F�$?SUJ���y����J�z�/)`�3C�I��ek7��2���m!�U��e�%ǡ�[��"�]�ǔ2.�u
o	Lir&	�N�e]��ytED&ڢ�Y�٤�h�dM��
�+c��,JUt�F��V;���p����7�em����0w�B���� 'd�$�7�@IU��D��Қ�ۜ!��=Ik�4���,�$!B@MXd+�.EB�XĪ�����5)Uք�5a&p�;+��Q '`��
�J�l���<���l��Zp&<�`��:DHL&cC�פ��/�����z� �n�W�
��f�'k��,��RPR	e������x,2C�Q��� 5J����(��4�i*�˛���v�$X_%P��B����8�	�&I��"PA�5%Q�V�H\���f�VV�V��"��!�$a����H7�i^_��h�K�R�jg�Ck::������Fc��R�D�� '`���Q��s�[}��jg��T�rI�%MR"$8�ꛃ���=�e�,�n}X�/~��븊�스~��ؕ"�|&UE�tݨ�C"3>��g���$H]5����U�a+k!`Ztu��O�rH\�|�NNV���q'�H�
+}��� 'd�$�7�@IU��DY�R*����*ޮ*g;ek՘I��M�l
P8@�(�8�ZƋײ�/��64��!�wY�����I�DK�Oi�6eX�_9e�h�B��I�Q3�@�T�	���Кt�Cڡ������)E''�$XF��=њ1n5;�g'������Q�Df|<�!�(U�I������k""=?Q-�~0�
ы��.�P�>���l�g���U���AN�4I�J����(��V�S�JZK���$5M�l
P�JC!�G-�
8�.�T.Ү_r&�-�J$�-�C`|�L�a-w��֎��b�s:'"��z�M�r��S4Iu���|��q��,�
���F�\��k�F�K�eTD)Z�8�7r{;_mԋP��Eq�Ү���bi`����®��o����q��Q '^�z���/!Z���в��OO�ǮKD��s�-?nq��4/���7r~~.�$������eK��uݲ%XQ�>����O�+��("%��''ܔ"7u[Y�I��嗫��ʖ
+B�I�U
+��C�5%�9�
+ ���om���"$�@��)[��!�T+�צE-�ș�_*)�����I�64�ZW��ni5���8����Q�1�I�&�S�̪Sj4�׺�ue���ʠ/��@q(E4�
!6��V�g�h�$�\訋���C"3�I,�"ߛ��$H���#����?I���JB*�
+}�'�|�i��,%TY#P�Jӎ�s��2sIk׼�4IupH�ݻW�[��a��TE'Aj���9�����Bj�Q���8::*[(�&I`�#PA�5%Q
�'�����%�K��@�T�D�t���}���Pu�lQ!!�������}�U\���0�{R�Df|<�!�(U�I��	׵_��5?=5O4�ΖM��*�������i��,%TY#P�jaH#.��y�ߞ�y�H���<$�&	Y���	@���v8��������k�
+y��4
9
�@���m4�[f��R�w?UD�g�h��!
v�]�6����,���YF��e�ڵT-�ߗ0�U?�W�Df|<�!�(U�I���\��Uua�ǭ�D�E�-mR�����AN�4I�J����(��S����ƪ���~�Y�z�RRZ|�&	S����NQ�iSDQ��D�I���8�	�$��i�*4?6s�����~������})
+�ۊ@�T�	 Ȫ˳+JH�!jL�
z6���Z)�͔�-Gi����*Ce|�V��"u2Ϭ��C"3>��g���$H�Թ�se(�zM:0�L��M�����i��?%TY#P�*��Y�FZW�N+6y4�sr]R��i-�@��)[ԍ��+夊���	R����/,�MS�6� ��q�0Iԉ�yq�*G��6��؊jM�dΫ1��r��hK�T���:DH1X/ a�/'J�!V	��F�IJs�T^�a�Y�f����C"3>��g���$H͔�-���ʹ�SB�J�nَD`|�L�$��(�����(kU����?z�|�)e_!��Ͼx��$L���4��/�+*.'A9�s}Ւ�O������8�	�$�
��fn��D[��󨐸f�U��$DH
+E�B���$H݌�+Ebb�fƗ�:$�`,�B����(�2M���E�$�*kJ��U�t�D�H�|
��Q�K�O�����~.9��ĤYm/�$!B@
Y�"Is�o�i��hR6	�!p8
+�L��CJ�����Ǿ4V�6k�x��4Iu��6�>H��XP�s�65����loo�HVr��$������	+�-g�p'���Ȍ��"3��*:	R7�s����e�)�t{���l�."�� 0>rB�I�U
+�DPe�@I��*N��P�ޡ��ZQ��j�7-�$a�5dJ�t�H��ŗ�ܝ�֤Du�i�z������I�N�%��t�!���e�ٌ�芎���sY����N�h��!
D�z�R$�T�8KeY���b棉�PQ�e\
v���-+���D_�F|�{[���Ȍ��"3��*:	R3������r���$����/u9!�$	�J"��F�$�MU�h�r��p�v��-�$a�5$\TĚF�NN��ϗϗ��&��VA��q�0IԏF�ܓ�ԇ���{˘k�ʕ5���MR"$����G�h�=��*0�u�����qV����oH��=	Dl-�֔�,�U��*�ߪ�C"3>��g���$HM>��O�r}M��7�s�9Z�o�1	r�9!�$	�*J"��F�$*���L�Z$�7{~*�D�I”-�ɪ6b��V��|NY��<���i�EL�\�D.��q�0IԏF�T�ʝ�.��֎�-
����:v{����Y[�=ۤ@��f�vg<Q��+[�a���o�$�֚�vSc~bz� r�(l��C)��cz�B�m���卬!j�g*9ek:�N&�N��l6Ij|<�!�(U�I��߷�B��b%�֦Ǖv�����SH�j.�,��A���L�$��(�����(oUǭ�=5��K�y0�u%+	"�$U�!��f��
��x�֚߻w�Ti)P҆�7P�����~�t�yך݁���D�#�����%�,��fDk�d�$�]�@IU��D9����@���A�I�Ɣ��d��n6��~<��}"�v�e��>���բ�kz�x�(ץF�no�u,�L�\�P3�$]\\�F��U������'kO��R�Q���l��6w��n�˳���f�������G����~�{��Z���Q����L6��HH^�-g���>(�jdҲ�%�F8n[�%��> DZٓ;2^F2���ѯ��]���_�}$�:��&�Hޟ�o�{����8�'��ѣ���w�1Ig�^�x�:
J�$i��̼�5�a��o$UG]���FY�%�AIB��篗_���DD����}/��,�_>�`�H>���������U�8η��m�&ɯ�~�����qqz���EH�����S��	G�����l!�*[�6Z�V�@��=��J0IԒX���� �U��m�J\w��h��!a���x<6�R��8�?K{Hr����'��>vV	��B�><I��E)���c1���+���~�����X���$�Y)�TE'A�V�[|n�#Xg�����8�u����a�1}��o���&`��!�Z%�&I`W)PA�5%Q����
k����
+�P�����h�P�ڲ�H�־)�@w}S��Ч�#RT�]e�"X�
+�L�dah�^-Q׺A>�Z�����9W?�Հ����
�@�T�I/_�tGk�nh��<6�媷\�7��Rt{;'�Ձl?9��_R�믿��--u5�4��}�̓��S�qG��x����h���C�r[����y���iM��W	���BD�bNo��H����\�I*{Kܿ�l	��W�Q�>�&��.��]׍9P)��%%j]����u��+H���������%���i�v�%�Pe�@I~Ϊ����+��F��T@
+K�/�$a���qH�]�r���3�Kb�1�� '`��%����C����G��L�.U�����MR�l
�К�}q]�?��H^\5C��O���+ǡF�
3k����(��l`C�$C*upHd�4�EW�;R���,~��<��:����?tI�oTR�_�vA>�4I�J����(��Q���/&��$�u�(Wa�Y�$L���4�|�����܊�,k�|�X_�dvk�w����� '`��%+�b�Mʌ�NCkRy�%�'�$�!B�,[hY���j�h�7=m˜��<�:?׎���%"ǡ�ӹNL�Q��0�����*���d�:4�e��-�捠��_�Ҵ41��[JӦKN1o$�8��l�̔&���J�*:}H��"�'
��u�d�p]E.�o������%
�ڒ q���& 'd�$�]�@I>TY#P������ՉaM�R��%"��J�A�I”-���cc�NC��Ueji��fm5V�
+A`|�Lu%<�Ykr�Ts��Iɉlt	4Iu��%sa,�P�d��� 5��<z[�/|��R}_�7B"W���i��?%TY#P��·I*�(m=�@��	u&�R$D�霎[���{�aK�W�9
�@]Y�7�&�w�Σ+=?��H���ǞK�I�C��Δ���\��-nLRB�5����
��(EZ�bi��9Z�$ ޔ�X&upH^�xQ�,[!���������F&-�\R!o$��%��Y�混�-���e�������_���F�&���)����)N��?���a���K�Y������C������1U��}�����K���o�_r���K0�#�{*�v��R��'|�uI)V��c�k�H�I”-jN�A��e&S�ڻ�S���8)j��Y[�� '`��+��ʻ�"�F�A~1�ڱ� �v���C����������¸S8��7�F�R�DfJ�X��om���$H�Ǻs
+ꌑ||������2�)M@N�4I�J����(��Te�>#,�����@��)[Ԝ�����}�b�{�"p֖��8�	�$�J�qѩK�H�Q)�$�!BH`g�!�@ץ���I
��41^�R;�~�<E��C"3>��g���$H�=5���Qhtn�Y���jۇM�T�C"0>rB�I�U
+�DPe�@IT���I
��aIZ��U.�� �$a�5gbV��w��U:b�A��AN�$
PcVfq7�8�u��r'>4Iu���|��*uH�k�Fl���
+i޳��۹�"���8r�իW될�j�-�my��R�e���[:0:Se�?�!�h���s����%��n����NR���s^��~�T�W*7e{�|I���_����eK!�$	�*J�����BT-͢�U��D�j�$�$L���4���J�?N\���ǡ�kz�X��-��q�0IԘ�;�s�3:n�h���:L�lE�OD�0/���l@ץ���0P�DfJ�XtE��U�I��A����&]�F��E�-S���	� d�$���@IU��DE�Ju�J�I”-��>!�&����gttD������q�0IԘ��̎��uѩ�)f�@��f�E!-n��<�w�X8���!q�5��80O+0e�PdF�TE'Aj����K�=�� 'd�$�7�@IU��D��Z�>,\�I&C4IupH^�~]�:$J�J��6��nsI���T)���no�D4��%��C�T�������[�+�J���$�CB`s_g��ΚC]���%UG]��z\��5�����ꩍU����yжv��	ɣ>kH�ݻ��o�l-���W_�|��l��h���vI�[�̿r8a��7���o}�[u��������ӧe��LVK+�&�w�w�h8�����,�*�$�a
	���z�-i7=zT�I�(�| Ն�i�ΎK��� '^�z�_��_u]מ�I�y�B�%%Q�,V��K�}r��KL/�$�'BR��&�XPE�I��h B�/���o~�DTK{D�&�Q�I]j�-�7r֐��`08;;��x0���<����/��2���<��d2�ٌ�F���w<�μ??�N�?���y����@%���ʗ����)M��a�����l8n�m4����q IDAT}�5?�я~�����1?�Ǽ�ֺ���d2!"�X���l�;s;�f�}����jϷ�-�:��fNUtR��
+������$ٌ���b�l�x��f�l:��!y#���*KJ��T���r���xI)�!h����ܻwo�y���3_���Ym\g0L�S~���y�y�h4bg��l���i��l�����n�٬��p���lN&�^���6;�=h6���Ç�1���	H�>;�M��N�׸B����Q�@A��$���ɒ�Ek�#
��Ƃcdf���&�����U�A��U��De�J�*�%�j��h�갨=���mD�Z��t��t���l6k���	�f�����Dd:n��ns��I���Ǯ�>y�
�e0���^�wvv����Y�{6��`��Z��#y��M#�<��lv: SJ�f3�N��D��� �c��
2>v2�t��l/�a_oB)�9H"$����.��G��ˑ�o��`0�L�+�t:�n�/�w���������l�S��ii3�áR��t�p�&DN���_|a���Pl,���m2bu
+�B�%�@`|�ĚIr]��ş!aK�$
��^��>I0h�d�����e|���?1�͌���b����/TY"P���"�V�Q�ן}mb�#�$!�V:x��<=�}��Sɍ�	̄�Ȣ�J��n��!�,[����y��&B2��֧�lr�#�@)œ��5��5�.//�<yryy9�L�ZG���q`���o2���Њ��-��ٯ>����}���l!+nnnR�ww��V����Ը�[�IwR����cu�eˏ��Kjσʖ
+������#c8<}�4��Z��;+C�$���*KJ�Te��y�$n!�o�4Iu�����kGXRҴ���Lȏ���h�����f�T��ۧe��֟n�s�%��㹴�Ӈ��9==��A����4�#�Al�#�� 	�G�[���	u5B��Tua}K��u������<"��v��OO�E^���s�&	S��#1��ɞ���u��F>P�ڳ�MV.���������&�o�/D�C��f3S�$�Rt�x<.1ph�A2��9�:e&��%%�+ANl2I:�
8�W�oq�ȼ����H��INC����d�����e
�֍����O�+���Q��~���}���...����������p�O��!���o~��pxwwwss��{�ޯ~�+~zyy�s
+onn����û�;n��S�>��!
��o����EoQ������X{�>Q�_t�y����z�~�mA�I���cӓ������˫J...b�Gל\\\�F�M��7��L�B�`��5�C
���S���	��6%}�eaD���F���<��O?��&Dd���O<�3��8)p�����k�|b��z�_XT�D���eHZ-��W�F���Z�G)RjQ�*�o�eSq6��Y1��<�8��x<��z���!�����f3�5W5�Y�~4��?�ӧ�~��O&6ay_+*���|���Z���-���_���HD�Vx����S$�{BaD���n��R��Z췘���b.-�tqF�m������& 5��}0e+{$��A>M;�o>_�HD�yx��12c�x���e{}�cj�����q��}�7x#�q�<@�ل͘�O˂��^(��/TY"P�T�ERI����:DH�ݻ|]c��l]�ëA��!�o�[�>;	��/������ŋ������<c3�!��l0p����6E�fN�Nަ�,Ϥ*������ʖ
+"h����~���A2<
+fJ��f3��
2<I.����o���4cd��$v��86<`����/TY"P����I�;.^MR��(���$|���P��~������ha�n��\BDl?̨��cN������?�x���P{V
s#�4��ʡ�j-�M��Mcd�
���Xp�l:�v���ٳgςYX��>|���I���+����%�F4K	+㓶0b,�$����T���	U��\×9.�%�P���Z�SD�o~SF4[nnnx�{l���PS�^Ca�R�J�$�@U��^d^(�&�P�X�"0W4�.��N��M$
�ȇ��:$)��G��l���M��Y���Z��\�E�6�7O�� o� Ճ���|�L�`�A��I�81�a�:8$	�
��eaD"�5�6��
W<�L��/'d�S��_�������4�8w���fNUtR��
+Lir��$Uw`5Cd޿Pe�@IT�*�Y2/�@�T�$�ek��!g,���	{����l�	���q�w~j�pZwZ�kg��_5�rzx^z�y�W_}��[���3b�Ԕl���I��0.�%S�����$Y��ȂCc�12�D<Ff3@�)��|6ȼ����H��$I�́h������&<Kw�����lJ�N
O����)����<ϛ�f�N�#$�fs2��z=No�[���Z>D
D���~}���O5pc2�r�r�,8@������:@��N
e�"�F�/^8��3Zb�f˒�ˆ����ˆ|;$�NGk����4DĎ�Ç�ߣ	������???ϩ��53�_�Z��t6�___�
u٢�'_ҏ?�˹��E-�������:��?���a����U��#���-�cdz}�,�0"�1��[�(��yk��8��b&-�1U���-����K���~��/�׋Rt{�� F/��S���Ja�H�I:�,[[��'}�N�{��qF����˿��f�ɽ|�����h4����f���>y������L&f*�R������?�=afBU���њ|�t[�$�:pp#kY�t`���9�n�nY�w4&�M��i�)�z�ϳb/b8�K��^o2�t�]�J�٬���c�u�<y�-sf0t��N�svv����cl!,|�
`*�yR��|�m�)�HD�Aw�ݭ�)0q�����˝~0c	[�Xo���rl�ur7��T[y�s
�MlB��O��?j6F�f�lkaD3FF�`~���5$f����"6���
�AɄ��}�w��"��#�֨bP1H�G�EeC� ��������Kj��*T '�F��ˆ[�
�pg�0b)T%P�_�*K�(�B	4I�2e���5�a5PQL96��uw	wp��3J7�ᰵ0"5��G;F��C��Si�(�F�â������쐳O���+L�`x����:;F�|-@���!�Z�ʸ"�@�C�f3S�$�Rt�x<.1��������(t��rRJ����Br¦0"a�����,(��Ue9�F慒h�ʞ3�
<[7a�.�b�|������c��z����~�����������p8����q]�7���p8���������^�W��?����9�777�~��?�������\\\��}ާ�5$���y���҂�p8::J�G�����6�l����^���-�d�x}���۠�����2t �*����m6������4�o2���X8o�:DHB��o����ګ��w�Ia�O?�T)5���q�����|��h4RJ�6'�I����'E	B���
ؙ='�b���s&yצ���#z�g2��F#~̶i4M&��l6�P�h4���/��|�J ��JR�$�z�/X	�����!2)�ȝx��VJgj��b�����������ٷ�a�oVȌ0���S�T)��� �&)X��������t�ˆ�
�7�x�7��x�l45��И�3@&���*KJ"��J"�&�uH�ݻ|6i�ftj���S$����I��U�KpA+�U^�xq����<�36���T\������:����9[u��]�rI����l	� �&)�
����|�Qkj���cڴ?-Uq�u^���V\��,A�����>�5��xc1i��&�I��ql����B��U��D"U	�D"MR���6����y�)�0";-S.��S�v��?��/��/��i��RS��C�8�UL�]"���Mi��O���Tj'"#�Q*�1dlnxnp�
G98�AD�gϞ}��G��ڸ)��[o����o�U2g��M���R�䭷�z��yr���!�{6�|i�*���
���U'��z��\R"��?�����we�E��[oݻw/�!��.�3�]�A13F�bȂ�k�
2��w����,(�
+We�ȼPMR�ˆ�E�vH$In����0b�d8@F�&�����5\��G��X 5s�u�P�U��d�rII�
+B��LR&�Q�X�(���*KJ"��J"�&	��Bv�k���L��ί��sB�Ǐ___��}"�y����)��^��n�)����'�Q���@�l6��/���8V�@/2��Zt|LWW�s�A,��i�l�7"$R����'}��шwcoDkL�N�l��L�g��&g<��<��ꫯ
+y���G����8��`�����`0�ǃ�����0eC&��`0�4Y��<�=�
6@D�������Hy��nHCrR�$7%�ϥ�NwW1�0�p8��l	���h4b�#Tq6�u:�4�M��p
+`�br���>edFc���I����>�|�zd�"�¨�%%��q��Oٲ#
�u�]�
+��˕�Ӳu����-� ���*KJ��U�8$2/�@�T�$T�$��͖%	���\:j8���������j�0"�I���Z�y0��-
������L/ɾ��	H͜M:�y7����_nO[�KJ"����X3I�ʈ��-�cd�
2�5Y���ld.c�����Q>e�ȼ�����$U��
2/�@�T���˗N�����?�(��uW���7�ԝN��톆�&��h4�F���)*��i�n��5�
+7hB�4_|�E�A������3i�6-���r�u����9K)?���K�,�t������9��ի��L�[B�}�D~�l#��d�D��ؖ�12�
2J\oޚ��T`���e�o���\�I�â�R�l-��Сwf��4ըC��fNUtR��
+L�rbS�Tl-�xvv�l6��.�'��%h����5�5�C.//�<yryyiJ"z�����n�KD��b�!)��J�2T5[��˼PMR�uH��}��(��i��|8�e˦0��c�H#@,-�.�F�Ô-�����G�w�@��z�Al�#�� $
�¨�C"�
+U
0����S�T)�'삜�f�v(�X�����,(�JR�|N�J�I����`�_���~yF�0�f3�m�l�`�r�n�+0�Hn��!y�V(!fzPi*ZQ��\��V6�/Y�ya��|�;�ш��BT��>?�L&�1s�Ɵ������2�g�Y1��
��k��Q1t,��j��x,�R�~��!	��M�C�������K�8�C�L
+#~�駜�d<w�]N~��'��F#��mr��gϞq���!TT&�XdFc��̩�N��T��q�[�lm�9�"�ˆ�
/N[�y�&3Ff<��h��_0@&���*KJ�2TmM�%�B	4Io�- B�c?��<�q΍�e�8q{��f���l��ED'''&-#�F�Z�N�ó��%�[�ݮɴhƨ���&�۴�m���u���̩�N��T�U�@NMRh�0��$:�84Ff���Ȍס��!�`aD���z��/~���y�q]��h4j6�fL��z�ۦ�T�=�y�B�%%Q���P�h�����
;3��dg�!"��t:�!�K�Ʉ�ܲy0�ٯ�!1��5�@D/^���~�\���aa��)�}�K���֫��Ǜ��4F c�#c�b�x��7�#�cdb����To=�4���l��k��JXFB��졄�����o*���v�Kh�f��t���vy�i8z�����Q�����.+���:>�@j�TE'UJ���8ȉW�^� It�b($��G̦1��Y��1^Dp�l:�v���ٳgϢS�x\��?|����ߦ��d޿Pe�@IT���l~gF��2/�@�T�,[���	K�3$ma�X�-�	
��ȇCr���C���)�h����Q�ć���
2�Q�o2O�T���V�?^<�D�D��\�I2�x !��F�
�v�1�\��f�-	������T"!\w5����j#؍f��#3)D,��9U�I��*0>rB�I;@&���*KJ��Uqx��b��e^(�&��S�l�,�H˹X�������>����h���d2�2��v�30�<�&u	�g�(���/��ǞQ`X
��ȇC򔭪�o2��q~H��#
+���!��ˆ���T9���~�!��'"��λq�wZ���Y��������}�F����y_}�U
o�|l
+#Ҳ��)�h
+������
�`�^"b������<o:�r
�b�)���Zey�+F�p|ܔ<4a���j�*#&F��Y���l��?�F�°a���h	�7�-l̒���22#��@j�TE'UJ���8ȉ��lٌ�����)�H�1��y�ܾ[Ș=߂
2�_��D�$*�0��#2/�@�T�$Tq��k�lY2{�;!!�$������!%. e�8a<c��;*>��:d��u���̩�N��T�U�@N��$ǡFc�gH�b=F k�ۦTb�	���\Ƅ�km �����!���*KJ��
+#&'O�y���:fيN�nٜ!�0��G�L�>�}7��jV\ږ�{n�C���ِ|��?��vz���[$��l����0bh7��L�D3��T ���l6���>y�Č�q9�v�������x�#� `�H��z��!�$��MaD�1��zf{0%��2n�������v:�����&z��Y�'H͜��JI9,�?v�c���xt,:Fƅ�-��h�-������ ���*KJ��T%�P�h��e+�F֢
+!0 -����l%X�PH�c~B�@
x#�a
�@��}G
D��`A���c�ED@���!�V���L
+�fNUtR��
+�����f�v(�X�����,(�D�(�D��C��řK6M�ͣ0bh�i6�qn�Mm�6���v���v��i��|8�L�r��e#��7� �FF��(�ˆ���wF�g51������t2����u�~�ӟr�ws�VL&�Xd:��@j�TE'UJ���(�6&)���Ga��\�dS�A��qY�e޿Pe�@I$R�@I$�$��!	�!1����=��7���G���4�C�L
+#~��J��h4���.'��OF��Rʴ�eL�={�iR��PQ��c�b��9U�I��*0�;ȉpi��d^18�5��1�&3Ff���h��_0@&���*KJ"��J"�&�iC$��_M����-���d2i�ۡ��D�n���<�����~�χ�n�˞���KD��sJG���L�Pig�I
+�E4(��#��ŝN��ZZ�Ԧˆ<ƾ�R���o�<��޳��F�f�i�Ԉ�K���r��P|��c�8|�K!�
{Dĝ~�1�=���J)�SO�S�*�����ҋ/B�|���Cx�ʬK��"�Cf�1H͜��JI94I����k���"�Ń�!��a��c�$�…9�>�NyOZ�h7^J��L-3FFȸ�	��2~+2�_��D�$�J�$i�j!ٍ�#2�\�ν9o�v���p8�<����7m��G�0�%�� �F�,�fRѸ<F��ٳ�,��>|���I�� �+����p8�}��7��}���(ag��]� a���������ݝ���Vk��Ң�*���
��S�~��&wP��Uz��7�~���^6�<}����������.����;�ف�K��I�y�B�%%�"U	��4I����<Zz�-2��(��v��Q���e�:-��9U�I��*�6Ȗ�U�1I���O.�ȫ��>	��������y�B�%%�HU%�H�T��Uq:��Aj"j4D��������f<�����݀�̩�N����3/
QkR��R#v�zy� �y�B�%%�HU%�H�T
���6�M�½h�����%�K��8nE�a
 ��I���0)w�V�������X�����xJ��ַ�oBT�!1�
���
�^��L�IDAT�w�^���}�����ׯ��o�|���KD���lܭ�ׯ_���Q-g�����lMs���lsI���ׯ_���ULؘ�%�U3Q��wx#ϟ?�7^�zŽ��!�B4�n��W�^���7���7��������o����-���T�!��/^�!}K�����5�ו~���~�����%��+��x��h�5I�pH�Ds�T"6����L��JuHLrò��J�
�6	�J@��*
��T)BBq�>�lSt�(�"'�	�/[�F�ө�K)��r�M��$_بH���21����@�*I3I���([#֦H3b-E��-���l6��SU�0"��������~�B�����([�X-�KP��Kzyy���|�6V��˂�l�mA��/)�i&I���%�������"����G…򗒸O��S��_�I�f�yvv�Gͦ	�d�Tk]��-��7�"�_�n�k�Pc��I V��˂���a�EJ�� ��$��G���fS����"����G…2����t:�p��wH<�s]WB,����p�߃�Em������;�d�"�_� ���&Xd�.l%�%�=�L�d�#��T¦H3��u��֓��u�@�������Bz�M���o�N�S�����c���"+qI�J$�1"+ta�.�! �$I�>�l�p�"�|��m=�H������d2i6���DN8�bY�b�D���H���+��]R�:�xa+.i��K��E�|�H�$�K&�P	��!
T��O����Tk�l6�ͦR�S�N���l�y�p8�@;������ F�Q���u#�ٌL&��p�)
+�L� *�e���^�^y�y�l6�J)!91�N��쌖�7M~-�+'kY
�t�dqqq�y�_|���L��p��v�# C��@������`0��f>�Dl���
+��?X�M���d�y�_��_E�~8$�����f3c���!-׍t:!�,�,j��(���€C(
�!
�@i�!
�@i�!
�@i�!
�@i�!
�@i�!
�@i�!
�@i�!
�@i�!
�@i�!
�@i�!
�@i�!
�@i�!
�@i�!
�@i�!
�@i�!
�@i�!
�@i�!
�@i�!
�@i�!
�@i�!
�@i�!
�@i�!
�@i�!
�ƽ��.[���=�����.�t��d6��f3"j6�D4���Ah��������X�[ ����_����P5M�V�j
��A���`0�N�	;����`�h4�Ɠ'O6�6��x�w�yg0p��x�wvv��'��d2q�w�y���{�gv�N����h4�L&����w�}���x<���<~5V�x<v���l��{�
�
�F��x�w�����j���x�۟<y�
_������ G|�A)�����}��.7����x�~������f��l6///��///y8�����4�M�T�����]��<�j�����"���3mF�8�^�T��]\\t:�u///��>�n8[���n�z������!
yqww��t���X��n��&�������ns������:��?}������0����e�ۍ�]s��f��_)ED777	o
@]a�"��*&/$�u]"j����=����V_�=��-��f���F������x<Ʀ��h���N`���z=3����A&��Hkܡ���O��L&�籅0�E	5�`��ɛL&�^/x
+>����t:���E�9�-pH����㳳3�qB^����F�h�ڇ;�h?��6�l�|�6{�������y����
�$�P'F���8��l��o��n��v����<">�d2IxS��;����{��]\\����~���}1wd[GV��Z���c�b��P�"H����R�a0<y��h�6�L����!/@-1��u]�u��i��*�<���)�mx�-�D�^������Y��1��R����x�֑�T���</8����.2��KX:��r�?�L�}�]�}��p�l 2pE�p`�d���0�U��i�y;���R�Cvd6��:��p���t:��M|�X�=!BmO�ټ�����d�b4=y�ľ�5=5��emlEƫ��B�h�{P9�7�...Pl��#	
��ev��q�i*-܀TSZ���ӧO�L�ӄ4�Q���p8�<�w�y��w'�	�"8$P{�X.(��
�~�o�Nf C����|F)wǼ"p2���)�;��3��Ȧ������������O�I!�ڐ�z��M�x<�#�s�:`�y��I����);6���9����Yh�W��DvYw�%f{�^B�k�h4�</m�.U$�o񪘼�x<�NCaN��ߕ�t2�CvĤ	vs�a��tjّ�n�d���ݓ�dS=�Y�<EOD�v�Z��h���
�C��ҵY|X	�7�L��)O�6R)5�N��M<L�8$`G��v���<�ɓ'��`2���n��hIB��y^0���n�lS�t:^�wvvʶ�y�`00&��n;�u����A���W��~�PWx^��yggg&�	���ZMX%L�t:=;;k6��&k�m�g���~S�@�]*T�`�������_�܈�^\\��������z=����¸7��|߿���W��f7���eP�{�^���6����f8�I�t:��vp]7�8�C���.8�����'�p8�&���fӌ2s��O�����R���gw!
�H���<�p8pY%�{z��w��y�z�u�Bf��u��f��m�����o�
Ԇ���]+R����-S����C���
0y�֐�\���
��<��=��lk����
�?pH��)[����
u���Sk`WIEND�B`�
\ No newline at end of file
diff -Naur ns-3.17/src/lte/doc/source/figures/MCS_21_24.pdf ns-3.18/src/lte/doc/source/figures/MCS_21_24.pdf
--- ns-3.17/src/lte/doc/source/figures/MCS_21_24.pdf	2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/src/lte/doc/source/figures/MCS_21_24.pdf	2013-10-26 07:07:30.131364396 -0700
@@ -3,112 +3,118 @@
 5 0 obj
 <</Length 6 0 R/Filter /FlateDecode>>
 stream
-x�����$��&�ϧ��Ԁ�8���A�
�
-Т5�V��QhI�����b�W�gV�h0��L˰���t��F�ݎ��������O�����?���>�`l��ػ77�tw���oo������?��7	�OɁ��s��1��O7�q~��/���ݍ5&��H���_�/��6&����%921�=�~
rp�)��ߝ�=>���=�S�`|<�z|�������6̲�^"<���d�G>R
c�3�-KloK2����6�MIlӛ��7��HoJb�ޔ�=�HoJb�ޔ����I����$��]I٦��6
қ��M�Iz��ߝ�[�ئ7%��'��էۓD6E���B� m�tYٔ�K��<>H�6]�t��~���o��ß�/g���m��-����9l$��G
-6D�������dj�w�����n��B�|���:����q��F�o�܋=�-s/�ܾ�������o��_}��Z����/����<���Z;=�=,?竘f�9_�4��Ӛ���zL��������|#]��v~�f�e�
-����e�u�9]�A�Ӯ?�Hn�!_r�RL��Sn������s���_~��٘�s��<��8{��)�}�_��[3K�����o̶�m[�W���1dw��I�;�e�{H�K���g��=�18�{(~�aI�0������q�m�G5�e�C*)���b�Z��v���O���Q�;i�2��.T���Ph��^��TҾ��!�b'��F�؏J�u?
-
����J��c���Nڵ�$����~&�l=���������Nڵ�$����~&�l=����x����e�v1)�D~Ԓ.�Qj��^��T�~��!r��mې$�(%}�Yä􂭧���h O3^����1�!���$]���0)�`멤7�8b���X3�QJ�?~1\��G>rݶ��L�.�#1�{,n3YG-��B�<���NA��Ée\K^oA\��Y������'�ҮU$��$]���0)�`멤}?f�ࡔ;i�6��~T���Qh��^��TҾ���;i�6��~T���Qh��^��TҶ�q�{R�� �$�tُRä􂭧���cr�����H۶
IR���5LJ/�z*iߏ����4Үm$���$]���0)�`멤7���=�y�I۶
IR���5LJ/�z*iߏT
�~�^W2��$]�㗫���Ǒ\�m����G*�0����8�#���rXuҮ;H+%���&�l=��?���_�Fٵl�a'J9�}�����<�����M:��v-#I�B%���I�[O%����R4���vm#I�G%���I�[O%m�1#�jTZ7H�U$���%]���0)�`멤}?W��F���vm#I�G%���I�[O%���BV�;i�6��~T���Qh��^��T�~�^��c#m�6$	?JI�G�0)�`멤}?r�.��zI���TR~Տ_���?�t�m#�$]HG
-؛l��G֫����&	_�8~X��b=��G�Q���ӡ�ǧ��	�;��Iw���;f���"����#�/�9�[�?`_.xs��dԌ�tػ�$�qC����� �ʋS������xh�q�sG���·�q��=TF,@G|O=L�o>�
)��W�	��:�����������i�Zi��A���)�`(bp��cE]Dgʃ(����=����7�j��W
$.h>����'�n�"=1�+�����hp�!�8p�D�W5���Z����!���A���oY�-����t�N5�ŷ^�&�e�>��R������'�ބ6�ib\�ȇdHc��F�	����g�e�8
-]P�Qڼe�	X��3���<P�F��(��~ęoU��1��Thq��C�=BƅZ�&�e�8�8�OJ�50��&M����i���@����W��5�s/*�8�8?
-&j�ĸ�aV
-qF5nl��`�h�eu8�68�6�E���g�U���%���Q����M��5�9.x��Έa�Ԇ�o��δ@L�f�e�8X��@4��l
'-5|r��L�41.k��ĕ�C8���3Ɗ����"�4۲:�z`�D���2�(��IAz�Oe[=�43.k��@S�
�\I���O�VM�W5���C�@ʥ�����I��F
-	-8��{�AP�J��
~+�&M��9�����;�4+%8E0,=��P��oY!�RԇC�?
"�;�x�A�%e�ھ�$�LN9D2R^rJ�%W�	9�1M�������OpIz����!������!˗�H���C����������+�ٮ�p9K:k�@�1�rU��G�U�=�p�����I�
-���V5i�c�(\��,����*��h��o���v���ͮW�R�I2e��K��rG�i�,�dq�F���񑟱BJ�H�l�p�[O�Fz�
-)�c����™q=��k�$�5R��g�e����FJ�X#_�@g��$n�g���8�Hk��5��R�
-)cc��z7�3R�9�ℍ>1��p#;c��ñFJ�X�̸���3�H9k�+'H�̸�Í�5R�)ac�3�z��3VH9+���s����>��XTI�̸�Í�U�W_k��ԈQ�,+���֢S�NR������9��j�6�2x͙��u�B���Q�xf\O�FZ�IX����:E�1��l��(+31�'�ܭ��mK™q=w������Ia�I��ӹ�E����ȬE��H*��oǐ�����#�#���u�!�q-}b\��FZVr]�E��)*@����oY��� �t�`"y$�z���Ȅ���1:L� n�5x
-�P����l�����U��}9�L��ݖ)-��Ug����2��XEg�0����IԌ4�E�Ԕ)�"A��j@+G'�cX$�{kq!���bhX]�
dX�P_ I3c�5·>?c�i�)M�̸i�z��p'��M��sBn��,��?�΀��F�3��+���m�dB��I��xx�h�{R�d��vJ<b/9�T�(梨��-̴��r�H�`>2�!H6�>9��D���)�Z�P
-��EJb�lO�M�Gyߠ�F�?d1��1�	i�D���0™�9�F�5�	i��cW�
-���
-�"�Fb<!�r;;��=Q #����k��c�b
��]��Aa}�vB�5��(J�'�@$�H�'�M#�4�a�5��Z59�D��k�u�!#0�8��bk$�Ү� ������4�H��OH�F�0�2�����X#1��v�Hf�=dD�v��#����kDN"#��w��`k$�Ҧ���d�mM�<�zl�� ٔq�|�1���e E��☯{?jzx�$��H%�	�WS�k���90����L���d!�1m�e0���q5�75���(�CR����$kŽ'������Qh9<f�6ޓ����
n�g
-q�&������5�s�����$��xB"�U,���>H�r�X|� =$�
�5�}���}
-a1�P�|���񄴉N`�A�g� 7��Y��Az�O}��OHĸ��$%�:
-��*J�<V�����LI[�����ݕX� \�|�=AzH$[-e��`\4��1	�8��9TL�HA2�a�e�OHĸhD�����Nm�	ܩ�� �\�`<!�W�<��
-�L[DT�	�)��iS������N�EL�7��\�b�� �|�mwu-#��]�d��b���{&VHa�0��.h���(}�� 4��@ӳ��E��"��]+n"��sTr��)zs�e�Z��/��v˗9�3~�9�
-0�2C'��ٷV��� �|���G�M�pR�ob���9^0�P`���l����{	���N	��t��N�P������)��
��4���Y�s$) J$iPb�{�Ui:Qf$	g�FaC����X��J}9T��|d[L+*ؓ[?�R p�N�1���}ETG�D���M怸ƨ)K��]�D��0IT�o����E]�o0p~�&.� ��N~�&�;	��yX���Y���lW�o�p�F��é�kWi�I\j�eR���6eę���q�M\��e�c�jd�
-�]n���z�M\��c�= h�����<���d�$*��l��
-_�T�m�o2��5�[69�u
�+�U�R��wtM:t�7_���6��7�$*ꕱ�O{gF�5�Sx��M�uSt�2�u�"��:}����A�G�����I8^(���X��FDW{֒G��
��r�}�[,W�V�{�f��n��3��p"P���-1������_�rp0�Կb�u����[Q4[+`jQ�p7�A��eE��!��h��A�O���G��wP��G��z���"���q8_�h\�3��,�5u[_��|)��^�
�=��u6��CR��w�w�K���:��lR)���=���8�mKR��u#0/*� H๰z��LJ��*D� S�Y�X{6J�.)��(.Jr5�t�qǒ3���)�3�z��H	��'��%��d�Rݿ�s��GJv6�,�_�'>—�gNg+|��*�]�@G��$���ϥO�)����
-�庻��,8s�$`(I����!PB�������t�H��$2���+Aj����$�cxR�;�iCk�2��+׮7b����|�<Bq�3�
$��b+0�%I�`u��7I�=-_��]�{R�@S�0��������1�zy��%�`�-�ن���kq^�Њ?�<�N�ۺ��"̸P_U�����7����0��#T�Q�|B��x%�Y�O�����_���ĵ���m���xC��eh[��
$px�ɍn9���8����+<����T��Z��8�b�ڞ"�\����1�h�Gh��NH���,��է�௬��;S�4Ԗ���AO\hщ���}����ڻkNߒ�-�
-��B��/o�|��q�����ï�ǟ�
-Pw��
-a��+\r�O|��A\%p�J,���N<� C=+Ṕ���lj�~�U�<�/��'�~�����w����L�]�!x�OD�&6��˩8#�0�(D��-���<�bR��LDX��=��!<�!�;�T0�O�|�����CQ��Q���(cK�1F�W7����
�N���b��ٵ?�金XP؟��<���O�F���ؚxw&&�=�hb�����Ir���ђ�'�{�H�#d&4Fl�_���� T#�K'���/`YNzv�O}������줧���;��7(b�a(R��D�����S\8��"�U�n0�C�l�vO0���<#�Zbؘ���kF�=��G������S��DZ�f�<���r6v�����v��`"�kD�9am��;Y��Zs��/&!�g� �
/:`u�77�Wg�t�뷷�,0b^��/TZK���c����}	�yY#��ڦ�!�Pit��	i0>�e��;w�����y�Э�����$�5!����$��MI\@6�MIlӛ�x?�l"қ�ئ7%��D�7%�M�J'¦AzS���=IO�����`K�������d9��t{��&�!i���Aڴ�$���/� I��i�eI'��gO�\�?�_��/3V/�t�[�q��s��$,�,���"Wb��wC~����!���jo��ί��G}��G}�1M�_��c��򃾊j��UTs�A�瘞�-?�8i�)_�I�9@.9?���||�=������X�]����O�"��|������x�a~�~�u������7���b���I?��c�}X����O95[I�a�l�۶q�˶Q�!-�B㡜��g�9��k#��e�S< ���u�n�0�РRr.�)!_k|��39���8ێ;��v-#I�B%���I�[O%���cZ�xr�vm#I�G%���I�[O%��1D;���vm#I�G%���I�[O%��1b[_��Nڵ�$����~&�l=����dr�)���I���$���tݏBä􂭧���c>�����mې$�(%}�Yä􂭧�����H�W~�m�tHb?*I��(4LJ/�z*�
?�X��2�L~��>��_��Ǒ�\�m�#�����jB��G�QE�6�7�9�iwۀ$ѸҒ.�+�aRz��SI��ʺ�퀤eײ!��(�\�!��߷�Lξ��[��]�H�PI��C�aRz��SI�~ċ�&?vҮm$���$]���0)�`멤}?�}�Q�#��kIb?*I��(4LJ/�z*�
?f�N�?6ҶmC���
~d
����J��c��mʳ;i�6��~T���Qh��^��TҾ�a�.{��N�.��؏J�u?
-
����JzÏ�HD��r�	�QJ�?~�Ҙ+~��u�F>2I���8�%�a31����˅��Gi�,�ƕ�ty\I
����J�Wam��Fٵl�a'J9�}�����<���Pl;L��]�H�PI��C�aRz��SI�~����I���$���tݏBä􂭧����ڝ�ҏi\s�gIb?*I��(4LJ/�z*iߏxy�Sq� ��F�؏J�u?
-
����J��c����;i�6��~T���Qh��^��T�~����~�;��ک.I�QJ�?��I�[O%m�Q��?~@�y��\j~я?BY�;~��u�F>2I���x�	Z�^>r�#��g~+�$x��^#8�"
-�I�'�Q���$A�>�;N�
d����
���ޏ�MX�C˷�K��qW�vq�פ3�_gB�+��7���XM�K]0xZ�F�{.��g��W���+�����b[��zhWzŷ�Z��w�!���pC�<�t����[�:�=�����fE��
�Ny������Ŕ�[?��_
-x�8���rs"v�C���߇Q�'��>��|�h�#��;���H3�zk�~��hb�cg�7xywP��o��c��^(�K��S
�.i�&M��=�E�B�ϩ|!�À/��g�e�|��4Fl�l���b�+X�f��n��z�1��[!�����g�����y�G!���qiҏ8�7Z�ȳB�����j�#E�׻*���F�>)�֔zK�$M����i���X����W���%��݅F�E
�_5ib\o���n
-qF5nl:�}�h��6���(���z��-�g��{�o/0��X�(��P�v]0~���&M�����:8��;z��I�̸�͐"�޺�l1���
����2i�ĸ޺�&��
]�ZO��~\써0�h�'�4۲:�z�k[�dO�{�B�s�b*�����L������炗��{�sm�|�Z@��ʢ(�r�5�� ���R�8�.%�P���2;Izb\o:H
�a���8]��h
�0��/e֤�q�� ��]�	��WJ1�(��"��4�-+�h�~tP@���yu�����#*��w֮��@b��>:	qE����S�0��Ӭ���^]<�h�jd�G���9)�*N/�FlU��o-�:����*7����ZhmƤ�jT�=�Z����L=y�����R�=�Rk�Ȟ�}ўj�q��0Ъ/�\e����O
-g��Q�p�b`��!,R8����Qr.��w�p���/)���?1.�p#9c��±,��X��r$ޓ3�pdp,��5V8�gp=7
-G'�tM(��3���	�#�G�&4Ό�Gn&4�Nh�H�̸����Lh��8�5�qf\��s3�p$pB�Hׄ‰o=��+��eQ��
-�����	�#�G�&4Ό�Gj&4�Nh�{*H�̸����Lh	��8�5�qf\O�Zn&�N(���7��'p=5�F'��G�Ό�	\Ò���#�$���@��z����A�]�m�n�THP����W�	\O�j�Yw�)�$q@��[��'����3l��8$�h���OL�=�Gb�}/�����d�T���>��ӷ����ZI�o��B�Z=��[ȏ���X��u���������W�	\O��
b�	� �@��[=�����Y��?&��
��C��ķ���f��be7H*
-.���q�
<�`���[�aY{�t���sjoq��
-SF�(�D�?ؤ��4��Gb�$��,�~ΖRj�x}����Ζ�^[
�Dx�E�!l|�t�d�b��gs
�a��>x/_�Ť��_��~�O�^J5ٝ��#�ɧ��:�4�R�Lz��7~r�m9�L>C_ �;cw�pgh;�ҟiN�=6S��@5���Ov9��$����"���p>:(����-��G[A��OOd҃I��	�STt�4
���m�IDb}�퉰�ޘ#�-�a�1a�C�X1�������ۮ
�`F���$�q0�����8Rի0>�Ԁ�$�q0�����=/*#�31HB�`<!m�z�<aD*}�":E�l'�m
-�����=,Ih�'�]#�L3��rQ�&'�X#1�����n@7d���@F��8OH�F�2�2���IV1HB�`<!m�x�܂j|Ih�'�m#� f�|Ȉ԰]i� 	���m�5ȕ�5�k�vi_c"9�D��6j��O$f\M�!�m�f�GD֖
������jp<S:�j�^Fсi-�&N��D�9OH̸���X����]!�Ы��$W���`<!1�j����e!)��7�x&/a��`\M�S�dl�Q�������ֻ�!��)�k5�w�+P��Z�X�TǤ� �FS��!�1������*<����g�¼A�eF�xB"�UH �����m5&"���$H1��1���*J`[nb������ =��$5�#�1�"�fC��w�����m�!(�U��z��U
[��Fs�|����c�
-ˤ�$�l#�	i0.����_��{�Tl��t�v6^0���W�p��%��ꞀKĵ�YN��!wZ�^�@i�A(K��fUл�x�䔸���OJ�3�ԉ{2e*�pG%����%���	���wg��I%�?�m����6���j�
���.̣���}
tFgi�-�K�������{V��śH��������v�P��V�-�|�O5�!�5]�x�Z��7�ww�K~�����Ż^/^�i��x��
-~��k��ۂ[�F�x�:���_|�fJA�xVk��_�����_|�yo_�A0d-Z�xР��W�ADY�ZuZ��j�p1�r�S_������O����\o�_�T $�.h�$s�l��GND�ðIԪ��dj7j��ob�$Q
-1L��[&�PjX#L�yxw~�&�� ���}�&���cX0ojs�]����l��-�Z)��w����d��o��`�0ڦ|�9�m��$�l��-��kX$l*1�4m�&�� ���~�&{DWw���������#9l��[6�jw��Z�ů�s�U�6�vo����~��s��
�+X����k�u�Z��qm?��rں��0�nCQlQ����W��&���c�B�
-JG��#��HV�m��"� �;]��
.֖�b
-�*�U0����1�QίO��;V��c�Z}R�YE��uA�V8F�b������FpY�SL������A�����wDzEk��~�`C{�ne���`����T�u6T�E׵���j�po�u�8�P��c�.�z����Z�Z� ��{�!����˽^�N�.Bg�!�=��u2��,R��w^��j�5g۲�E �6��g7��Ʒ�FJx��T��;�$�����૏�^!�fB�y��k�ԅ�`Sh�h��Xªǽ��S=�ÿ��v!)��:�
�ڶ�I��~X]��[�PvY1��6%)��:��`a�ML��iy����Jo+��*�]4�d��V59u��{�ah¼�rz]A�\7(9�^���)�S��q��%DD[)�G��̷E��&��!x[�X�@�۸�
3%��+/��5AS�.��"y�����b����GM��X��8	�m�~*&��]~:�j�)�+x��	��I@M�7"���<���褁� 	>�$
���$�āCZ7����CBG���
{��TY���lb��:��b!j�7�W������ݸ��	��x�C@������h�
\Q���"��W	Q�iD��7d0�a)��n V��Unt�
-v:O���[1��� �{�oB,c���	�!��h/;H��-׃�'����9%
�dz��N�����b���L��P[z�C=q}�E'������#��w�,��y\/S�m��旷���{�����ï�ǟ�
-Pw��
-`V`�7���Dy��LZ6����7���4�p"��}�j4ҏ���s�yv���~��������=�W�v�t<{���ERX�>��5����Ȑ�ʃ)>��"�Z����%��u�����!<�3������3�F�fF��#��gc�q��Iث��y*���[okxv��0	��{�ң�t2	�������"&�Ų(5	���$�酀�ѓ��䌳�fO�?�$�������p"��2���NB���?��k��G�m��I'sІz/����"���c�������t����7j/nrA�Ȥ�$y�p�xB�?��&^"�2��_ݬĽ+��79#a�F��ɱ_���x��PSr�N��M�|x�^�:(u���
.�\����*f��V��.��x5��ݦXG
-�r��G��ܠ<��&����t�k������3�Z��_>�Pj�^]�+���b�I��ȏ������A�3%3ޝ3�R����4���#�
�'�`|<��:�U�	�Of{7&'_�׏��^⊤����k�&m�7%	�ޓ���vR6�MIlӻ�j$�m�7%	�ޓT"��A�D�7%�MoJ���q5Ɖ��$��mI��N��IoJ�6�'��ɩwG�7%	�ޔ4/�ߝ-�[��M�I:Y3OV��O�'�l2�$�t��i�eId��{4���iӦ˒N�R�}<�Z}
-"���_f�^��j��q��s��$�&�	������ɖB���l)�9���,�:�a���o�i���2N����c�&U��C?�=,?��o�A_�4��S��֟�E8���/�ɫO����o���x��bԽ}�^~�_�#��ˏ�*��{��a����pl�s�}���w�U,}�A��6-���"<�|̗����4G8�O���>_E�{�2F���k��s����Y�P�������,�{��F9���m�bmD���"�'I�Z9�4�`e��F`�ݘx�#�y�	��ΏQ5(�i 	�Q�%]UJ��y��3Iۣ�8�
O��A�5�����^�
-��+��I����-@��N�5�����^�
-��+��I��b��5�;e�4�^T�.{Q*�:��z&iߋxw��Nl�]Æv��sكB�Rx��9��K��F��N�5������
-��+��I��b6��#/vʮi$���$]��T�u^1�L�^���d/6ʶiC��t݋B��y��3I�^$����
�݋J�e/~���+^��G�ֲ�I҅��b#��7��
Dx��Z�i�1�e�,�F��tuT)Z�S�$m�*�%�N+��k	b/*I��(h�WL=���ŐL�$���)��� ���tًR��y��3I�^���h$/vʮi$���$]��T�u^1�LҾStxjUx�SvM#A�E%����g����]�@���)��� ���tًR��y��3Iox��vd���(ۦ
A‹R�u/
-Z�S�$�{���̈e�4�^T�.{Q*�:��z&iۋ\�3��B͋Z�U/~�Z�+^Y�G�ֲ�I҅,�Y���Y���B�s^�$FU�캃�R�.�*�@�bꙤ�Q����V
ʮi$���$]��T�u^1�LҾ�8�O^�Og�L#A�E%����g�����"���ʮi$���$]��T�u^1�LҾ�W�9��	�D��X�eϑh��m�d�{���*��H��E��mJ�e�IZ�S�$��E�H9��
�b����d�J�3O�l{�+Y�v!�DԒ�zP)�:��z&�
/r!�������E]�Ջ_�t�;^Y�G�ֲ�I҅,�c��b���c?��?��/i��&���It5jb2��g�ό$Φ'c������S`��Cq���K�sn�:�a��^�Q�/|�R�x�k�
��c\��H�����6���G��{�]����h�d|��w$�ږ~�۔�������zmA�g?��z��Y%V�_�-uGK��o,�[j���څ_�-��/��>~�~�V���v��Ō[$�_�k�Ai���M2���`��&�^u펖��:"߇�;��%)�
(�]�eo
|�<�D�U�W-nN(��&�J:ޱS��	��[��t
-q��:%�!دm��5b��Bi]GX|-�Ӥ�qYc���<-4Ƭe����w� M\��ı��<Ԯ&,�k�_�&�e�x7��h�i!9`�&i�U}/�E*�xb��A�kС��F�boyH�{�!�e��Fr��H-�I��xkm��^�&�e�����M�I���D��5���ռ�xۻ$W�C�ݙoY_��V*ī��AR�C5if\֘��^kL9΃{��41.k�x�7ؓw$xo��H�Fq.�k,��� ��X��41�j,��щvh4��QRlСI3�F�ҩ�S�b8=L
-G�I�F�䥠4BLtW��8\f5eb[և��B� :3*�(>��� M���1ǡ1B�I�FE��'�e�	������� �0,�&͌�)2&�x�Q����&=l&�e}w�'�vƷARϚ��{�H�Ķ�O�޴;ȁ���t?r��A����Q�`{�Q �CgW��I4�skї�(K��3J%A�P����-g
?fM�l��(ׁ���������c㗚��:�4�FJ��n�4GĻ�k��\��qF�]3�k�,
1��R�ځ�����M����Q
-j��J���`�|uۅYG�I3�k���~�_M�,6��M���Q&�f\�H	,�͋�P�1������84�����8&
��q3�\3U�"���˽��x�3�EF�g�S}r�W��]9�ژ�
�&�s�|��L��gl�U�)�i.�Dk��S)�O)�^9���N�(��Z����0�<a�8~��
kb�(&��Z 6D���,��آ�N���������g�u�f�1�� �8�V8�C6�a�ٰB�gX�̸����H�
k$|�5Ό���cXc�lX�3�n�Z�l���a��ϰƙq�hk$̆5���|�
-	�!��ِ,hX�̸�
4�5f�	�!�O���@cX#a6���83�c6�a��ٰFhX�̸����H�
k
+���A�
ǰBmX!!4�qf\m�	�a��аƙq�pk$І5B�g�u�f�1��A�H
k��SS�cX#�6$���ĸ�8�5h�	�a�3�:h��V80�G
���1��ư>�lX!
4�pf\�Hhk$̆5@�g�u�h�1��0�H
k��1�
ǰFmX㈩Y�̷�<2_�9�A�N�!;�l�ȡ_�&�
��}+̦Qd6�m|˚$�B4��G����4��3 �۹�b3������S�4&�v���f�јb�žC6����T��xb�l*� %s��$��b���c�ZW6���W�;��t�J� ���Ķ��4$���^3H*s�/���̷
�t ��2\�I*/��!�O�p���,�]o$X3H2�uGM3ۺ6��%�6���f�e�ʧ!�m�)3�W1fO�� �Q��A"�5�R�d,�wB��s܆>�/*
����ʮu&��a]`���o�-��
qӺI}���t�ߌ1��o����������3��[�2C��l�0t����2�S�HЈ\�j�]�S�(�R�QF�}�S���zj����@���+}h�J�}���������~�1�bQ��e���E�@$V8��)�`���M�
-�&��	i�_~��
F�O�"�Fb<!�m-�FD�.(#����kx�4��QF�5�	i�l���
�+��
�gʮ~��՘���^�,�I��OH�Fd�"�Y�����*#�D��k�un�L#,|�AF�5�	i�b�Q�[y#����k���X��p�U6
-�#�Ү	�w���v�
��
-�3eׂ�g��L)���a�X!1��v����aD.��BA$�H�'�]#
-,�r ^f���
YLb��xB�4�ũY���9�0(���NH�&Xȅ���B�jՂ�$V8��)�@�8��	.׈P�@$VH�'�]#<,�I��LMP�Db��xB�5"�q3=&��Z-wLb��xB�5"�&zI��%��e!Dzj<j�Fb<!�*"�>l;�_�c���v�IG�-�!�g
-��B���:�BV1���2h6HG��3���q5L=HB��_\v���$J��2ؖ�Ēe�X�D�[�)��A�}�f��{��e�њ^K��5c�K���Fz0ɕ�G�Og<!1�2��];��m���ˤ� a���{0���q����֜A��;ٖ�Az��GO�;�	���\�Q��P�R~y:��6�l�=OHĸ[bL`�������
��'�@e��d�1.C���/����������NzR=�����xB"�etog@S
�u�IA�0@S?��OHĸz"`S�Sp*���Ny�
�
-,f;!
�U��*��
-߭&�y0ˤ�$�Бff<!
Ư��*x��P}T��Jr"	�1�;�%����vLq�+�/�,9�c�1��F
����,a����}%�:B~�n�c�1��֗��:⊓�(쨣C-QU�94�Y5PGg�
5Ro�bK�s&$�L��t�8���Z,��q��3���S�0��{�
���Ћo��x�8/~`����L‰	��}=~��"�<`��~�v|����?M���p�ݯ�x�ӫ�cȌW�����'�>R�ޤ��o���~�@:�~�������X��xSJ���_��D�@�k�$��N1Tԯ8��D�����Я1m;v��Pi���r�%̍�ӄF+|e�r�9�n9t�9qtؾ
-�K2�$:D�e��I�{P�1MG���M��O�n��c$i����m�N����n�!�Iل����>���l�ݲ	�NEiS*��M��P2�O�n��C��;���hۖMT<J&�y�-�J���¢|����ե�$q"xǦ�G���w������d�޲���{e�-G��l�
-U��Oo�T�do�}{%�d;�2	?��Qhx;���"W2�&oYJ�>YC���E\K&���-��.�2)A�b��7�ɒI|�yˤ�N�㻀�����BZ��O?o�T��{���m��ҖL���;&���oJ1�p�|5��1k�I�޲�Ve�^lz��'Q�K6q��e��{��!H�7@}�&{G�!~G׫��`�Y~:AR��r+��7|}�F{ǹ���҉,+�����%@��vZ"V+~MG�Gn�V�KU�&5hHdy��kqS��-�5����#9\�Duü�@if�)��
��mf�\��$L�8;]�3ꊏ�Z艳�%��E�
1ʄێA��=9^�D9uI
��������K���/۟�l��'u���al��G�M�>s
��	�����$��!A��7�`q
[3��Z�/����&�T��WK�k5��BZ�����Ȣ$*�νI�(�ϯ{1��XL��v���Y��Q�^Y(Iu��)f�w1̐��?V�Ck�V����D#n4��|�V#����5QZ����%
X��p���c�V��s+�lhX+�V�آ������10V�/���3�q�,����EI��\����>��Hw1R�0�h`��Hm��krP���,|���E��� ����o#
�����k������_�M��hh%a���袜��&3��m<���"	����좤
��vv�����F��'&��HI�ۄ/��	��
~h�������F#)��{	P�I�v�F����c=Ҽ*���Ipx%a���9Vwq�%�b��Gc	���am�5jL��0}��彺��k���u�-�)��c[����w�~[<5gc��~
)�\���F�Y��bJ�����X_\���FC���6@���7d�GH�����tot���'��X���l
Xol��T����O��O���U9�-<�#��
`�
֟���Iķ#��D{J��gY��V�ߝ�|sK�sb肠'�����_��>ޢ�����-g���m.�->����Ϸ���?��?��7�9�u/��&����7(�`��X^7��*�G��>��_���a�
ҏ�Ɠ��=����o������O��ϟ��+���|��BQ��$�S��
|&��_D��_QL�`�V3Q�N^�X��9xQ�A��ֺz���Q^
��5�I�fFY��#���lG1�+��.ػ��Ĵt�٥g'��F�j�ص�t2-=�K�i�)bZ�YMK��=-i�Y��+j�Ӳ��<B;������x@�1����$?.����~������_Ǽ���k;�d^���ó0�Ԕ(��Xq�"���2���5��ن�����$,I��Ff<!�Ob��QCx�+��xFr4u�Oa��j�ON�*&j���ɵ�t2Q�};EN�Nቊg9l��S�Y�b�`׮�������~M6RN�������k���nށJx��~{�O#��/��/T��
E7������ం��(
x���U�|����N�4ϲ^v�wcrjk�GٹUC;�ޗ4J�M���$a�{����m"қ�ئw%�
- a� �)I���$*�`����$��MI���6�MIl�ے�֨���ޔ$mzO���6
қ��MoJ������-I¦�$���'��էۓD6E!С�n�6m�,�lJ.�^�0$
ҦM�%�|�>�x'�(��rF~��z٦�!��M��a��=�_�xP���K�-x�~t���i#��5(}�m>��8M>�;���6��c���
-���u�w�Aa%�Q?�Y����S�'�>%ޅw@��s�u��Q��u�z�A�ND�ڪ�ˏ�*��{��a���ľ 6Ϗ��>_�һ�*����%�]��[���/����|�_}�Z+���;��UT���/c�����������e��z�Dd�z�/!F?� r6�mۨg�G��z�O��	�z�����}g�{�#*�o�X_$�
^r�rTuʮ;H�*%��
-��+��I�UX����b��F�؋J�e/JZ�S�$�{��Ɲ�͋��k	b/*I��(h�WL=����j���b��F�؋J�e/JZ�S�$m{1�1�V4ֽ8(��	"/jIW��h�WL=���E��_�A�5�����^�
-��+��IzË��a�b�l�6	/JI׽(h�WL=���E�M�㐼�)ۀ��^T�.{Q*�:��z&�
/���x}�`xQJ���/��qŋ#��Z2I���D��+n3Y����B�664�:e�$�G��tyTIZ�S�$폪���:��N�5�����^�
-��+��I��bq��O#/vʮi$���$]��T�u^1�LҶ�rBw��F�C.Tr�zP�W
-/�y"g�{�:�{�N�5������
-��+��I������P��SvM#A�E%����g���"�9�X�mӆ �E)����g�����w�/v�vi��^T�.{Q*�:��z&�
/�������E)��X-�/���#lk��$�B��G��L>�����q�oT���
ăJI�<����g��Uι��A^�]�H{QI��E�@�bꙤm/f�c�^�ݝlD^Ԓ�zQ)�:��z&iߋx���-�A�5�����^�
-��+��I���ŋ�$�<(��� ���tًR��y��3Iox/܌ʋ��m�$�(%]��P�u^1�LҾ^���b��F�؋J�e/JZ�S�$�{�Q��v���^T�.{Q*�:��z&�
/r�����
Ë�D�U/~���xq$!a[KB&I���/ٴ��l����#U�oE��]
K�7���nB5��>��~�6T/��х��c�j4��I�׸6;[U]ǚM›CE۟�F��~i�جJ���qFG�~guv���6��}�~/�|b��|i�X�	�����rr>��^p��j��������;����.���m���F	��_,�5Dy%�
�>޸S��x�Y��H*^{��Ox�y�H�r���
-H(t�'�t�ߞ�I�oY߸�@(�;��S��Z{�m��5�6>B#��l�����43.kMz�Ƙ��_�b4i�ZV��H]><�5!��{m7�	�ĸ����
-�M��0$�D�|�]�G�V��l�у/�?Ԡyb\�b�[��xK�!��1Y�O��-�{�����#Y���Vv"M�����i�x��$��{1ib\�����x��$?��3�z��ޓF(�{K�Ap�դ�q��|o9#4&XY�A��	�D������2Bc9�<H2K3�&���toh,��� )x�D���R�n0B�	a%���$͌���{�����ä@RI�&M����{'��CL�FIq6ݭ�Ll��{��/@�fT\Q<�c"M���@#i��ARˢF��zS��bEh�/�<Hb	�� ͌��[�0�zϻ��aT&=l&��~��A
-+�@be=H
-��F�&ƍ��#�g��"H�؁�k�Ķ�������xt٭!��:�&i����#C���-�q��.J?�y�QZ��Ͷ�_��?�M=FÓ�ޟǫ[΁��DҌ��Gv/�U0�^k$XL��z8������Q����,OuM6��~�6�,�4�m�H�y!Ĥ������q�g����q�-HAҌ��G�i�xB<�[�����@��.��7�����R{�U+D�oХ�124ۺ>J���iUg}=y�7Ƕ�E�4�Y;�>��װ�a\�>�;J��F�ߐG�5{j�a�1�:4���m����y���
�;�Eb�:�Ζ�H|�#����H_�R���NaG�.|��P��ʭ���U�NU�ʙ�W������*�g�%(,>��%��n���=�c�g	5��Jj$?1�CB���FƄH#
@�p�[DŽ�!��	�B�H�̸����Șid�4Ό�
>��cB��
 R7s�cB���:ƄH#@�qf\DŽ�!�
-�FB�H�̷��ឡP�BC�@�H�̸C�C"��
�O���=��A!��i��A!�{H#�B�� �83.kd��42*D	"�3�:
-Ex)dT�2Dg�uT���Ȩid�4Ό��=��Q!��i��Q!�{�F�
-�F��H�̸��2�C�44>1��B���FF�H#C@�qf\G��C
-	"}
���m"���1(D
-
"�3�F�{H#�B�� �83��P��F�H##@�qf\��!��
-�F��H�̷�
-�3
-T�rOg����=�v�	5��@��'Ŷ�A
�[�e	
-5�J=�k�u��6P�
�@���F�Ie6؜�11n�B�q���h�$�8q*:1n�B
����hT��TV�C�M�l������,Q�FP	�t]�Ķ�
-u���hpA�B����F31n�B��{�[7TB�:I��H�Q:1n�B�f�G�0�AR�0޸/`"�ͪ��D��{K�
-
�J�k{���m�*��l�S?
����:I�������kġ��0�
�t��
�1�U���V�~��2�๎�����#0v�4_�[h@�ؚ���(d0Ykڗ�_d��e|�M��R\B�v�����O�]�9�ɝ�	�;s�1��;�k �s ��O��R����&;�3v��i�>E��¸%F��&�50.[P~9�{셳�#N�������'���
-{�����;e�H!�=S6-p���&x[�0i�H!3��6���`RF\8�2�I��OH�FD�S�2"����&�Ff<!m
���Bin
%��`id�Ҧ��fe$�w�8L!u��L��_rVsa0W#!K�H!3������eV^��8N
-A�	i��u�j��6����L"��xB�4��j�՘�LQ�IA"��xB�4��B,g
bj��*�B��턴iB<�]�0�mG��&�B�{�lZ��ȅ�	+���d)d�Ҧ�՗��̥�K#�D��iD�eX���p�U�U�H#3����(Gqj �{�F6e�l'�M��r %F̊�	L"���Lٴ��2�մ(�\%K�H!3��6��'5&K05�F0�42�	iӈ�����a譖;A"��xB�4"I�$����`id�ҦD跑�OF�J&�B�{�lZP`Nc$�Vqt�U״��KsZ�	i0.��I)c>TQD\v���$���'����[��&v2�ޓ��܋<M/N`dǹ�V��`\3���jXf���

-W��	��-��޵`��^҇ m$�CPd���l'���vb�eJ�\��}����$��C�lj�4�1�\�#ZܵjC2�R_}'=$	�ߞ���`\F����� �4��ˤ�$!�ԁ��xB��X��,WN��6��.#��؂��1���2|
-1�
å��ˤ�$���1�	i0.����"�K^�j[w�!H������xB"�U#�gj��1�]�M����$����`<!
�U#��
��a�JJ�]i�HA2�c݇`<!�W
�+���k�k�b�r`�v�g�}E	���	�����i�}�:�|��7���Wz։��	�Lc�։͊��:k��G
�������:sL}[j`�)�r)�u��}���\��֪M,uu������h���1���u�`igQ�u�/���K�V>�c��뻒��c��_�	�q�~�	�*��}?H,^�=�uO��p�q���z�7J�u��!����[w}���C;�,޺�#�޻�貯H��'��k#��;�֯l����^��=�_��p�Ā[��&KDe���9�nUA.�`���^�<.��>�ã�^T���:�l�mư}#W��IDٲ��$�����#�[q5*YĤ-�<�Dj��ۅm��^�lbҖM+���	w��ӵg��&&m��7'�M�����^�d��L�!wT�L*���o��%���eQ��J�E���ou����a� �ؔ
�n�
���n�9QZK61i�&���M��۲��o�&&m��|�d�^�^Du.�Ĥ-�<dں�j�p�=��~�L"ʖE
��z�C,�1�-����LbҖM𡽫/o�8��o�&���eR��5z|��wq�&�&���eS��o0P�{�÷M�"b2�I;&�"���)ŀ���
Q�GԇM��e��f�j��޹�J"�MLڲ�A�TT<Px<�m�8�!���e&?YT��}�����+�I�l�@� a>�z�a	$������jf������U)S���rS�qU��.�ѷ/ZjX�}��G��&����"
`zmS���"Ӷ$��:��5#�mն��}Y�̬�@B�)1n��ʼ����c�A��������-3oնי�d}q�a����E)$�e�6����Cu�"���-X�D �@��j������>�h{�_��ъEIT�q��$�nX��nE�i�����,J�G��u
�n\
|�����L��v��^�(i�<����
-�f�џF����ѡ����MFk�΄{2��
AO�k���|�����(ȱ��ib�(i].�K��d`<m��bs����R`�(g�l�6@��;�S��]/o�\�4o�&�nQ���#��
-�j.?��s�����m�z�lڸ癁�R��)X�~���%�G��d+X?�A���1�Gj+/�"bXu�i�V
-f��.J0+^��v�	C��6Ozf�g���ψ���
�bi�MRp���;ς&������	1^�4��Vp�H6��?,)A|	�FJ����^�3p�ڳ�
�:�����I��x�`�Kx�����X����o��򍴮�����
�/H�f�QE:*������Lue�s�m�4���j�������x��a��9 �
�<�}x����q�0�Q���<����>0��8,X�,��+�/��W���c<�R�:�?�ra�'|�F�x��66��1�i^�C�2d����[,e���_��S��zl�N��/)�<��O���͎A*>���X��='u�dz��v�+����T>
���91tA��Zt��/�h������ڃwI9nr�ۥ�����Ϸ)��?��?��7�9�uw��ѷ�)��nPD�U����F��__q�(,:@�"�b[ʱy�)?�OnF�'=��ۿ��?���߿��g���N�K����sI�c�_��\j����%��˵P����v���Z,O�[1B���$�R�od���1a�vR��MV��#/jʙG��J'&&�Ʃ��I?��	 �gGS3B�Q+�ٻ�t25!�k95OD�
J(�xʩɔ��&�:�uk�ES���L�m����29�A��1c�¯qr��Q5/��Ә�xb|���cr�Q}�w;�yr�\Ex&V���xӔ
rj����w�V�R��m��B�!Ix;HM���4"�5y�Dx0�k��.���xꤟ�l�x��}r��1[-���N:��-&9[A�V�Fx5[�r�^��E���]i���x�.����q��c��?���G	��n��
-[�>>����H���@0n������z��7j��#�������7<`!�_�����O��A0��~������endstream
+x���K�%�q/��Oq���>�|�/���G��xa݅�jy|qz���O�����Y]�
d���N<�GďA���<�_������mz����O���y��9�����b��ncz������?��,����\�����
���gz���3�o>��o?�g���������������9�}?����9R!{��Oc�����A�>�gΏ�'[\�&�P:��M���??�ǧ}4{�{&>�'���xd���K���
�˒��&@�$�\�&]�dl<��&� 6骤��H/� a�5I�(�Y���rQ�tUR0-L����I%������#�$�}x�|n�jK
+�p6>��3({�ܕ�g�E�yP6
�)�d��e�ϿҲ�V��f�/�1�Zsw��B#���#(><��E�
@��⺤b���djh���������w���&<~�G�2�������0Rܑa���~��+s����ק�ݧ[q�^K?�+dK��2�'��qj�3,��`e��+w�i��i�[����f+?�n��G��Vn|����v~T�ng��n�]o���i���0N��Jk�3Y3�r�k�|������m��l�mt�-<YO�ӹ�_��{�����b��Q�'XT��m��\Y����tV,��f��p�!�{��{�B���O���J*лSV]��6}A��)A7{��^7�L�vO�!���f�B�ȁZ�=J�Z�u3���;Є��Gv`'mZF�؁J�M
+�Z�u3���;~3
�Aڴ��������f�ɹ��`^ �H��
AR�]�x��gr.8��\i6ҮeC�p�tׁ,^+�n晜}:��W�k�]$��a�I17��•��&�H���ԫo'��5	�IAw�����f�ɹ��
�
+�E�ɁR�]~���{*q߰�LL�nd�BJ��L����wҦ3Hw&%�fg���f����Lћg�ʁ��i	b*A7(�k���<����cg
+�:i�2�T�n:P��
+��y&����p'�Z6	JAw����f���w`�\d�H:i�2�T�n:P��
+��y&�}����Fڵl���:��k���<�s��)?��:iײ!H8P
+��@�^7�Lξ��I��[�0�������f�ɹ��Q�!x���(�u��)8����T�6l$Z���?�;�bV�}�*�7����(e
+�is'�Qo҂��&)^+�n晜���MIO�;i�2�T�n:P��
+��y&g߁6�)��M�H;P	��@!^+�n晜}:{�C��6-#A�@%��x��gr.8��49��v-�����d�Z�u3���;�����N�-�؁J�M
+�Z�u3��\p ��d��Fڵl���:��k���<�s���>��k�$(�u ��
+��y&���x�����9��V�_q`�*�ֳ�IЍ���!�e������m�!<_��Fy�@~A�� �cz���{�O��'<�#~h}��#��=4���><eL����D#
�d! ���G�OWEy�t��a`֮�I(ϣ��Jr�n7���Xt��q�a�`m��\��Jq����ڤ���
�����U��u@�{���i�n<�޽�?$퀘����"Wr�I�Z�v)���#�t��=�KО(/�8��i��)�S�^tť���L����)[��SL#^�fF4ae��#<K�A�F�h��g8Azc\֘�3��_���!��j��Ƙ�_9)��UTc��T�W5���6�1A�.m�ⓃN�"͌�噒�1�4��jc�n�j����TH��;�B:¯ƫ&��*4t��Bs�����h��F�&^uUc��9h��M�Ӥ�qY#L�8�(��?�	�@7	V�&�e����haʞd��8�I�F���(�07�
r0[k�3߲Boq����ss<n�M�|����P)�Z㡋���Ʒ���]R!柚0�H�41.k��b�.M�ŘTe�]�FM��5r���V�	��ޠ?`l����$D��5rT\�|0B�֠[xe2t��P1ib\��QD�A��7(���bC�&�i�ĸ�QU�n<����P�g��`�%H�k]׈���6T�
+��ݾ���<�Ѥ�qY#��EbMK�Q�G �:�1���k�ĸ��bͣz)z���ySR��&i�e}��K/R0���f�&;��h�������gJ�3T���#��A��o��5₣�-�)�a
J=,|L/;�?���W����NŮ��F���{�ئ�"��:A3�%:)�>,��>j/A+�p�Чcv�QZ�'7�"Y�pS�������T�l����F�lD���q6���p:gk$��hd-�xc\�"E�6dq��g�圍���Q�l��4��Ƹ��q6F9g�8A#�o��9gcC��ن,N�H��r�����(r�!�4��Ƹ��q:64r�6Dq�F
+���r66��m���5Ό�9ec��s6�84��Ƹ��Q6�)g#����ƙq=g�l�4r�F)Ac�3�z�6�1R�))��N|�)ec��s6R84�7�+�t�R�F�hA
+'������ԋ�DΖz��ר�Ҹ�՜����O���-����p$�ïw������T�h���Ps�;"��q=g�l���s�FR��<3�z�F٘��TB�l���l�V�q�W�)!�3F�m���1�h-���37��`�iE朹5�
+��o=�q=s�9Hm�� �X2���7���m�d��V�L�EƩ�O%�ɍ߬�m##�۩��QD���&�em���5�����y����X�Y����e���q�#3"禌�~K��f�LSu�L�\k����Gan��~�Auc��v��j�J�ހ��:�>X���~�qyM=p�*_�QC�X���^s~����p3'����қ��\қ�N�N���>���}N��fF���?K�Cɟ0&��t|��"\��C;��p�j9��y(4(�p�h`���h��$\��Aof<!�bjZv|aC0�q_�(&����Nٴ���ⁱ�r�H!3��6���)ye���)�D
+�i
P�)7���r�H!3��6��E�����L"��xB�4����'
+L��P�`id�Ү�� ��<���.�I��OH�F�_��(#�p��F�42�	i���|�FdJ9ȈAb��xB�5���أ4���rm�X#1��v�p�`�4…��Db��xB�5c��fl���F�5�	iۈB��0M��;����xB�5"�g_��[��1�%Iɷ�,�xB*[�q�j�m�RQ����p��^���(�"��`\M����/~P$��a�K� �r5f��`\�����oEqH
+5ferD	-�$���c9��C��kNߢC��	�o[�:��)�m5�>�R����a�Ք��$J��D��F��;̤l��[�;H/I��ʴ[b<!
�e(�/|(u�I�D�R���OH�x�+US��
+���@���@�_�1�z�t�e������:b`1� �K�0K�	�`<!�*�`[F�"b��^F�(�%I���H�xB��F��C��C�7VO[�G�%HR���H�'$b\5"�����������DzIRLm�R0�������?I!*�`,f�,>�E�G�d>��U���3|��o��
ecJ�����H��x��
�zN�ޠ-j��W̳�|P`�o��$脮!
+��\.�eڦ�f���ϡ�/_�ͥ��
�7������[|�4\G|Q�>����yE~��+5�mU
�Eq�x�E�c��[|ѣ:��8�r/g������!��7>hv7����D�>h�8ݪ�	��}�#pL�G��=M�"�(G�a��%�(r�����/�}�F�=�(�S7׊`Bo)�0)���v4��(��&�b�
�VXu|DAq�K�rb����&E,O0�K����,��&�r�
��/�K)����%Y{�M��&a9V*�K9�~���dqF7I�o�T�KV^* ��m/��n�(��1�ԹX�.���O��n�(�߰��F��`p9�>g&�?�$���1	V�g��$�-�!�"^�w,��C��vWh+b���{���%
+",���m�3�0��#��c>N�@�\�C��$-�\ĽjF�Ra��L�g����_P#N
�O�r0P�;U,=�Z�é���c�����%*�S�VKT�xn�B��ͭ�,8ޘ\��E
++>�}��Ǔ�'`��N���EI	"T?N��v2
�s8�n�qh�ɊZ���	Kڐo�s����S��z�D{,D�0"_�S�`�-~��Z-�!��9	�
E:vf��B�=���4 S�{)p�4�����w}�%A�R�}O`*��*��;o�[˹"%Lrq�:P�=��\��N�T['2�3i���zț��H����Q�2�Z�c01�n�����\mQ�����E�@V�.��Z�)w�tx�W��o7�xDz�l9�h]鷅ŝ38��ј"�Iݒ1�?#	� S�5I��'ז&����{&뜾W�-��]��1���0�č�E��0~����IHaM�@"��%:N ��lS
+5�Rp�Z
i��! ď�$��ʲ��usv(HI�̘��%[�#�I.5�e�3G}~s<�ފ��p������\}�߂�0|�Н����o�"�r����ȏ�MI���0 ���T�_��?�W�@pSD{��4�dÝ����B�vWɃ�*�g�S�
+|H��9��A0�W�>Î �<j�>>��y����'�j�R�{�Ij�����L�:S���V��n傘��˙s�گ׬/n�_��:�x�
_<�Y������wXŽ���������Ј�0��
����
s��(/��P�.�<y��ޜ:qF�X��ej�.2�������q���ʼy�������o����{?��?!�+��g#�?1큤�QWqS/�ΰ�����b����GQV�_Ol�����^�Uj�)�ܶ���ڰf�p�43��ׯ�G ������q���To�o8���)�y�{}�o�p�Hp���ƵCO<�E�=<�g�{D�8�hT!r�{�$ځ�'Z5�W�p�ճ5�{�
�{k�k�H�e�����kׂ}��w0�l��Ţ��H'��[�r�P�1���WQ.�=|I����n�
+��#D&�$	R��@�xB��p8�-�G�N�{���p<|+�ݧ���p4���7�~�1��6�؟�t2-nzE9;EHc]��$.�ܰ7#x��5xѯ��]�j���	A��)Hq��a�)dp�qzX+���؞��|������N�("�y
+ՙ���+x�	�V/%��vW��fy�����]I;K��c�����N�_��T���$H�}=�-��픋�DU�EI���#L����I%�
�m�
�� a�5I��Қ�E�pM�,|�$'t������E%e<��\4(	��I�����F���D)�EI������%H�tM��4�>G�lږ��_�%A{�ؾ�]��6��U,i��7�˒NV�_�/�+-�-Z�z6~�^zנ��ŗ7_� A�]�y?nj%H��:ps8X���Y������φc{-�8�-��J�svj�3����c��v~��mg-�J���x������V~6�n%^{ĩ�_�gcѽV~��n#�$��Ǯ?��Ax�����ۭ�*�ڝ/��1�f;?���3X����n����{��8��J<���ʍ��a������L0���k�r+Ϣ���~�@����D���W����s�튥�cj9W�
�� �V9���W���[������{�dO*�*�=o�$�KJ���$�Ooz*i�C�+Dž�-��)I"'����q�?i�a詤}'�N�N�]�H;QI��D!~�x��SI�N��T�t����m#I�D����r�?i�a詤N��C‰�^��H�p��t׉,~�x��SI���
8��FڶmHN���:��Ooz*i߉��zK��Q�1�.�=(��t ��y&���� �{㹐Mˆ$�?)�Y��񆡧�.8q��‰��
ȉR�]'~�
�N�����s�Iҝ��i��9ց%vG�k����]w�$�SJ��>%�Ooz*i�OEoکVvb'��F�؉J�M'
+����J�wb2��uҮm$���$�t�?i�a詤N�~Ν�mې$�(%�u"��4�0�TҾ3>����I���$v��tӉB��񆡧�.8�G�WE9���m�����Nd����J��D�~SG|��mې$�(%�u"��4�0�TҾ񥯤W�N�.U�؉J�M'
+����J���Q�#�x�އ�(%�u�W+L��D�=��6r-�F��i�#-&���a�>�k_��K7��!I�N�%��TR��񆡧��;U�	����N�]�H;QI��D!~�x��SI�N�1N!� ��F�؉J�M'
+����J�wb=इs'��F�؉J�M'
+����J��D�]���FڶmHN���:��Ooz*i߉�(@1ʉ��]y2$����N�'�7=�t������H۶
I‰R�]'��I�
CO%]p"��ù��m�����Nd����J��D.�&'�.�''���{N��'.�F����'��;��JX�^�^�����'k�YX~�#��r�#� ���~�G8N������:�_g�v
3ޓ��xj��Ň�p�	oV�׏zY*iT�����h(���{������P���M:�\K����zm���G�����t��A�.�O�
+�3	q�Ai�
+��4��
^h��
���[�����Չm�x�$?��ο�w:��[)��a���B�b)'.�.�d�Q�sֱ^9�H��۠�I�"5z��J���oo�1i�[Vh��T-���7ZzO�i�[�]��P�
+sϟ���^q���qY�u����-�/�y�%�2�+�JC�C�Q��{��&M��a(���knR<��硍��5��T�G�F��f5a�uf\׈����_�C��u�g�e����Xa���K�x
}Нwf\�(N|
�;�.��K�I3�FX��U��ܤ{I��Τ�qYcr��ASp�m<�`r���3��q}9kĻ���&x��͞�5�x�WIc{�J��GP�
3����|�n(,~^�<^����>3�ḵ?
14��KJL��z&M��oV�2s���Kޒ�&M���1}2!����R���o����k,Ӻ�M�ς0i�[V��>ҽ�$���A�"i�e}�_n.:���bxK��7�+��OϬu�x���(L��5�[:�F��u����3�F
+�Ic8R��_��h�EM��5�����[
��8>Z���z�4ib\�HY
+|�z�3���#�H,���Qn"i�um�
����
+�e�H���!��a�ĸ���#�w?B
+cEjx`�F�&M��9�l�?�fm���c}�!�
��+�̸���C�V� �v<m�ZZ	zj~%H�oY瞰�է��M�K����v+�ĸ��R��&r<L[�\�Nr4\rL�$ib\�ș���
+���k���v�p<\�R��Q����9c�]�*�
��@����8�*h|��DW��&ޘ~�3G���)vt�����ĉ�K��C��Ey*N�
+
��:�]��S�uI�����T$�T���Tķu�����mO���p�i��*�u	5
+,�G��#d�(��!�|�if���F�0P�����θ��34224D1D
+����C
+"�
+'�uh�@VH�+8k�ב�
��BF�H!�@�p�[�G�)dd�H(�ב!�|X#!C��` �83��4���FF�H#�@�qf\�H�i$d�H(��֑!�|X!!C��` �83�k$̇422D	'�ud�0�H�k0k��q�|H##C��` �83�k$̇422�$4N�����|X!
C��` V8��4��B�H!�@�pf\�H���(�!�8P �qb\��a�
Y���7�u���F�H#�@B�ĸ��˴1
+�
+g�u`�0R��i0+���̇�10D�
+5�:0D�+$`��Ό�0
A>���!�H
<k��5�z���R/���5V4~�
+��f;
5��?��|�
+	�i/	+dh<.L�
>@<AE�7��a>��k�
+ndS�;q&:1�#C��`"�52�H*5���L��	�	�kdd��T懙��_�"C��`}Ǣ4�I*��X�cQ�:R�Q���IbC���V�[��Ƹ�q�>�8ڃ�
u�J�!�}i�[���]h�CC�����7�u�%���9�M�,� ����zpj+����7,��
+t�8��f��H�0��r�aR� O%0��	��t�^�#c��z��^���9��<���Fm��8���>��Z;=�x~�-kם��)�8��ݝ���;m{
C�<��N�a�r'�<�ӧ�}Iw���M��
��S� ��Nq�su�u�w\8�{�lϣ�V/�$Z���Bl�("u^���@�u��$RȌ'�m#��1(#��\{A$�q0��v��X>DmD����$�H�'�]#,��'e����#����m�Ѩn�݁�aP���vB�5
��<�6!Q�N6k$�Ү����7ǽ��$�H�'�m#a�dD�잌$�q0��v����geD�G�T�bk$�Ҷ%6�����0�a����xB�5g|�%b&X�l$V8��)�$Kx�0!�����	i��o���
^b�$4�Ү��'=U��Z�(�$�H�'�]#0]�z`�>��s%�X#1����H:f@R!Ё�$�1͑ś�
�0>��H0D�$+�;e���Uc3`�� c�P8OH�F��C$�#2
��k��XT(p��+YLb��xB�6"�?���8�d1Ih�'�]#0{JY�z�!�$�H�'�]#�
\
+��r�b��$��{BI�'$b\+G�]�v��gS���$�R͹��4���Q+
+��Qk�pg��h���$��Z�I�'����1�9�csG�p�/z&�$�*Y��4W��"��
+t��"�$	b��	��2ؖ��#@��
��ö���$�:�N|���jA��
��
+KB�̈́� �zr�%�NH�m
	q�����.<Q^�bSn�!q�S�2J�.\LCI
�DzIR2�*�OH�q8�q��I��>���$��n0���*��[`�ps������p��^��BC��	i0.a��f�ꥺ�q��e&�$	����Nl�Ċ�#����!ma�K�@|��c��`��P_.�'��_��}������
+t��ެF7m��cx3�Q�L�&�����n���U����M�QJ�7�Ci�:	��ެ�!��F�{����\g;�7=��
����Fk@��M�.���c���EX9k�xt�Mn`U�j|�ֵ����z���F�[X4堏��{ԟ=�w��g����=<���w�}	���ǖ!]	�8�g\ۺ���~H�?|(�3��Yx����z�&}�#�o,>{B��'�&���L�-��C�۶ ��dr�gN
g[�$мS\e쌚sa�����й�Dⲉ�
�k�$������g�7j�:�:��W7|�|�$Yg�M'��L��_�3���&q!갈�(�dB
�A0`C�7�U�":üc�m�R�daz��7n�R�a�r�2	f�P�I�Y����E�+�DǠwL«�C�&j�)Wq1찈�I�XC�L�I����4>/��e�I|�zˤ�ɯL�9�7QOK&�I��L�%*���ضH����$��E�v|���A}�EI� w��G�wL�!t��M����E�b�L���;&%�{]��0�p��w�ć��L��{R6^=��*�K~�":�cQ��c@l����&�(x����wL*�=Q����j"ʆ�I|�|ˤt��w��OJ���,����VŢ��<b���1I�w�ā�-�0MR�I06�O�(I&�8��1Ʉ̅:�%���r�pٵ+DE���皂�׏���eǟrC�6��4J�ƥH�����h�`�d�#����N
�>;4@����b�sG�k&Z���i{r�&�ˣ��V���5������\8���v|ʞ�I���������&�b/������0ζ���ER�m�H�8zo[���?�����<6���$ ���&� �Xn\(��W60�V`����O�m9P�^��VR�^���E�
+�;�ʁ��I�+���뢤d}?�Ѱ������̚$Buj���t@Y�v����۰���Qڧ$xhm�b�J���c�8���M����HT-���N��!L+��H��U/�ض�ّ�����	[�D���ɖ��hS/y��VF^�~08�&� =��ڸet�c�����cw(�������D�"���yd�)˯��)@d�'q�ChrM
��l���C��e���>iB�I��]�D��u�~f*���/n�66D�#�H�a�_���5I�-Ƶ#����š؞[j@0��H���
/I"D>R�&���
.�Z0<ph$A�d����$��'V�e�r�ۘP��$��Hl|MA��o�뜼���礈�n�$H
����� ��Mi����9�T�ߤ�nC�?���DL���7�?�q�Ba<-np�s�nx��?��|�p9ln���`5��V:�� ����
Q.r�����X?���?,�Gg���l
�aj!g���A�h��bW���>�a����������S��z�N����}�8��H����n=:wFl�wI��6t�?�(|�jKM91sA�ח3�ݷ_�a_ܠ��vu�q�`��,�>����_?��

�������_��7����l�
�0�-��n`I�Sb\��{�T�)'N���
��^��Ķܠ|����
}��t�����������~Q~o�C�B
+Q�[vj�ȭ��pIw� �4��P��Ay1�#|��u.��� ;35�z��3G�Y�Z�$�2��Ү�?A�Uu�7�(�g{�(�{�xݛ3��t�7���Fg�~��o>ة�r21�9��F�Ӟ`�8$��q8FրԴ��a'�Awģ]����0A��;�
���Z�c:ᛏB#�}s�w0
+-^���i���Bw����C��G�
��*vM<D�:=_�U�ޞ��ض]�%I�^)��0������a�X�
���G}�Iv�F��c�szs��0&�� ���dL��6~y6����Vؕ��r�\;�2�J�R=m�j�����b�!�<�S�Z��i
+Gkc��ӏl�9+���'<&�}������gB��"���i���[^��:���<`P`��3�`{�K���4�4�:�~)��'�˒�ʾ�]^8l"�EIl�EI�’�n6�$�骤�Ʃ|�i�.J6]�d��ڑ&��H%�MW%�!��$a�EI���dؑ#�$�dx���5lOT
+��[!hP��+�2!ضY;
ʞAw�L��l�WZa�:���
+��AwW�/6^~	���b�/�����}0���u>�4���'H?
+4�Z�a��Zz��	_X�Q�����Q�������4	�k��V~m��p�~+}IN�r�k~b�����~;��WH��~��m���(h��J���5��;_��㥽V��"~����Ʋ��-<[O��,_b������_@�1[y�0�S?-p�0�r�+K�y:P�EZft�Ͼ~�Z����,OΈ��iTo�=o� �MZн�$�k���<��ݛ����ҁ��g"jA�(�k���<���@��N9��6-#A�@%��x��gr���x�8H{�� r�tρR�Vx��39�Lxa�v`'mZF�؁J�M
+�Z�u3��l;���8H��	"jA�(�k���<���@�u�Y��Nڴ��������f���w`2��j)Ɂ��i	b*A7(�k���<���@�uف�
��@%���}ǁ=��oX�*&A׳
+�w?���g������2���t�:H��>	�ޤ��MR�Vx��39۽������_�l�5İ�����c�J�eO��;�A_���uҦ]$�}��t��^7�L���t�y��3[���	1w�G•��&�H�w���ܔ�eӪ!�'��tW�.�x"��b�u��Fڵk����:��k���<�s���~�^-:iײ!H8P
+��@�^7�Lξ�]\��v�n)B�ޓbn:��+m�M<�r�q��Bx�n�N
+�뼯Slrǁ=k�oX�&A7������^��̅�!a��L���!���s�'�p����'R�{Q6�����:i�.ľS�n:O��
+��y&��=�uҮeC�p�tׁ,^+�n晜}��z�6ʦ]C{O���<��]6�D���g�q9��C�p�s�q$\i�l≔m��O$��a�6K=H�N��<)^+�n晜/Rl�]ˆ �@)�Y�Vx��39��3ʁ��k�$(�u ��
+��y&g߁\�J�]r=8�\�r�W�����=�7�g����C�߽�]�d:�������z����tջ�lij�Dx
�8��z;��%�9�.&�P/d�e�p��"���0���74��z��ס�@6����0�8�i��ߴm2���)CE�_����<�^zi�1�zU��x�2Pht}�
r����yaX��W=`L}UUx@8%�%��)�]o����i���+��di�tO�[L{����m�Y�-ǯrL5A]�
����Riw;X��n��"J���:S.>.��/�t,x)��7��+�0߀�H3��K���(5|5�$%���C�Dzc\��TFh���Pm�x����Ƹ��V�W�������z,:�6�1�jL
�|,R#Vƕ�	�ЋY�f�U��pIט�=��ژ�Ƞ��Ƹ��X|ZD�+_�RX�H���Ʒ����Ph�&��>~Mzc\��ī�j�zw�x|,�i�ĸ�Ѥ�̆Ԉ7]��`t�`5ib\�(N��x%�� ݤ����qY#DK�
+i��E;7�O�
+g�e����녾zy���W>��9�-룵���Z��I��7�u�c�=rl�Ϛ	BoNn�.@���IEI��5��O�^W$�b��u�e�^ԠH�F��Z��6�HIkP��|�G��>�,����zE��D�&+��d[/WW��qY#�;�_�þ���Ψ��g
+t�U\�&�U�"�S�Ou�kQ��n]��t���5R�����1�^
m�x��G}DK�4߲>S�9�q����
+7�ի�%I�-�8��R��+ہ�O�����z)�$i�e}=�
9@��y���6�7�C����?p��$ͧ.=�r�3�~���<���2��B91\��4�l��-�_ڣL�K���F��X_Ҥ��7����ݘ1�[�\�n�c�g�����ˡ:i�arS'T��g��My��&�Y�g٤��7��t�����w�S>�a�����
�=e�	,R�NI��Ĝ�1�j�F�66F��u����V��TG�Z����FN�H�g�qf\�{$c��S6�H�i|c\N�(c����,��H��r�F�i䔍dq~F��S6J�H#�l$K\$04�1.�l���FJ�H�g���oY!%c��S6���k��S����FJلƑ���7���m$cB�H�X#�g�qf\O�F2�)ec�|3i��S����B��X!�g�p�[��F2�
+)ec�#?c}3ߺ‘��‘��>^SY�ķ���d�U)['�%4�*��S����;u��(*����ƶ���d쨱0'kG�q9��l�&��a�L���:Ys
	1�5�A�7��d��a�v�(%k��B$�)2�����q�a���)��NR^w�T�F�ZM�F�a�O*Yk޹<beͶ���4,Z�SB%k���G|�˫��~����D���XE�k���x�r�7��t�gb@M-ŧ|m�d�p����-+D�]�S�����C#(2��Ox�
�7��-A�u�RZ)�������-�22XUrDz���4�D�^
��iȓL�\�8V��\�zx:l�!��`0e�#����W4t�8�hs~�Vn)��SK��H-UN^_R����3�Κ�Iw��s�;Ř��ط��;mK�;M'�;����8�;1�
+ҝ	����|��"�FI�ԡ P�\N@����<�9|�A��0�%H�~0�	�sRH�M�6|��)�I�p�S6-����x`����$RȌ'�M#0VJ^ـ��s�"�B�{�lZ�!Tp�
	����
L"��xB�4_�qV�!����D��i>8i��Dq0o�L"��xB�5� 
+����X#1��6����GɅ��m�%�Ү���`6"S�AFdZq�Fb<!�a�fm�ٙ�Db��xB�5O�I�B_��"�Fb<!��Zi�NA$�H�'�m#
+
?0�5�ڶu}�^����
�xB"��L<,֧��v�(�1�%HX��Zr>OHĸ��xȸ�?��b�Az	��xB"�Ք=�]�c7$�ZkE�� �Wo*e�S�m5�wc���BJ���&���0�	��-��}�"Θ[f�b�AzIR�2_��2�V�`;[�o[�9H/I†ր�OH�qՈ܂�QkW�hGz��;&��m���`\��Z`^�Ym@*�%(1���	i�b�e'& �Ҷ�S{#~�^���A+9$��`\�
�B`Ȫ����3�%H���&�1�b	�����Ň�#�KR li���:ߢ�h�/4�¥`�~Dz1)B�����Č����	���{�G.p��&��w�C$�c~� ��E����9q����"q7
�;~lR��Ta&��H	��&.����,N%�	��*q�����wh��c%}��0CTI1�iĥ��M��j��R5=�>��huTx��-��������`���>v��w�}W��M�8j.H齨��UQ�0�
���;�w�V�g��w�m�E|�����^�͟=}���v�oş=�:���;,a���;>�Z3n��*N�k���v6K�A��>e���Ŕ�'�N!�������Ӄy�T�,[�ϔ��
�v��$��ؒ�aS@I���g�Q��m��;6,��V���⶟d�ð���wl�X``��0�Ia�AY�m��;6%,A8��H
+~�O�|��$*�wl��_��r�Pk�O����$j�wl�)+d�'<Pm춟d
F�I��o�?�>�����f�,��&�����/���
+h�Oi�\�,� ���~�&X��+{}i�E���*��<Z�"*�!{/��c��oʎ��BU�{�b�W�&��q�>�W���*Y��(��u 3�hc���%��mw�c���1�q�T �=��j�:&�(V�r��޲�6����ت�Z�:D�[{	zž>[��
�q����+D|�<<D��wЀa*q���(|���)��xW=�(�ͽ����g�5��-V��g۞j�m��
+��hw�BC����EI��±u-n����7�4�F��I�E��w���#�{�"��:�-1�8����-KX��Im�����O�nl���x��6N�4��*L!4S��Hn*��Lw��M�a���.-J2�I���UE��l"��;ZQ�뇤d��[��B.g=ewu�����|o��E���LR�N�f�"��`[�%��o��0��z����.�X��p�m��J����5I�%��oXx��_���BSr�$W��o�IbtF�CQEZ7	3y��+jk.��K�%��������.c���[RIX��pÚ$B)`�m3�`!^�
L�u�wpI 	k�X�D��q���IL.Ò���\AHrF�-k��q�݆��F\���~���$����|^R����wj㲞��y��������ʒ@��s/��:>5a6�X%Y7^e�Ͽ�-�eRpZe| "ep��`��]�#��0������b���X�`ƪA��8Ȇ�&!d|Tr�v�⃮K�����1�/�@o ‡�`d;H�^�>A�����ʂ�`\zR���z�������]V��o�l`Ő�әʷ>�ԜC�q}A�N�5���-�k�jW��(�0�3�8��׏�{��z<~��������������/0�mE	V��b>(/���f��4���k"�T	ˁ�̤=�מ�ɫ�`z}������������~A�~~��#_��Zjf˾�$�ey pɰd�X��6���"J*,�_.���؞����E��Zl�'9��u���[I���6����b}�����^x-��[-�W�*|����տ�1��ee��� ���T;�cnPx��R�"���8L1�	� �� �������(�_}�1aф��{�
�;s�B�z���I'}�1ݴ�e��W�����OV��S�G\�dV��A����1�ru��JZ���۽�ՠ�H/A
+x?F�n0����[
���FF�
�}
À���#��w:�[
C,��>�y�/~z<�p�)m��bHX]��@��V
��1冽��em��[��l�j슻��H�RN�e3	�CO�U4=�� 
+��o��?���Uh泿��'B��j�EZ����/���Ss�������/�bx'$��M�w,��}LuB�RV�`�ol�%y���N�(IT�]��!G}5� ]�$l�(	o��R�4H%	��I
+�%�/g��Y�wIN�;	 A�(I�tQ�Qg���$a�5I���j��$QxQ�<�t6]nI6]�t2_���w[�'�l�lI�ދ�ol�%�M�LI�{o�������O�J�r����_��޶�n���F�/a�`V>�L,�/�ж����b��c����yu��#���~���^je�;���ϰ�����v~��n'އ���n��đ���(���J�҇DX�r�k�|l���b��m����~��D��m�(ڽ�J,~������DЛ��(���΀�*٠ڹ�ʏb�V~��o����[��5?�����Q\v��	yѽ6.��4:he�_"�����e����m�x�Azk�%�b�墓�+�	��
+k�L^}ȷ?�����M�/'�N�SZ�K�N5?�t�SI����J��T	��;�t� m�ƒȉZ�='J����J�w"ۨ����Nڵ�$����N�'�7=���Če�F9q�6mcI�D-���I�
CO%�;1�=9��vm#I�D%���I�
CO%m;_�LQ͉���)�$r��tωR��񆡧���دݐNT7q��F�؉ӝ��(�Ooz*i߉�<��;i�6��NT�n:Q��4�0�TҾ	�g'��"NT�n:���e�p"%_���|L�n$x57��%�l�a�=�Sg�����C��SiI�:�?i�a詤�Nel�O50;eײ!�=(��t ��y&g�yx�h�=��v-#I�?%���I�
CO%]pbO�}X)ۖu9ƒB�]�p�gr���m��p�y��kא�Γrn:��ku׍<�s�y1�
=�{��mِ$�'%�u ��4�0�T�'���-('6ҶmC�p��t׉,~�x��SI�N�pT��)��*]{Pʹ�@��]7�L��
+�۵>�?)��ZQ�
'Rr�l���$�Nr��zo�^ra.$x����e�C�()�f�b�Z�u#���w�lr{4���I���$���tӁB��񆡧�.81�Q�ENl�mۆ$�D)�Y��񆡧����WL�a�(��
9�A)�Y�Vw��39����Jeۮ.G8Oȹ�<��]7�Lζ��am�ي�7H�U%$���%�s�?i�a詤NlWA+'6ҶmC�p��t׉,~�x��SI��翋vb#m�6$	'JIw���'�7=���DQ=�x�x8q*޿�į���m�d|
�z�1I��dX�����c?��+?l�i����DB*x
(?'�	�9����|N���]{˛�����j:����h�%+�K�qH��g�5#^U)�]mJ)���s�"�SV}�*���;-q�{�za��T"��-�)!z�4�b�����U��=��w.�[ړ��+�y�^I�u�+G{,Ez%w߱W�^�*��K�Iz���m��&൘�>E��)��)%YPZ
\L��Z�\
+^^��ҋ��{�O�
+��I��Ӥx�q��yh�G��=^��^
d�ķ�oBW-�ok0Zz�o�3i�[��3Z!޿�[hB{FZ�&�e�u��-޷����x�DS&�u�|ti(ċOC����I�FR�5��_�$��?�F̌��a���F���o�ӯ;g�ĸ�+����}��a�ʺ�3߲���BR��f���yg�e��,���a?��K{j^�f�u�x+���w!>�vϹ M������
+ֈWLG�K޳��=3�k���Ic�Aw�<��fό�3,�A�89�'��x|�E�0�?h������Eɗ��wK�41�ḵ=dA���%%�vվ M��Of��u���K^��&M��1@�j����R�hҨ��Ƹ�1���	�eZ� ���&M|�
+����gA�W�$X���oE�|��\��](t(T1�U_�����X(̶�!�Ӭ=3.k�����^�A	���E�C��CH�&M��GP�{���Z�+�Q:�eb[��C{�Iu#P��ٟK5�S'�)#�}/3D�z�H���B��Ip"M|��(��(�^���	ߑ��ۅrۄI�FN�B}�I��Ho��e“�NQ&�e}���Ů�0[[��IG}��g|�T�f�u��
+�C2!��z����2��� I�e]�z��=j
+�ε�!��b=�O�41�k9,�zU�㉇iKQ��h�{��jj%I�z���pLK���ۛ�w询�pM�-c<������a���d}���~�o��K��B��m�7x?\A�������.D��;^�U5nU���N�����T�Ǯ‡��vU}F{ʵٜ<�!�3I]����
E�6��sh�"\�l��Ũ �N�����M���θ�4�4dC��!�o|�
+�
+	�a��
+'�u�f�1B��l��
аƙqB�h+$Ȇ@�
+'�u}�a����
+'�u�f�1B�lX#�3�qf\P�	�a��ϰƙq]�@cX�l����:d3��p@6����83�k`k$Ȇ5�?�qb\�l#4�Fh�k��
�
ưF�lX#�3�qf\�8��H���8��qb\�l:#Ć>�
+'�u�d`1��V�7)�™q]��bH##6B�g�Ɖq�X��8���i|c\�8��H�
k$xFh���
��eZ��a�3�:b3�VH�
k�˩H�̷���1���G��P��������
+)�&�3�:~2�d4V!6��Bu[�#�o���{��+Ħ�T&`cۙ���!�
�_'� �N�y�i��3׺:�b��lxWy�0��b[�k������4�ʐ��x�w�u�f@1�'�4�J� ��7��l���O����NR����
D�:\3�t�Q�M����!��U�d`1�厸b�I*/�Q�1�k�X�1��y#�ARy/����&�U��p��L�ȫ�ϵ�dy�$�Vc�QZ�=1~w�|,$6hVb!#b�z<�-�4}-�z��	5�mrX�F�=+��s�G'��Y�����)��`������w4�>�K Io��k7''�鵋&/\\��x�ű�M�B)?M�0���]�Y�7A�7�Mg.�A��=>�괋3^�\68���!_�k��j��c��)�a(��p�6���Z���\�|�$�@S�:�;��VQ"|��K�(����D
+��m�0en�%�IB�`<!���v+�a#2��d� �Fb<!�a�E�����2�a�X#1������U��'eà}�턴k��{�	��j�a�X#1��v����8e�mz%�I��OH�F$ ɈB�71HB�`<!��!~+##BȽh�� k$�Ҷ�Ƣ���r�a����xB�5"���]"fJ�ɆAb��kA��gp�ԟbPX����M�D��љ!(�z`Ih�'�]#0�Hz��m�I1H��OH�F`^���ϡ빒H��OH�F$3 �(@F
+�Hc�#�7Y0^|�%<q�C�H!�S�-�56���>�A�$�p0��v��l��~0���ˆAb��xB�5�Z2T���Dd�X#1����Ȅ�㳥
t����^��}M��D��0a8z�0������MLz	fmo�OHĸ��4��v�3���ߏbǎ����Ը�1�+��E_-gꔗ�p&Gl'���*��ʖ:")�Mf�DJ�Y�'���
+���x����jٖ�K�|�
1���q��ZT��x�̤�$�b��`\�$kd`
+Ă>7H�U<u�^���FK��;e��ZP1�!hX�
�)�A�t���D�vB|��eh��I_}�&@�&�$�y��_��4���X�vM<*lU�L��%H��;�ؖ���rE�_S�Az	��ܺM��xB"�U�ӷ���ZⅤ�z�ݨ��X�C�'���hD-�z�P��86■�Lz	j
t|�b��PX�h%ԐwB����*��hc�fm5jm4};��i�5ǽ�Y��G+a��X&L�iBa����`��`�f��6���$B3V��:@�w4���]�#l4���腞O1��{��}����Z��f<gv2��>�غ�G��Tp~��-���>�b��V,�z�1f��\����.�z��=='�]�7����1�XB|s��w��t+6U�|:t��*m���>�����~'��mu��C�X���ó^N��b�����=�����?_'�ߜ*���ۙ�2������9���!)q�B���G�q;&�3����a`�L��`����|EAf�I��ݳ	���ϝaAy��6q��0�N�nY�Τ�"���~�V�t�Itw�&ۺ�����?��s�\�9l⣺{6��!����(?�$�%��0�M����$i��Y::L�Ӿ[&y܏Ճ�Vo�]!�yI\\:l���{6A�����9��A'�O�&:2�eS�R��l���?7��a�)�3	~���v>���9\������M®��M9_��G��Mt.y˦�B�3A��|؉2�a�\޳	�I��+/ċ:Y2��6o���W�dE�������v�ħ��l*�=cW��\��ն�&>�gS:�M���?9�r\2�P�X"�~������E�n�I�޳	RyY�Rq��_s]�(��φ��l����+@gU4S�y���=7�;�m��VLǴA�_��.X�7�b�w�k��K�EY�E���X���n�}��e�u ���'�k0>�^���
�_�N}����uC����g�k�(���ˊ�����ť�0�\��q�#.�W �LMC�1��,��^$]s�k������ɑ�M����dZ9��.>��X@�E�}kw�k������	�0K\Tr�Il`D-_6���X��c��91I_�`�P!a!u���/9��5I\m�e
L2e�vǐ��g&S7b���Y�D�N�%�I��$���BHxYCa4��@��1 Z�H \)۾x�h�����XT������
O��!T��n���բ�b*:D`Xݞ�����I"X
��R;� Vt˝	K�+��и�]����[�3P��P����Ϲx�����Z�m--- transfer too big, truncated ---