diff --git a/README.md b/README.md
index ed4c927ad..32b9ebce7 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,8 @@ Features
 
 - Compatible with Flex to eliminate a learning curve, making a transition to
   RE/flex frustration-free.
-- Works with Bison and supports reentrant, bison-bridge and bison-locations.
+- Works with Bison and supports reentrant, bison-bridge, bison-locations and
+  Bison 3.0 C++ interface `%skeleton "lalr1.cc"`.
 - Extensive documentation in the online [User Guide][manual-url].
 - Adds Unicode support with Unicode property matching `\p{C}` and C++11, Java,
   C#, and Python Unicode properties for identifier name matching.
@@ -408,6 +409,7 @@ Changelog
 - Mar  7, 2018: 1.0.3 fixed `--namespace` and `%option namespace`
 - Apr 22, 2018: 1.0.4 updated to Unicode 10, cleaned up code to remove tool warnings
 - Jun 29, 2018: 1.0.5 updated `--namespace` for options `--fast` and `--full` to support the generation of multiple optimized lexers placed in namespaces.
+- Jul  9, 2018: 1.0.6 added `--bison-cc` option to generate scanners for Bison 3.0 `%skeleton "lalr1.cc"` C++ parsers, included two examples `flexexample9` and `reflexexample9` to demo this feature.
 
 [logo-url]: https://www.genivia.com/images/reflex-logo.png
 [reflex-url]: https://www.genivia.com/reflex.html
diff --git a/bin/reflex.exe b/bin/reflex.exe
index 8e3a3f5b7..95e77c216 100755
Binary files a/bin/reflex.exe and b/bin/reflex.exe differ
diff --git a/doc/html/abslexer_8h.html b/doc/html/abslexer_8h.html
index 39d034a1a..0cfe5387b 100644
--- a/doc/html/abslexer_8h.html
+++ b/doc/html/abslexer_8h.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">abslexer.h File Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -102,7 +102,7 @@
 </div></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/absmatcher_8h.html b/doc/html/absmatcher_8h.html
index e964912bb..0a055b6c5 100644
--- a/doc/html/absmatcher_8h.html
+++ b/doc/html/absmatcher_8h.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">absmatcher.h File Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -250,7 +250,7 @@ <h2 class="groupheader">Function Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/annotated.html b/doc/html/annotated.html
index 913fce130..7adc799db 100644
--- a/doc/html/annotated.html
+++ b/doc/html/annotated.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -103,7 +103,7 @@
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/bits_8h.html b/doc/html/bits_8h.html
index a8e653872..6990cae95 100644
--- a/doc/html/bits_8h.html
+++ b/doc/html/bits_8h.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">bits.h File Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -101,7 +101,7 @@
 </div></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/boostmatcher_8h.html b/doc/html/boostmatcher_8h.html
index deebb1e81..008a65654 100644
--- a/doc/html/boostmatcher_8h.html
+++ b/doc/html/boostmatcher_8h.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">boostmatcher.h File Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -102,7 +102,7 @@
 </div></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/class_reflex-members.html b/doc/html/class_reflex-members.html
index 010dac0a4..fcbe92b4f 100644
--- a/doc/html/class_reflex-members.html
+++ b/doc/html/class_reflex-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -140,7 +140,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/class_reflex.html b/doc/html/class_reflex.html
index 9bd344b7d..510d43d1b 100644
--- a/doc/html/class_reflex.html
+++ b/doc/html/class_reflex.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Reflex Class Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -2392,7 +2392,7 @@ <h2 class="groupheader">Member Data Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classes.html b/doc/html/classes.html
index f15f80c92..4a461b777 100644
--- a/doc/html/classes.html
+++ b/doc/html/classes.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Index</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -90,7 +90,7 @@
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_abstract_lexer-members.html b/doc/html/classreflex_1_1_abstract_lexer-members.html
index 135553da8..b0d7c52c6 100644
--- a/doc/html/classreflex_1_1_abstract_lexer-members.html
+++ b/doc/html/classreflex_1_1_abstract_lexer-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -102,7 +102,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_abstract_lexer.html b/doc/html/classreflex_1_1_abstract_lexer.html
index 406416e85..0f976b2dc 100644
--- a/doc/html/classreflex_1_1_abstract_lexer.html
+++ b/doc/html/classreflex_1_1_abstract_lexer.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::AbstractLexer&lt; M &gt; Class Template Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -1459,7 +1459,7 @@ <h2 class="groupheader">Member Data Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_abstract_lexer_1_1_matcher-members.html b/doc/html/classreflex_1_1_abstract_lexer_1_1_matcher-members.html
index 38fe98af2..f17f7fa9d 100644
--- a/doc/html/classreflex_1_1_abstract_lexer_1_1_matcher-members.html
+++ b/doc/html/classreflex_1_1_abstract_lexer_1_1_matcher-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -64,7 +64,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_abstract_lexer_1_1_matcher.html b/doc/html/classreflex_1_1_abstract_lexer_1_1_matcher.html
index 49d289354..2a762a06c 100644
--- a/doc/html/classreflex_1_1_abstract_lexer_1_1_matcher.html
+++ b/doc/html/classreflex_1_1_abstract_lexer_1_1_matcher.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::AbstractLexer&lt; M &gt;::Matcher Class Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -295,7 +295,7 @@ <h2 class="groupheader">Member Data Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_abstract_matcher-members.html b/doc/html/classreflex_1_1_abstract_matcher-members.html
index 3cdefa8df..6de7aceb9 100644
--- a/doc/html/classreflex_1_1_abstract_matcher-members.html
+++ b/doc/html/classreflex_1_1_abstract_matcher-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -146,7 +146,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_abstract_matcher.html b/doc/html/classreflex_1_1_abstract_matcher.html
index 03f665cd0..d0e31d43f 100644
--- a/doc/html/classreflex_1_1_abstract_matcher.html
+++ b/doc/html/classreflex_1_1_abstract_matcher.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::AbstractMatcher Class Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -2656,7 +2656,7 @@ <h2 class="groupheader">Member Data Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_abstract_matcher_1_1_iterator-members.html b/doc/html/classreflex_1_1_abstract_matcher_1_1_iterator-members.html
index ed4afc4ce..5a590ef0d 100644
--- a/doc/html/classreflex_1_1_abstract_matcher_1_1_iterator-members.html
+++ b/doc/html/classreflex_1_1_abstract_matcher_1_1_iterator-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -74,7 +74,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_abstract_matcher_1_1_iterator.html b/doc/html/classreflex_1_1_abstract_matcher_1_1_iterator.html
index e914c62bd..c93c80593 100644
--- a/doc/html/classreflex_1_1_abstract_matcher_1_1_iterator.html
+++ b/doc/html/classreflex_1_1_abstract_matcher_1_1_iterator.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::AbstractMatcher::Iterator&lt; T &gt; Class Template Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -539,7 +539,7 @@ <h2 class="groupheader">Member Data Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_abstract_matcher_1_1_operation-members.html b/doc/html/classreflex_1_1_abstract_matcher_1_1_operation-members.html
index c9ddb71c4..f2a796d1f 100644
--- a/doc/html/classreflex_1_1_abstract_matcher_1_1_operation-members.html
+++ b/doc/html/classreflex_1_1_abstract_matcher_1_1_operation-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -69,7 +69,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_abstract_matcher_1_1_operation.html b/doc/html/classreflex_1_1_abstract_matcher_1_1_operation.html
index 7bd3417d2..04e34b948 100644
--- a/doc/html/classreflex_1_1_abstract_matcher_1_1_operation.html
+++ b/doc/html/classreflex_1_1_abstract_matcher_1_1_operation.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::AbstractMatcher::Operation Class Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -367,7 +367,7 @@ <h2 class="groupheader">Member Data Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_bits-members.html b/doc/html/classreflex_1_1_bits-members.html
index 90cb8d002..98b9a49a7 100644
--- a/doc/html/classreflex_1_1_bits-members.html
+++ b/doc/html/classreflex_1_1_bits-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -105,7 +105,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_bits.html b/doc/html/classreflex_1_1_bits.html
index e26e28b63..99c8725d3 100644
--- a/doc/html/classreflex_1_1_bits.html
+++ b/doc/html/classreflex_1_1_bits.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::Bits Class Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -1659,7 +1659,7 @@ <h2 class="groupheader">Member Data Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_boost_matcher-members.html b/doc/html/classreflex_1_1_boost_matcher-members.html
index 1dbfd4b54..7def1fc63 100644
--- a/doc/html/classreflex_1_1_boost_matcher-members.html
+++ b/doc/html/classreflex_1_1_boost_matcher-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -169,7 +169,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_boost_matcher.html b/doc/html/classreflex_1_1_boost_matcher.html
index d89a8e2bf..eae005cc4 100644
--- a/doc/html/classreflex_1_1_boost_matcher.html
+++ b/doc/html/classreflex_1_1_boost_matcher.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::BoostMatcher Class Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -1003,7 +1003,7 @@ <h2 class="groupheader">Member Data Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_boost_perl_matcher-members.html b/doc/html/classreflex_1_1_boost_perl_matcher-members.html
index 202e98d60..1e40c4b61 100644
--- a/doc/html/classreflex_1_1_boost_perl_matcher-members.html
+++ b/doc/html/classreflex_1_1_boost_perl_matcher-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -172,7 +172,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_boost_perl_matcher.html b/doc/html/classreflex_1_1_boost_perl_matcher.html
index 677385ad0..7a756e10b 100644
--- a/doc/html/classreflex_1_1_boost_perl_matcher.html
+++ b/doc/html/classreflex_1_1_boost_perl_matcher.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::BoostPerlMatcher Class Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -599,7 +599,7 @@
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_boost_posix_matcher-members.html b/doc/html/classreflex_1_1_boost_posix_matcher-members.html
index 4b8665a5c..9b88975de 100644
--- a/doc/html/classreflex_1_1_boost_posix_matcher-members.html
+++ b/doc/html/classreflex_1_1_boost_posix_matcher-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -172,7 +172,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_boost_posix_matcher.html b/doc/html/classreflex_1_1_boost_posix_matcher.html
index 355918dc8..6d2f9d8db 100644
--- a/doc/html/classreflex_1_1_boost_posix_matcher.html
+++ b/doc/html/classreflex_1_1_boost_posix_matcher.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::BoostPosixMatcher Class Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -646,7 +646,7 @@ <h2 class="groupheader">Member Function Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_flex_lexer-members.html b/doc/html/classreflex_1_1_flex_lexer-members.html
index 63196ae32..ef3063007 100644
--- a/doc/html/classreflex_1_1_flex_lexer-members.html
+++ b/doc/html/classreflex_1_1_flex_lexer-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -118,7 +118,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_flex_lexer.html b/doc/html/classreflex_1_1_flex_lexer.html
index 43b56fb9f..6fae59c29 100644
--- a/doc/html/classreflex_1_1_flex_lexer.html
+++ b/doc/html/classreflex_1_1_flex_lexer.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::FlexLexer&lt; M &gt; Class Template Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -849,7 +849,7 @@ <h2 class="groupheader">Member Function Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_flex_lexer_1_1_matcher-members.html b/doc/html/classreflex_1_1_flex_lexer_1_1_matcher-members.html
index af4f010d6..6901b7a14 100644
--- a/doc/html/classreflex_1_1_flex_lexer_1_1_matcher-members.html
+++ b/doc/html/classreflex_1_1_flex_lexer_1_1_matcher-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -67,7 +67,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_flex_lexer_1_1_matcher.html b/doc/html/classreflex_1_1_flex_lexer_1_1_matcher.html
index 936149d7f..4b5de8529 100644
--- a/doc/html/classreflex_1_1_flex_lexer_1_1_matcher.html
+++ b/doc/html/classreflex_1_1_flex_lexer_1_1_matcher.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::FlexLexer&lt; M &gt;::Matcher Class Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -319,7 +319,7 @@ <h2 class="groupheader">Member Function Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_input-members.html b/doc/html/classreflex_1_1_input-members.html
index 4b781646a..7b72689ff 100644
--- a/doc/html/classreflex_1_1_input-members.html
+++ b/doc/html/classreflex_1_1_input-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -104,7 +104,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_input.html b/doc/html/classreflex_1_1_input.html
index 13a0ddd9c..976ba3cf8 100644
--- a/doc/html/classreflex_1_1_input.html
+++ b/doc/html/classreflex_1_1_input.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::Input Class Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -1491,7 +1491,7 @@ <h2 class="groupheader">Member Data Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_matcher-members.html b/doc/html/classreflex_1_1_matcher-members.html
index 3c5f18f4f..e94db4143 100644
--- a/doc/html/classreflex_1_1_matcher-members.html
+++ b/doc/html/classreflex_1_1_matcher-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -204,7 +204,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_matcher.html b/doc/html/classreflex_1_1_matcher.html
index 6a72c3e14..91ae980e5 100644
--- a/doc/html/classreflex_1_1_matcher.html
+++ b/doc/html/classreflex_1_1_matcher.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::Matcher Class Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -1906,7 +1906,7 @@ <h2 class="groupheader">Member Data Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_o_ranges-members.html b/doc/html/classreflex_1_1_o_ranges-members.html
index 51740f9e6..ab5bddeac 100644
--- a/doc/html/classreflex_1_1_o_ranges-members.html
+++ b/doc/html/classreflex_1_1_o_ranges-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -103,7 +103,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_o_ranges.html b/doc/html/classreflex_1_1_o_ranges.html
index 5fb94f4cc..6ee49ce9b 100644
--- a/doc/html/classreflex_1_1_o_ranges.html
+++ b/doc/html/classreflex_1_1_o_ranges.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::ORanges&lt; T &gt; Class Template Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -1049,7 +1049,7 @@ <h2 class="groupheader">Member Function Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_pattern-members.html b/doc/html/classreflex_1_1_pattern-members.html
index 6d943407a..ae69fed21 100644
--- a/doc/html/classreflex_1_1_pattern-members.html
+++ b/doc/html/classreflex_1_1_pattern-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -176,7 +176,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_pattern.html b/doc/html/classreflex_1_1_pattern.html
index d78ef5933..5389d8966 100644
--- a/doc/html/classreflex_1_1_pattern.html
+++ b/doc/html/classreflex_1_1_pattern.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::Pattern Class Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -3335,7 +3335,7 @@ <h2 class="groupheader">Member Data Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_pattern_matcher-members.html b/doc/html/classreflex_1_1_pattern_matcher-members.html
index 902064844..f3d8271d7 100644
--- a/doc/html/classreflex_1_1_pattern_matcher-members.html
+++ b/doc/html/classreflex_1_1_pattern_matcher-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -160,7 +160,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_pattern_matcher.html b/doc/html/classreflex_1_1_pattern_matcher.html
index 97052849b..7d60d417e 100644
--- a/doc/html/classreflex_1_1_pattern_matcher.html
+++ b/doc/html/classreflex_1_1_pattern_matcher.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::PatternMatcher&lt; P &gt; Class Template Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -1024,7 +1024,7 @@ <h2 class="groupheader">Member Data Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_posix_1_1_tables-members.html b/doc/html/classreflex_1_1_posix_1_1_tables-members.html
index 814634b1d..a75aa0659 100644
--- a/doc/html/classreflex_1_1_posix_1_1_tables-members.html
+++ b/doc/html/classreflex_1_1_posix_1_1_tables-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -63,7 +63,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_posix_1_1_tables.html b/doc/html/classreflex_1_1_posix_1_1_tables.html
index 8761e3758..987973332 100644
--- a/doc/html/classreflex_1_1_posix_1_1_tables.html
+++ b/doc/html/classreflex_1_1_posix_1_1_tables.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::Posix::Tables Class Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -144,7 +144,7 @@ <h2 class="groupheader">Member Data Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_ranges-members.html b/doc/html/classreflex_1_1_ranges-members.html
index 6403ac9cd..55aac0263 100644
--- a/doc/html/classreflex_1_1_ranges-members.html
+++ b/doc/html/classreflex_1_1_ranges-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -89,7 +89,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_ranges.html b/doc/html/classreflex_1_1_ranges.html
index e30e3ccdc..9193d9282 100644
--- a/doc/html/classreflex_1_1_ranges.html
+++ b/doc/html/classreflex_1_1_ranges.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::Ranges&lt; T &gt; Class Template Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -1104,7 +1104,7 @@ <h2 class="groupheader">Member Function Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_std_ecma_matcher-members.html b/doc/html/classreflex_1_1_std_ecma_matcher-members.html
index 071d60c21..df1a82fdc 100644
--- a/doc/html/classreflex_1_1_std_ecma_matcher-members.html
+++ b/doc/html/classreflex_1_1_std_ecma_matcher-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -175,7 +175,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_std_ecma_matcher.html b/doc/html/classreflex_1_1_std_ecma_matcher.html
index 759ee07bb..ed54924d2 100644
--- a/doc/html/classreflex_1_1_std_ecma_matcher.html
+++ b/doc/html/classreflex_1_1_std_ecma_matcher.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::StdEcmaMatcher Class Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -787,7 +787,7 @@ <h2 class="groupheader">Member Function Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_std_matcher-members.html b/doc/html/classreflex_1_1_std_matcher-members.html
index 5207e4574..8b4a30886 100644
--- a/doc/html/classreflex_1_1_std_matcher-members.html
+++ b/doc/html/classreflex_1_1_std_matcher-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -171,7 +171,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_std_matcher.html b/doc/html/classreflex_1_1_std_matcher.html
index 75d82b994..97abc2815 100644
--- a/doc/html/classreflex_1_1_std_matcher.html
+++ b/doc/html/classreflex_1_1_std_matcher.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::StdMatcher Class Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -1009,7 +1009,7 @@ <h2 class="groupheader">Member Data Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_std_posix_matcher-members.html b/doc/html/classreflex_1_1_std_posix_matcher-members.html
index 8992737c3..b9c278a50 100644
--- a/doc/html/classreflex_1_1_std_posix_matcher-members.html
+++ b/doc/html/classreflex_1_1_std_posix_matcher-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -175,7 +175,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_std_posix_matcher.html b/doc/html/classreflex_1_1_std_posix_matcher.html
index d8c9f68b2..c9f71b6b8 100644
--- a/doc/html/classreflex_1_1_std_posix_matcher.html
+++ b/doc/html/classreflex_1_1_std_posix_matcher.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::StdPosixMatcher Class Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -833,7 +833,7 @@ <h2 class="groupheader">Member Function Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_unicode_1_1_tables-members.html b/doc/html/classreflex_1_1_unicode_1_1_tables-members.html
index 1408de051..350c11896 100644
--- a/doc/html/classreflex_1_1_unicode_1_1_tables-members.html
+++ b/doc/html/classreflex_1_1_unicode_1_1_tables-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -66,7 +66,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1_unicode_1_1_tables.html b/doc/html/classreflex_1_1_unicode_1_1_tables.html
index 3c9da3daa..cd389475e 100644
--- a/doc/html/classreflex_1_1_unicode_1_1_tables.html
+++ b/doc/html/classreflex_1_1_unicode_1_1_tables.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::Unicode::Tables Class Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -198,7 +198,7 @@ <h2 class="groupheader">Member Function Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1regex__error-members.html b/doc/html/classreflex_1_1regex__error-members.html
index 7d40c0a70..a9b73bf70 100644
--- a/doc/html/classreflex_1_1regex__error-members.html
+++ b/doc/html/classreflex_1_1regex__error-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -82,7 +82,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/classreflex_1_1regex__error.html b/doc/html/classreflex_1_1regex__error.html
index 9bedf3073..bd22c6dce 100644
--- a/doc/html/classreflex_1_1regex__error.html
+++ b/doc/html/classreflex_1_1regex__error.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::regex_error Class Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -685,7 +685,7 @@ <h2 class="groupheader">Member Data Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/convert_8h.html b/doc/html/convert_8h.html
index 27623a2c5..df666f059 100644
--- a/doc/html/convert_8h.html
+++ b/doc/html/convert_8h.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">convert.h File Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -146,7 +146,7 @@
 </div></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/debug_8h.html b/doc/html/debug_8h.html
index dde2fabfe..5583a00eb 100644
--- a/doc/html/debug_8h.html
+++ b/doc/html/debug_8h.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">debug.h File Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -223,7 +223,7 @@ <h2>Example </h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/dir_000002_000000.html b/doc/html/dir_000002_000000.html
index 8166db38e..c04b0e593 100644
--- a/doc/html/dir_000002_000000.html
+++ b/doc/html/dir_000002_000000.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">src -&gt; include Relation</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -46,7 +46,7 @@
 <h3>src &rarr; include Relation</h3><table class="dirtab"><tr class="dirtab"><th class="dirtab">File in src</th><th class="dirtab">Includes file in include</th></tr><tr class="dirtab"><td class="dirtab"><a class="el" href="reflex_8h.html">reflex.h</a></td><td class="dirtab"><a class="el" href="dir_bb8a7beb94a1b7afd52842cbf47ddd3e.html">reflex</a>&#160;/&#160;<a class="el" href="convert_8h.html">convert.h</a></td></tr><tr class="dirtab"><td class="dirtab"><a class="el" href="reflex_8h.html">reflex.h</a></td><td class="dirtab"><a class="el" href="dir_bb8a7beb94a1b7afd52842cbf47ddd3e.html">reflex</a>&#160;/&#160;<a class="el" href="error_8h.html">error.h</a></td></tr><tr class="dirtab"><td class="dirtab"><a class="el" href="reflex_8h.html">reflex.h</a></td><td class="dirtab"><a class="el" href="dir_bb8a7beb94a1b7afd52842cbf47ddd3e.html">reflex</a>&#160;/&#160;<a class="el" href="pattern_8h.html">pattern.h</a></td></tr><tr class="dirtab"><td class="dirtab"><a class="el" href="reflex_8h.html">reflex.h</a></td><td class="dirtab"><a class="el" href="dir_bb8a7beb94a1b7afd52842cbf47ddd3e.html">reflex</a>&#160;/&#160;<a class="el" href="utf8_8h.html">utf8.h</a></td></tr></table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html b/doc/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
index 86c5790e4..f4b6db60b 100644
--- a/doc/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
+++ b/doc/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">src Directory Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -76,7 +76,7 @@
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/dir_bb8a7beb94a1b7afd52842cbf47ddd3e.html b/doc/html/dir_bb8a7beb94a1b7afd52842cbf47ddd3e.html
index ed3a10273..ee2c4d25f 100644
--- a/doc/html/dir_bb8a7beb94a1b7afd52842cbf47ddd3e.html
+++ b/doc/html/dir_bb8a7beb94a1b7afd52842cbf47ddd3e.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex Directory Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -117,7 +117,7 @@
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html
index 971427035..1913a6048 100644
--- a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html
+++ b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">include Directory Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -62,7 +62,7 @@
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/error_8h.html b/doc/html/error_8h.html
index 237eb2d5b..48c3434f3 100644
--- a/doc/html/error_8h.html
+++ b/doc/html/error_8h.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">error.h File Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -109,7 +109,7 @@
 </div></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/files.html b/doc/html/files.html
index e803afec4..ffcae5e23 100644
--- a/doc/html/files.html
+++ b/doc/html/files.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">File List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -77,7 +77,7 @@
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/flexlexer_8h.html b/doc/html/flexlexer_8h.html
index e24cbbce0..d47cb9b01 100644
--- a/doc/html/flexlexer_8h.html
+++ b/doc/html/flexlexer_8h.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">flexlexer.h File Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -1062,7 +1062,7 @@ <h2 class="groupheader">Function Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions.html b/doc/html/functions.html
index fd46866ce..39d67fe01 100644
--- a/doc/html/functions.html
+++ b/doc/html/functions.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -164,7 +164,7 @@ <h3><a class="anchor" id="index_a"></a>- a -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_0x7e.html b/doc/html/functions_0x7e.html
index 71d0a793e..452c83519 100644
--- a/doc/html/functions_0x7e.html
+++ b/doc/html/functions_0x7e.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -106,7 +106,7 @@ <h3><a class="anchor" id="index_0x7e"></a>- ~ -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_b.html b/doc/html/functions_b.html
index 8a1dc63fc..7c63a85c6 100644
--- a/doc/html/functions_b.html
+++ b/doc/html/functions_b.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -152,7 +152,7 @@ <h3><a class="anchor" id="index_b"></a>- b -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_c.html b/doc/html/functions_c.html
index ae332728d..48ced4721 100644
--- a/doc/html/functions_c.html
+++ b/doc/html/functions_c.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -250,7 +250,7 @@ <h3><a class="anchor" id="index_c"></a>- c -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_d.html b/doc/html/functions_d.html
index f641702b8..6a36220bf 100644
--- a/doc/html/functions_d.html
+++ b/doc/html/functions_d.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -124,7 +124,7 @@ <h3><a class="anchor" id="index_d"></a>- d -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_e.html b/doc/html/functions_e.html
index d72822bc4..963020b73 100644
--- a/doc/html/functions_e.html
+++ b/doc/html/functions_e.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -182,7 +182,7 @@ <h3><a class="anchor" id="index_e"></a>- e -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_enum.html b/doc/html/functions_enum.html
index 1b72acac2..869b6ee23 100644
--- a/doc/html/functions_enum.html
+++ b/doc/html/functions_enum.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Enumerations</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -68,7 +68,7 @@
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_eval.html b/doc/html/functions_eval.html
index 413af293f..a5a148534 100644
--- a/doc/html/functions_eval.html
+++ b/doc/html/functions_eval.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Enumerator</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -107,7 +107,7 @@
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_f.html b/doc/html/functions_f.html
index a245fd2e8..1c4ac2e2d 100644
--- a/doc/html/functions_f.html
+++ b/doc/html/functions_f.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -239,7 +239,7 @@ <h3><a class="anchor" id="index_f"></a>- f -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_func.html b/doc/html/functions_func.html
index 65f0c7cc3..02980ceee 100644
--- a/doc/html/functions_func.html
+++ b/doc/html/functions_func.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Functions</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -140,7 +140,7 @@ <h3><a class="anchor" id="index_a"></a>- a -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_func_0x7e.html b/doc/html/functions_func_0x7e.html
index b37d20257..fa9d49201 100644
--- a/doc/html/functions_func_0x7e.html
+++ b/doc/html/functions_func_0x7e.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Functions</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -102,7 +102,7 @@ <h3><a class="anchor" id="index_0x7e"></a>- ~ -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_func_b.html b/doc/html/functions_func_b.html
index 6e2b051f0..4aa9abded 100644
--- a/doc/html/functions_func_b.html
+++ b/doc/html/functions_func_b.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Functions</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -120,7 +120,7 @@ <h3><a class="anchor" id="index_b"></a>- b -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_func_c.html b/doc/html/functions_func_c.html
index d1f73ebbf..d6efc1504 100644
--- a/doc/html/functions_func_c.html
+++ b/doc/html/functions_func_c.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Functions</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -149,7 +149,7 @@ <h3><a class="anchor" id="index_c"></a>- c -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_func_d.html b/doc/html/functions_func_d.html
index 3482b210c..fe643545f 100644
--- a/doc/html/functions_func_d.html
+++ b/doc/html/functions_func_d.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Functions</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -108,7 +108,7 @@ <h3><a class="anchor" id="index_d"></a>- d -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_func_e.html b/doc/html/functions_func_e.html
index 530e69661..0b7ef1936 100644
--- a/doc/html/functions_func_e.html
+++ b/doc/html/functions_func_e.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Functions</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -137,7 +137,7 @@ <h3><a class="anchor" id="index_e"></a>- e -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_func_f.html b/doc/html/functions_func_f.html
index 2f4cfdda7..dfb497f3c 100644
--- a/doc/html/functions_func_f.html
+++ b/doc/html/functions_func_f.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Functions</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -205,7 +205,7 @@ <h3><a class="anchor" id="index_f"></a>- f -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_func_g.html b/doc/html/functions_func_g.html
index 54540d77e..a6a61bb28 100644
--- a/doc/html/functions_func_g.html
+++ b/doc/html/functions_func_g.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Functions</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -141,7 +141,7 @@ <h3><a class="anchor" id="index_g"></a>- g -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_func_h.html b/doc/html/functions_func_h.html
index 05aea7759..726ac08a8 100644
--- a/doc/html/functions_func_h.html
+++ b/doc/html/functions_func_h.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Functions</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -105,7 +105,7 @@ <h3><a class="anchor" id="index_h"></a>- h -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_func_i.html b/doc/html/functions_func_i.html
index 001d6b8d7..f25b2cf84 100644
--- a/doc/html/functions_func_i.html
+++ b/doc/html/functions_func_i.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Functions</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -186,7 +186,7 @@ <h3><a class="anchor" id="index_i"></a>- i -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_func_l.html b/doc/html/functions_func_l.html
index f4a0fc421..0ea1b6d2e 100644
--- a/doc/html/functions_func_l.html
+++ b/doc/html/functions_func_l.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Functions</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -134,7 +134,7 @@ <h3><a class="anchor" id="index_l"></a>- l -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_func_m.html b/doc/html/functions_func_m.html
index 799cce6f2..1e3da9465 100644
--- a/doc/html/functions_func_m.html
+++ b/doc/html/functions_func_m.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Functions</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -116,7 +116,7 @@ <h3><a class="anchor" id="index_m"></a>- m -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_func_n.html b/doc/html/functions_func_n.html
index 233030928..05657f365 100644
--- a/doc/html/functions_func_n.html
+++ b/doc/html/functions_func_n.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Functions</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -116,7 +116,7 @@ <h3><a class="anchor" id="index_n"></a>- n -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_func_o.html b/doc/html/functions_func_o.html
index 7202e1c2f..253b72dc8 100644
--- a/doc/html/functions_func_o.html
+++ b/doc/html/functions_func_o.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Functions</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -263,7 +263,7 @@ <h3><a class="anchor" id="index_o"></a>- o -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_func_p.html b/doc/html/functions_func_p.html
index afa05baf6..c9d7849d9 100644
--- a/doc/html/functions_func_p.html
+++ b/doc/html/functions_func_p.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Functions</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -179,7 +179,7 @@ <h3><a class="anchor" id="index_p"></a>- p -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_func_r.html b/doc/html/functions_func_r.html
index 401b885a9..76359fedc 100644
--- a/doc/html/functions_func_r.html
+++ b/doc/html/functions_func_r.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Functions</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -120,7 +120,7 @@ <h3><a class="anchor" id="index_r"></a>- r -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_func_s.html b/doc/html/functions_func_s.html
index 8a54afac2..8f816b8c7 100644
--- a/doc/html/functions_func_s.html
+++ b/doc/html/functions_func_s.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Functions</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -152,7 +152,7 @@ <h3><a class="anchor" id="index_s"></a>- s -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_func_t.html b/doc/html/functions_func_t.html
index 2527467da..d0fa88bfc 100644
--- a/doc/html/functions_func_t.html
+++ b/doc/html/functions_func_t.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Functions</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -110,7 +110,7 @@ <h3><a class="anchor" id="index_t"></a>- t -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_func_u.html b/doc/html/functions_func_u.html
index 7b3c0fd7a..9d45e8c80 100644
--- a/doc/html/functions_func_u.html
+++ b/doc/html/functions_func_u.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Functions</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -97,7 +97,7 @@ <h3><a class="anchor" id="index_u"></a>- u -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_func_v.html b/doc/html/functions_func_v.html
index 0b3931512..5d306a45b 100644
--- a/doc/html/functions_func_v.html
+++ b/doc/html/functions_func_v.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Functions</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -93,7 +93,7 @@ <h3><a class="anchor" id="index_v"></a>- v -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_func_w.html b/doc/html/functions_func_w.html
index 495c7265a..5deee6813 100644
--- a/doc/html/functions_func_w.html
+++ b/doc/html/functions_func_w.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Functions</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -185,7 +185,7 @@ <h3><a class="anchor" id="index_w"></a>- w -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_func_y.html b/doc/html/functions_func_y.html
index a77aededd..97c497e1b 100644
--- a/doc/html/functions_func_y.html
+++ b/doc/html/functions_func_y.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Functions</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -111,7 +111,7 @@ <h3><a class="anchor" id="index_y"></a>- y -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_g.html b/doc/html/functions_g.html
index 33937bf1d..a7903fe6a 100644
--- a/doc/html/functions_g.html
+++ b/doc/html/functions_g.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -154,7 +154,7 @@ <h3><a class="anchor" id="index_g"></a>- g -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_h.html b/doc/html/functions_h.html
index 7aa1413fc..39cd6783a 100644
--- a/doc/html/functions_h.html
+++ b/doc/html/functions_h.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -112,7 +112,7 @@ <h3><a class="anchor" id="index_h"></a>- h -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_i.html b/doc/html/functions_i.html
index 03f7b9155..3846da2f3 100644
--- a/doc/html/functions_i.html
+++ b/doc/html/functions_i.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -274,7 +274,7 @@ <h3><a class="anchor" id="index_i"></a>- i -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_k.html b/doc/html/functions_k.html
index 874fa7dd6..8cc771541 100644
--- a/doc/html/functions_k.html
+++ b/doc/html/functions_k.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -101,7 +101,7 @@ <h3><a class="anchor" id="index_k"></a>- k -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_l.html b/doc/html/functions_l.html
index aa0e14ea9..bb29baee7 100644
--- a/doc/html/functions_l.html
+++ b/doc/html/functions_l.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -185,7 +185,7 @@ <h3><a class="anchor" id="index_l"></a>- l -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_m.html b/doc/html/functions_m.html
index 0814a2445..80137ca9f 100644
--- a/doc/html/functions_m.html
+++ b/doc/html/functions_m.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -217,7 +217,7 @@ <h3><a class="anchor" id="index_m"></a>- m -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_n.html b/doc/html/functions_n.html
index ce9ba9970..6256463dd 100644
--- a/doc/html/functions_n.html
+++ b/doc/html/functions_n.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -152,7 +152,7 @@ <h3><a class="anchor" id="index_n"></a>- n -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_o.html b/doc/html/functions_o.html
index 1ef15f630..0cd37f9be 100644
--- a/doc/html/functions_o.html
+++ b/doc/html/functions_o.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -290,7 +290,7 @@ <h3><a class="anchor" id="index_o"></a>- o -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_p.html b/doc/html/functions_p.html
index d0cb8dbf1..09fbebf6c 100644
--- a/doc/html/functions_p.html
+++ b/doc/html/functions_p.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -215,7 +215,7 @@ <h3><a class="anchor" id="index_p"></a>- p -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_q.html b/doc/html/functions_q.html
index 46c7b2624..64fb211b2 100644
--- a/doc/html/functions_q.html
+++ b/doc/html/functions_q.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -97,7 +97,7 @@ <h3><a class="anchor" id="index_q"></a>- q -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_r.html b/doc/html/functions_r.html
index cd16ebecd..b28b619c2 100644
--- a/doc/html/functions_r.html
+++ b/doc/html/functions_r.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -155,7 +155,7 @@ <h3><a class="anchor" id="index_r"></a>- r -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_rela.html b/doc/html/functions_rela.html
index 6bdddab85..ff3d14571 100644
--- a/doc/html/functions_rela.html
+++ b/doc/html/functions_rela.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Related Functions</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -75,7 +75,7 @@
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_s.html b/doc/html/functions_s.html
index efdca9231..9bbe6b0b6 100644
--- a/doc/html/functions_s.html
+++ b/doc/html/functions_s.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -236,7 +236,7 @@ <h3><a class="anchor" id="index_s"></a>- s -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_t.html b/doc/html/functions_t.html
index 0fd78f67a..429eda5f0 100644
--- a/doc/html/functions_t.html
+++ b/doc/html/functions_t.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -133,7 +133,7 @@ <h3><a class="anchor" id="index_t"></a>- t -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_type.html b/doc/html/functions_type.html
index 2a90e99e4..cecf4d50f 100644
--- a/doc/html/functions_type.html
+++ b/doc/html/functions_type.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Typedefs</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -281,7 +281,7 @@ <h3><a class="anchor" id="index_v"></a>- v -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_u.html b/doc/html/functions_u.html
index a8206d88a..bdc16ee86 100644
--- a/doc/html/functions_u.html
+++ b/doc/html/functions_u.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -131,7 +131,7 @@ <h3><a class="anchor" id="index_u"></a>- u -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_v.html b/doc/html/functions_v.html
index b99c153a1..06241b8d4 100644
--- a/doc/html/functions_v.html
+++ b/doc/html/functions_v.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -115,7 +115,7 @@ <h3><a class="anchor" id="index_v"></a>- v -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_vars.html b/doc/html/functions_vars.html
index d58b52e62..2d83b01ea 100644
--- a/doc/html/functions_vars.html
+++ b/doc/html/functions_vars.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Variables</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -107,7 +107,7 @@ <h3><a class="anchor" id="index_a"></a>- a -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_vars_b.html b/doc/html/functions_vars_b.html
index f9670de81..e79b06453 100644
--- a/doc/html/functions_vars_b.html
+++ b/doc/html/functions_vars_b.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Variables</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -116,7 +116,7 @@ <h3><a class="anchor" id="index_b"></a>- b -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_vars_c.html b/doc/html/functions_vars_c.html
index fa9a653f8..fa72c8883 100644
--- a/doc/html/functions_vars_c.html
+++ b/doc/html/functions_vars_c.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Variables</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -161,7 +161,7 @@ <h3><a class="anchor" id="index_c"></a>- c -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_vars_d.html b/doc/html/functions_vars_d.html
index cd096408d..7a24efe73 100644
--- a/doc/html/functions_vars_d.html
+++ b/doc/html/functions_vars_d.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Variables</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -101,7 +101,7 @@ <h3><a class="anchor" id="index_d"></a>- d -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_vars_e.html b/doc/html/functions_vars_e.html
index f2815e7f5..84ec75c01 100644
--- a/doc/html/functions_vars_e.html
+++ b/doc/html/functions_vars_e.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Variables</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -132,7 +132,7 @@ <h3><a class="anchor" id="index_e"></a>- e -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_vars_f.html b/doc/html/functions_vars_f.html
index 05f1a9081..b9c8bba32 100644
--- a/doc/html/functions_vars_f.html
+++ b/doc/html/functions_vars_f.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Variables</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -120,7 +120,7 @@ <h3><a class="anchor" id="index_f"></a>- f -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_vars_g.html b/doc/html/functions_vars_g.html
index 0dac081ad..2eecfdaa2 100644
--- a/doc/html/functions_vars_g.html
+++ b/doc/html/functions_vars_g.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Variables</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -98,7 +98,7 @@ <h3><a class="anchor" id="index_g"></a>- g -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_vars_h.html b/doc/html/functions_vars_h.html
index 3d3ada876..065428364 100644
--- a/doc/html/functions_vars_h.html
+++ b/doc/html/functions_vars_h.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Variables</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -95,7 +95,7 @@ <h3><a class="anchor" id="index_h"></a>- h -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_vars_i.html b/doc/html/functions_vars_i.html
index f9ee176c5..53fc68bb8 100644
--- a/doc/html/functions_vars_i.html
+++ b/doc/html/functions_vars_i.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Variables</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -161,7 +161,7 @@ <h3><a class="anchor" id="index_i"></a>- i -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_vars_k.html b/doc/html/functions_vars_k.html
index 516574bd5..46a975654 100644
--- a/doc/html/functions_vars_k.html
+++ b/doc/html/functions_vars_k.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Variables</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -95,7 +95,7 @@ <h3><a class="anchor" id="index_k"></a>- k -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_vars_l.html b/doc/html/functions_vars_l.html
index b818d7227..473af4ddb 100644
--- a/doc/html/functions_vars_l.html
+++ b/doc/html/functions_vars_l.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Variables</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -135,7 +135,7 @@ <h3><a class="anchor" id="index_l"></a>- l -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_vars_m.html b/doc/html/functions_vars_m.html
index 5e287ccb4..b574fea23 100644
--- a/doc/html/functions_vars_m.html
+++ b/doc/html/functions_vars_m.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Variables</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -129,7 +129,7 @@ <h3><a class="anchor" id="index_m"></a>- m -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_vars_n.html b/doc/html/functions_vars_n.html
index 2e259c23e..c02118963 100644
--- a/doc/html/functions_vars_n.html
+++ b/doc/html/functions_vars_n.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Variables</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -122,7 +122,7 @@ <h3><a class="anchor" id="index_n"></a>- n -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_vars_o.html b/doc/html/functions_vars_o.html
index 874da22ab..46d52067d 100644
--- a/doc/html/functions_vars_o.html
+++ b/doc/html/functions_vars_o.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Variables</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -114,7 +114,7 @@ <h3><a class="anchor" id="index_o"></a>- o -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_vars_p.html b/doc/html/functions_vars_p.html
index 84bbbce3b..5b67a675a 100644
--- a/doc/html/functions_vars_p.html
+++ b/doc/html/functions_vars_p.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Variables</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -117,7 +117,7 @@ <h3><a class="anchor" id="index_p"></a>- p -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_vars_q.html b/doc/html/functions_vars_q.html
index 646d4c67f..34d7c86a5 100644
--- a/doc/html/functions_vars_q.html
+++ b/doc/html/functions_vars_q.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Variables</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -95,7 +95,7 @@ <h3><a class="anchor" id="index_q"></a>- q -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_vars_r.html b/doc/html/functions_vars_r.html
index 7153e13fa..ee6c699d7 100644
--- a/doc/html/functions_vars_r.html
+++ b/doc/html/functions_vars_r.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Variables</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -113,7 +113,7 @@ <h3><a class="anchor" id="index_r"></a>- r -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_vars_s.html b/doc/html/functions_vars_s.html
index 781fe5acb..db8bc6da4 100644
--- a/doc/html/functions_vars_s.html
+++ b/doc/html/functions_vars_s.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Variables</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -154,7 +154,7 @@ <h3><a class="anchor" id="index_s"></a>- s -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_vars_t.html b/doc/html/functions_vars_t.html
index d93c08cc3..27004019e 100644
--- a/doc/html/functions_vars_t.html
+++ b/doc/html/functions_vars_t.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Variables</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -107,7 +107,7 @@ <h3><a class="anchor" id="index_t"></a>- t -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_vars_u.html b/doc/html/functions_vars_u.html
index 8c8b77953..9847f11fe 100644
--- a/doc/html/functions_vars_u.html
+++ b/doc/html/functions_vars_u.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Variables</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -122,7 +122,7 @@ <h3><a class="anchor" id="index_u"></a>- u -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_vars_v.html b/doc/html/functions_vars_v.html
index d4dd17c36..1d8c420c0 100644
--- a/doc/html/functions_vars_v.html
+++ b/doc/html/functions_vars_v.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Variables</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -101,7 +101,7 @@ <h3><a class="anchor" id="index_v"></a>- v -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_vars_w.html b/doc/html/functions_vars_w.html
index 1f623c09a..93a731795 100644
--- a/doc/html/functions_vars_w.html
+++ b/doc/html/functions_vars_w.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Variables</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -101,7 +101,7 @@ <h3><a class="anchor" id="index_w"></a>- w -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_vars_x.html b/doc/html/functions_vars_x.html
index 9b75f6357..f6dd2e9a0 100644
--- a/doc/html/functions_vars_x.html
+++ b/doc/html/functions_vars_x.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Variables</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -95,7 +95,7 @@ <h3><a class="anchor" id="index_x"></a>- x -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_vars_z.html b/doc/html/functions_vars_z.html
index 294d8d141..4f6b57991 100644
--- a/doc/html/functions_vars_z.html
+++ b/doc/html/functions_vars_z.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members - Variables</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -95,7 +95,7 @@ <h3><a class="anchor" id="index_z"></a>- z -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_w.html b/doc/html/functions_w.html
index df3a786c0..3b8076ff3 100644
--- a/doc/html/functions_w.html
+++ b/doc/html/functions_w.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -198,7 +198,7 @@ <h3><a class="anchor" id="index_w"></a>- w -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_x.html b/doc/html/functions_x.html
index b54c9a293..56812d518 100644
--- a/doc/html/functions_x.html
+++ b/doc/html/functions_x.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -97,7 +97,7 @@ <h3><a class="anchor" id="index_x"></a>- x -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_y.html b/doc/html/functions_y.html
index 94e344cb7..b0b67bf72 100644
--- a/doc/html/functions_y.html
+++ b/doc/html/functions_y.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -115,7 +115,7 @@ <h3><a class="anchor" id="index_y"></a>- y -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/functions_z.html b/doc/html/functions_z.html
index 41f25eb57..935692e05 100644
--- a/doc/html/functions_z.html
+++ b/doc/html/functions_z.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -97,7 +97,7 @@ <h3><a class="anchor" id="index_z"></a>- z -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/globals.html b/doc/html/globals.html
index 517aef57f..1b6b462dd 100644
--- a/doc/html/globals.html
+++ b/doc/html/globals.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">File Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -323,7 +323,7 @@ <h3><a class="anchor" id="index_y"></a>- y -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/globals_defs.html b/doc/html/globals_defs.html
index 6a8531884..9d797374d 100644
--- a/doc/html/globals_defs.html
+++ b/doc/html/globals_defs.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">File Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -271,7 +271,7 @@ <h3><a class="anchor" id="index_y"></a>- y -</h3><ul>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/globals_func.html b/doc/html/globals_func.html
index 03900f603..7ab49ec83 100644
--- a/doc/html/globals_func.html
+++ b/doc/html/globals_func.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">File Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -76,7 +76,7 @@
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/globals_vars.html b/doc/html/globals_vars.html
index da269f983..9d0f93ff1 100644
--- a/doc/html/globals_vars.html
+++ b/doc/html/globals_vars.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">File Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -67,7 +67,7 @@
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/graph_legend.html b/doc/html/graph_legend.html
index 23319eaf7..a7b9a16af 100644
--- a/doc/html/graph_legend.html
+++ b/doc/html/graph_legend.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Graph Legend</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -75,7 +75,7 @@
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/hierarchy.html b/doc/html/hierarchy.html
index bd3065b70..3e9d1c13d 100644
--- a/doc/html/hierarchy.html
+++ b/doc/html/hierarchy.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Hierarchy</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -110,7 +110,7 @@
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/index.html b/doc/html/index.html
index 025d7cb7f..0552b3bea 100644
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">RE/flex user guide</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -82,6 +82,8 @@
 <li class="level2"><a href="#reflex-input">Switching input sources                                         </a></li>
 <li class="level2"><a href="#reflex-states">Start condition states                                         </a></li>
 <li class="level2"><a href="#reflex-bison">Interfacing with Bison/Yacc                                     </a><ul><li class="level3"><a href="#reflex-bison-mt-safe">Bison and thread-safety</a></li>
+<li class="level3"><a href="#reflex-bison-cc">Bison-cc</a></li>
+<li class="level3"><a href="#reflex-bison-cc-locations">Bison-cc &amp; locations</a></li>
 <li class="level3"><a href="#reflex-bison-bridge">Bison-bridge</a></li>
 <li class="level3"><a href="#reflex-bison-locations">Bison-locations</a></li>
 <li class="level3"><a href="#reflex-bison-bridge-locations">Bison-bridge &amp; locations</a></li>
@@ -149,7 +151,7 @@ <h1><a class="anchor" id="intro"></a>
 <li>efficient matching in direct code or with finite state machine tables;</li>
 <li>visualization of finite state machines;</li>
 <li>generates scanners that are thread-safe by default;</li>
-<li>works with Bison and supports reentrant, bison-bridge and bison-locations;</li>
+<li>works with Bison, supports reentrant, C++, bison-bridge and bison-locations;</li>
 <li>includes a regex class library that is extensible;</li>
 <li>Boost.Regex can be used as a regex engine;</li>
 <li>C++11 std::regex can be used as a regex engine (but not with a scanner);</li>
@@ -495,7 +497,7 @@ <h2><a class="anchor" id="reflex-command"></a>
 <p>The <b>reflex</b> command takes a lexer specification from standard input or from the specified file (usually with extension .l, .ll, .l++, .lxx, or .lpp) and generates a C++ scanner class that is saved to the lex.yy.cpp source code file.</p>
 <p>The <b>reflex</b> command accepts <code>−−flex</code> and <code>−−bison</code> options for compatibility with Flex and Bison/Yacc, respectively. These options allow <b>reflex</b> to be used as a replacement of the classic Flex and Lex tools: </p><pre class="fragment">$ reflex −−flex −−bison lexerspec.l
 </pre><p>The first option <code>−−flex</code> specifies that <code>lexerspec.l</code> is a classic Flex/Lex specification with <code>yytext</code> or <code>YYText()</code> and the usual "yy" variables and functions.</p>
-<p>The second option <code>−−bison</code> generates a scanner class and the usual global "yy" variables and functions for compatibility with non-reentrant <a href="dinosaur.compilertools.net/#bison">Bison</a> parsers. See <a class="el" href="index.html#reflex-bison">Interfacing with Bison/Yacc </a> for more details on Bison parsers that are reentrant and/or use bison-bridge and bison-locations options.</p>
+<p>The second option <code>−−bison</code> generates a scanner class and the usual global "yy" variables and functions for compatibility with non-reentrant <a href="dinosaur.compilertools.net/#bison">Bison</a> parsers. See <a class="el" href="index.html#reflex-bison">Interfacing with Bison/Yacc </a> for more details on Bison parsers that are reentrant and/or use bison-bridge and bison-locations options. For Bison 3.0 C++ parsers, use <code>−−bison-cc</code> and optionally <code>−−bison-locations</code>.</p>
 <p>The lex.yy.cpp source code output is structured in sections that are clean, readable, and reusable. To generate a C++ header file lex.yy.h to include in your code base, use option <code>−−header-file</code>.</p>
 <p>🔝 <a href="#">Back to table of contents</a></p>
 <h2><a class="anchor" id="reflex-options"></a>
@@ -584,6 +586,8 @@ <h4><code>−−bison</code></h4>
 <p>This generates a scanner that works with Bison parsers, by defining global (non-MT-safe and non-reentrant) "yy" variables and functions. See <a class="el" href="index.html#reflex-bison">Interfacing with Bison/Yacc </a> for more details. Use option <code>−−noyywrap</code> to remove the dependency on the global <code>yywrap()</code> function.</p>
 <h4><code>−−bison-bridge</code></h4>
 <p>This generates a scanner that works with Bison pure (MT-safe and reentrant) parsers using a Bison bridge for one ore more scanner objects. See <a class="el" href="index.html#reflex-bison">Interfacing with Bison/Yacc </a> for more details.</p>
+<h4><code>−−bison-cc</code></h4>
+<p>This generates a scanner that works with Bison 3.0 <code>%skeleton "lalr1.cc"</code> C++ parsers that are MT-safe. See <a class="el" href="index.html#reflex-bison">Interfacing with Bison/Yacc </a> for more details.</p>
 <h4><code>−−bison-locations</code></h4>
 <p>This generates a scanner that works with Bison with locations enabled. See <a class="el" href="index.html#reflex-bison">Interfacing with Bison/Yacc </a> for more details.</p>
 <h4><code>-R</code>, <code>−−reentrant</code></h4>
@@ -720,6 +724,10 @@ <h3><a class="anchor" id="reflex-spec-rules"></a>
 <tr>
 <td><code>matcher().wsize()</code> </td><td><em>n/a</em> </td><td>same as <code>wsize()</code> </td></tr>
 <tr>
+<td><code>matcher().lineno()</code> </td><td><code>yylineno</code> </td><td>same as <code>lineno()</code> </td></tr>
+<tr>
+<td><code>matcher().columno()</code></td><td><em>n/a</em> </td><td>same as <code>columno()</code> </td></tr>
+<tr>
 <td><code>matcher().begin()</code> </td><td><em>n/a</em> </td><td>non-0-terminated text match </td></tr>
 <tr>
 <td><code>matcher().end()</code> </td><td><em>n/a</em> </td><td>non-0-terminated text match end </td></tr>
@@ -1694,7 +1702,7 @@ <h2><a class="anchor" id="reflex-inherit"></a>
 <p>When a <code>−−class=NAME</code> or <code>−−yyclass=NAME</code> option is specified with the name of your custom lexer class, <b>reflex</b> generates the <code><a class="el" href="namespacereflex_1_1convert__flag.html#a7222821c0cc6579424c71c261e9b8805" title="convert Lex/Flex regular expression syntax ">lex()</a></code> (or <code>yylex()</code>) method code for your custom lexer class. The custom lexer class should declare a public <code>int <a class="el" href="namespacereflex_1_1convert__flag.html#a7222821c0cc6579424c71c261e9b8805" title="convert Lex/Flex regular expression syntax ">lex()</a></code> method (or <code>int yylex()</code> method with option <code>−−yyclass=NAME</code>). Otherwise, C++ compilation of your custom class will fail.</p>
 <p>For example, the following bare-bones custom Lexer class definition simply inherits Lexer and declares a public <code>int <a class="el" href="namespacereflex_1_1convert__flag.html#a7222821c0cc6579424c71c261e9b8805" title="convert Lex/Flex regular expression syntax ">lex()</a></code> method:</p>
 <div class="alt"> <div class="fragment"><div class="line">%option <span class="keyword">class</span>=MyLexer</div><div class="line">%{</div><div class="line">  <span class="keyword">class </span>MyLexer : <span class="keyword">public</span> Lexer {</div><div class="line">   <span class="keyword">public</span>:</div><div class="line">    <span class="keywordtype">int</span> <a class="code" href="namespacereflex_1_1convert__flag.html#a7222821c0cc6579424c71c261e9b8805">lex</a>();</div><div class="line">  };</div><div class="line">%}</div></div><!-- fragment --> </div><p>The <code>int <a class="el" href="namespacereflex_1_1convert__flag.html#a7222821c0cc6579424c71c261e9b8805" title="convert Lex/Flex regular expression syntax ">MyLexer::lex()</a></code> method code is generated by <b>reflex</b> for this lexer specification.</p>
-<p>Options <code>−−lexer=NAME</code> and <code>--lex=NAME</code> can be combined with <code>−−class=NAME</code> to change the name of the inherited Lexer class and change the name of the <code><a class="el" href="namespacereflex_1_1convert__flag.html#a7222821c0cc6579424c71c261e9b8805" title="convert Lex/Flex regular expression syntax ">lex()</a></code> method, respectively.</p>
+<p>Options <code>−−lexer=NAME</code> and <code>−−lex=NAME</code> can be combined with <code>−−class=NAME</code> to change the name of the inherited Lexer class and change the name of the <code><a class="el" href="namespacereflex_1_1convert__flag.html#a7222821c0cc6579424c71c261e9b8805" title="convert Lex/Flex regular expression syntax ">lex()</a></code> method, respectively.</p>
 <p>When using option <code>−−yyclass=NAME</code> the inherited lexer is <code>yyFlexLexer</code>. The custom lexer class should declare a public <code>yylex()</code> method similar to Flex. For example:</p>
 <div class="alt"> <div class="fragment"><div class="line">%option yyclass=MyLexer</div><div class="line">%{</div><div class="line">  <span class="keyword">class </span>MyLexer : <span class="keyword">public</span> yyFlexLexer {</div><div class="line">   <span class="keyword">public</span>:</div><div class="line">    <span class="keywordtype">int</span> yylex();</div><div class="line">  };</div><div class="line">%}</div></div><!-- fragment --> </div><p>The <code>int MyLexer::yylex()</code> method code is generated by <b>reflex</b> for this lexer specification.</p>
 <p>🔝 <a href="#">Back to table of contents</a></p>
@@ -1767,7 +1775,7 @@ <h2><a class="anchor" id="reflex-bison"></a>
 <div class="alt"> <div class="fragment"><div class="line"><span class="comment">/* yacc grammar (.y file) */</span></div><div class="line"></div><div class="line">%{</div><div class="line">  <span class="keyword">extern</span> <span class="keywordtype">int</span> yylex(<span class="keywordtype">void</span>);</div><div class="line">%}</div><div class="line"></div><div class="line">%<span class="keyword">union </span>{         <span class="comment">// YYSTYPE yylval is a union:</span></div><div class="line">  <span class="keywordtype">int</span> num;       <span class="comment">// yylval.num</span></div><div class="line">  <span class="keywordtype">char</span>* str;     <span class="comment">// yylval.str</span></div><div class="line">}</div><div class="line"></div><div class="line">%token &lt;num&gt; CONST_NUMBER</div><div class="line">%token &lt;str&gt; CONST_STRING</div><div class="line"></div><div class="line">%%</div><div class="line">...  <span class="comment">// grammar rules</span></div><div class="line">%%</div></div><!-- fragment --> </div><p>When option <code>−−flex</code> is used with <code>−−bison</code>, the <code>yytext</code>, <code>yyleng</code>, and <code>yylineno</code> globals are accessible to the Bison/Yacc parser. In fact, all Flex actions and variables are globally accessible (outside <a class="el" href="index.html#reflex-spec-rules">The rules section</a> of the lexer specification) with the exception of <code>yy_push_state</code>, <code>yy_pop_state</code>, and <code>yy_top_state</code> that are class methods. Furthermore, <code>yyin</code> and <code>yyout</code> are macros and cannot be (re)declared or accessed as global variables, but these can be used as if they are variables to assign a new input source and to set the output stream. To avoid compilation errors when using globals such as <code>yyin</code>, use <b>reflex</b> option <code>−−header-file</code> to generate a header file <code>lex.yy.h</code> to include in your code. Finally, in code outside of <a class="el" href="index.html#reflex-spec-rules">The rules section</a> you must use <code><a class="el" href="flexlexer_8h.html#a411db26910a55c4e92a226dee582564b" title="Flex-compatible macro: read one character, returns zero when EOF. ">yyinput()</a></code> instead of <code>input()</code>, use the global action <code><a class="el" href="flexlexer_8h.html#ac1a8c02f442185b7c42b7b73279ab47e" title="Flex-compatible macro: put one character back onto the input stream to be read again. ">yyunput()</a></code> instead of <code>unput()</code>, and use the global action <code><a class="el" href="flexlexer_8h.html#a78f60a8bd9caa14659bf501bdc59f23b" title="Flex-compatible macro: output one character. ">yyoutput()</a></code> instead of <code>output()</code>.</p>
 <p>See the generated <code>lex.yy.cpp</code> BISON section, which contains declarations specific to Bison when the <code>−−bison</code> option is used.</p>
 <p>There are two approaches for a Bison parser to work with a scanner. Either the yacc grammar specification for Bison should include the externs we need to import from the scanner:</p>
-<div class="alt"> <div class="fragment"><div class="line"><span class="comment">/* yacc grammar (.y file) assuming C with externs defined by the scanner using YY_EXTERN_C */</span></div><div class="line"></div><div class="line">%{</div><div class="line">  <span class="keyword">extern</span> <span class="keywordtype">int</span> yylex(<span class="keywordtype">void</span>);</div><div class="line">  <span class="keyword">extern</span> <span class="keywordtype">char</span> *<a class="code" href="flexlexer_8h.html#a0d71f919dbec1ffd74b2460fa7e5ac28">yytext</a>;</div><div class="line">  <span class="keyword">extern</span> <a class="code" href="flexlexer_8h.html#aa9522b9e313cd74e4e688e358cbca836">yy_size_t</a> <a class="code" href="flexlexer_8h.html#afa07a629486cb790560bb95713ec7794">yyleng</a>;</div><div class="line">  <span class="keyword">extern</span> <span class="keywordtype">int</span> <a class="code" href="flexlexer_8h.html#ad71cf0fddcfe4f61de0929105b33226c">yylineno</a>;</div><div class="line">%}</div><div class="line"></div><div class="line">%%</div><div class="line">...  <span class="comment">// grammar rules</span></div><div class="line">%%</div></div><!-- fragment --> </div><p>or a better approach is to generate a <code>lex.yy.h</code> header file with option <code>--header-file</code> and use this header file in the yacc grammar specification:</p>
+<div class="alt"> <div class="fragment"><div class="line"><span class="comment">/* yacc grammar (.y file) assuming C with externs defined by the scanner using YY_EXTERN_C */</span></div><div class="line"></div><div class="line">%{</div><div class="line">  <span class="keyword">extern</span> <span class="keywordtype">int</span> yylex(<span class="keywordtype">void</span>);</div><div class="line">  <span class="keyword">extern</span> <span class="keywordtype">char</span> *<a class="code" href="flexlexer_8h.html#a0d71f919dbec1ffd74b2460fa7e5ac28">yytext</a>;</div><div class="line">  <span class="keyword">extern</span> <a class="code" href="flexlexer_8h.html#aa9522b9e313cd74e4e688e358cbca836">yy_size_t</a> <a class="code" href="flexlexer_8h.html#afa07a629486cb790560bb95713ec7794">yyleng</a>;</div><div class="line">  <span class="keyword">extern</span> <span class="keywordtype">int</span> <a class="code" href="flexlexer_8h.html#ad71cf0fddcfe4f61de0929105b33226c">yylineno</a>;</div><div class="line">%}</div><div class="line"></div><div class="line">%%</div><div class="line">...  <span class="comment">// grammar rules</span></div><div class="line">%%</div></div><!-- fragment --> </div><p>or a better approach is to generate a <code>lex.yy.h</code> header file with option <code>−−header-file</code> and use this header file in the yacc grammar specification:</p>
 <div class="alt"> <div class="fragment"><div class="line"><span class="comment">/* yacc grammar (.y file) for C++ */</span></div><div class="line"></div><div class="line">%{</div><div class="line"><span class="preprocessor">  #include &quot;lex.yy.h&quot;</span></div><div class="line">%}</div><div class="line"></div><div class="line">%%</div><div class="line">...  <span class="comment">// grammar rules</span></div><div class="line">%%</div></div><!-- fragment --> </div><p>The second option requires the generated parser to be compiled in C++, because <code>lex.yy.h</code> contains C++ declarations.</p>
 <dl class="section note"><dt>Note</dt><dd>The ugly Flex macro <code>YY_DECL</code> is not supported by RE/flex. This macro is needed with Flex to redeclare the <code>yylex()</code> function signature, for example to take an additional <code>yylval</code> parameter that must be passed through from <code>yyparse()</code> to <code>yylex()</code>. Because the generated scanner uses a Lexer class for scanning, the class can be extended with <code>%class{</code> and <code>%}</code> to hold state information and additional token-related values. These values can then be exchanged with the parser using getters and setters, which is preferred over changing the <code>yylex()</code> function signature with <code>YY_DECL</code>.</dd></dl>
 <p>🔝 <a href="#">Back to table of contents</a></p>
@@ -1791,37 +1799,60 @@ <h3><a class="anchor" id="reflex-bison-mt-safe"></a>
 <tr>
 <td><code>−−flex</code> <code>−−bison</code> <code>−−reentrant</code> </td><td><code>int <a class="el" href="namespacereflex_1_1convert__flag.html#a7222821c0cc6579424c71c261e9b8805" title="convert Lex/Flex regular expression syntax ">yyFlexLexer::lex()</a></code> </td><td><code>int yylex(yyscan_t)</code>, <code>void yylex_init(yyscan_t*)</code>, <code>void yylex_destroy(yyscan_t)</code> </td></tr>
 <tr>
-<td><code>−−bison-bridge</code> </td><td><code>int Lexer::lex(YYSTYPE&amp; yylval)</code> </td><td><code>int yylex(YYSTYPE*, yyscan_t)</code>, <code>void yylex_init(yyscan_t*)</code>, <code>void yylex_destroy(yyscan_t)</code> </td></tr>
+<td><code>−−bison-locations</code> </td><td><code>int Lexer::lex(YYSTYPE&amp; yylval)</code> </td><td><code>Lexer YY_SCANNER</code>, <code>int yylex(YYSTYPE *yylval, YYLTYPE *yylloc)</code> </td></tr>
+<tr>
+<td><code>−−flex</code> <code>−−bison-locations</code> </td><td><code>int yyFlexLexer::yylex(YYSTYPE&amp; yylval)</code> </td><td><code>yyFlexLexer YY_SCANNER</code>, <code>int yylex(YYSTYPE *yylval, YYLTYPE *yylloc)</code> </td></tr>
+<tr>
+<td><code>−−bison-cc</code> </td><td><code>int Lexer::lex(YYSTYPE *yylval)</code> </td><td>no global variables </td></tr>
 <tr>
-<td><code>−−flex</code> <code>−−bison-bridge</code> </td><td><code>int yyFlexLexer::yylex(YYSTYPE&amp; yylval)</code> </td><td><code>int yylex(YYSTYPE*, yyscan_t)</code>, <code>void yylex_init(yyscan_t*)</code>, <code>void yylex_destroy(yyscan_t)</code> </td></tr>
+<td><code>−−flex</code> <code>−−bison-cc</code> </td><td><code>int yyFlexLexer::yylex(YYSTYPE *yylval)</code> </td><td>no global variables </td></tr>
 <tr>
-<td><code>−−bison-locations</code> </td><td><code>int Lexer::lex(YYSTYPE&amp; yylval)</code> </td><td><code>Lexer YY_SCANNER</code>, <code>int yylex(YYSTYPE*, YYLTYPE*)</code> </td></tr>
+<td><code>−−bison-cc</code> <code>−−bison-locations</code> </td><td><code>int Lexer::lex(YYSTYPE *yylval, YYLTYPE *yylloc)</code> </td><td>no global variables </td></tr>
 <tr>
-<td><code>−−flex</code> <code>−−bison-locations</code> </td><td><code>int yyFlexLexer::yylex(YYSTYPE&amp; yylval)</code> </td><td><code>yyFlexLexer YY_SCANNER</code>, <code>int yylex(YYSTYPE*, YYLTYPE*)</code> </td></tr>
+<td><code>−−flex</code> <code>−−bison-cc</code> <code>−−bison-locations</code> </td><td><code>int yyFlexLexer::yylex(YYSTYPE *yylval, YYLTYPE *yylloc)</code> </td><td>no global variables </td></tr>
 <tr>
-<td><code>−−bison-locations</code> <code>−−bison-bridge</code> </td><td><code>int Lexer::lex(YYSTYPE&amp; yylval)</code> </td><td><code>int yylex(YYSTYPE*, YYLTYPE*, yyscan_t)</code>, <code>void yylex_init(yyscan_t*)</code>, <code>void yylex_destroy(yyscan_t)</code> </td></tr>
+<td><code>−−bison-bridge</code> </td><td><code>int Lexer::lex(YYSTYPE&amp; yylval)</code> </td><td><code>int yylex(YYSTYPE *yylval, yyscan_t)</code>, <code>void yylex_init(yyscan_t*)</code>, <code>void yylex_destroy(yyscan_t)</code> </td></tr>
 <tr>
-<td><code>−−flex</code> <code>−−bison-locations</code> <code>−−bison-bridge</code> </td><td><code>int yyFlexLexer::yylex(YYSTYPE&amp; yylval)</code> </td><td><code>int yylex(YYSTYPE*, YYLTYPE*, yyscan_t)</code>, <code>void yylex_init(yyscan_t*)</code>, <code>void yylex_destroy(yyscan_t)</code> </td></tr>
+<td><code>−−flex</code> <code>−−bison-bridge</code> </td><td><code>int yyFlexLexer::yylex(YYSTYPE&amp; yylval)</code> </td><td><code>int yylex(YYSTYPE *yylval, yyscan_t)</code>, <code>void yylex_init(yyscan_t*)</code>, <code>void yylex_destroy(yyscan_t)</code> </td></tr>
+<tr>
+<td><code>−−bison-bridge</code> <code>−−bison-locations</code> </td><td><code>int Lexer::lex(YYSTYPE&amp; yylval)</code> </td><td><code>int yylex(YYSTYPE *yylval, YYLTYPE *yylloc, yyscan_t)</code>, <code>void yylex_init(yyscan_t*)</code>, <code>void yylex_destroy(yyscan_t)</code> </td></tr>
+<tr>
+<td><code>−−flex</code> <code>−−bison-bridge</code> <code>−−bison-locations</code> </td><td><code>int yyFlexLexer::yylex(YYSTYPE&amp; yylval)</code> </td><td><code>int yylex(YYSTYPE *yylval, YYLTYPE *yylloc, yyscan_t)</code>, <code>void yylex_init(yyscan_t*)</code>, <code>void yylex_destroy(yyscan_t)</code> </td></tr>
 </table>
 <p>Option <code>−−prefix</code> may be used with option <code>−−flex</code> to change the prefix of the generated <code>yyFlexLexer</code> and <code>yylex</code>. This option can be combined with option <code>−−bison</code> to also change the prefix of the generated <code>yytext</code>, <code>yyleng</code>, and <code>yylineno</code>.</p>
-<p>The following sections explain the <code>−−bison</code> with <code>−−reentrant</code>, <code>−−bison-bridge</code> and <code>−−bison-locations</code> options for <b>reflex</b>.</p>
-<p>🔝 <a href="#">Back to table of contents</a></p>
+<p>Furthermore, <b>reflex</b> options <code>−−namespace=NAMESPACE</code>, <code>−−lexer=LEXER</code> and <code>−−lex=LEX</code> can be used to add a C++ namespace, to rename the lexer class (<code>Lexer</code> or <code>yyFlexLexer</code> by default) and to rename the lexer function (<code>lex</code> or <code>yylex</code> by default), respectively.</p>
+<p>The following sections explain the <code>−−bison-cc</code>, <code>−−bison-bridge</code>, <code>−−bison-locations</code> and <code>−−reentrant</code> options for <b>reflex</b>.</p>
+<p>🔝 <a href="#">Back to table of contents</a></p>
+<h3><a class="anchor" id="reflex-bison-cc"></a>
+Bison-cc</h3>
+<p>The <b>reflex</b> option <code>−−bison-cc</code> expects a Bison 3.0 <code>%skeleton "lalr1.cc"</code> C++ parser that is declared as follows in a Yacc specification:</p>
+<div class="alt"> <div class="fragment"><div class="line"><span class="comment">/* yacc grammar (.yxx file) for C++ */</span></div><div class="line"></div><div class="line">%skeleton <span class="stringliteral">&quot;lalr1.cc&quot;</span></div><div class="line">%require  <span class="stringliteral">&quot;3.0&quot;</span></div><div class="line"></div><div class="line">%code requires{</div><div class="line">  <span class="keyword">namespace </span>yy {</div><div class="line">    <span class="keyword">class </span>Lexer;  <span class="comment">// Generated by reflex with namespace=yy lexer=Lexer lex=yylex</span></div><div class="line">  }</div><div class="line">}</div><div class="line"></div><div class="line">%parse-param { yy::Lexer&amp; lexer }  <span class="comment">// Construct parser object with lexer</span></div><div class="line"></div><div class="line">%code{</div><div class="line"><span class="preprocessor">  #include &quot;lex.yy.h&quot;</span></div><div class="line"><span class="preprocessor">  #undef yylex</span></div><div class="line"><span class="preprocessor">  #define yylex lexer.yylex  // Within bison&#39;s parse() we should invoke lexer.yylex(), not the global yylex()</span></div><div class="line">}</div><div class="line"></div><div class="line">%<span class="keyword">union </span>{         <span class="comment">// yy::parser::semantic_type yylval is a union:</span></div><div class="line">  <span class="keywordtype">int</span> num;       <span class="comment">// type of yylval.num is int</span></div><div class="line">  <span class="keywordtype">char</span>* str;     <span class="comment">// type of yylval.str is char*</span></div><div class="line">}</div><div class="line"></div><div class="line">%token &lt;num&gt; CONST_NUMBER       <span class="comment">// This defines yy::parser::token::CONST_NUMBER</span></div><div class="line">%token &lt;str&gt; CONST_STRING       <span class="comment">// This defines yy::parser::token::CONST_STRING</span></div><div class="line"></div><div class="line">%%</div><div class="line">...  <span class="comment">// grammar rules</span></div><div class="line">%%</div><div class="line"></div><div class="line"><span class="keywordtype">void</span> yy::parser::error(<span class="keyword">const</span> std::string&amp; msg)</div><div class="line">{</div><div class="line">  std::cerr &lt;&lt; msg &lt;&lt; std::endl;</div><div class="line">}</div></div><!-- fragment --> </div><p>With the <code>−−bison-cc</code> option of <b>reflex</b>, the <code>yylex()</code> function takes a <code>yy::parser::semantic_type yylval</code> argument that makes the <code>yylval</code> visible in the lexer rules to assign semantic values to.</p>
+<p>The scanner is generated with <b>reflex</b> options <code>−−bison-cc</code>, <code>−−namespace=yy</code>, <code>−−lexer=Lexer</code> and <code>−−lex=yylex</code>. The lexer specification should <code>#include</code> the Bison-generated header file to ensure that the <code>yy::parser::token</code> enums <code>CONST_NUMBER</code> and <code>CONST_STRING</code> are defined.</p>
+<p>Using the code above, we can now initialize a Bison parser. We first should create a scanner and pass it to the <code>parser</code> constructor as follows:</p>
+<div class="alt"> <div class="fragment"><div class="line">yy::Lexer lexer(std::cin);  <span class="comment">// read from stdin (or a stream, string or FILE)</span></div><div class="line">yy::parser parser(lexer);</div><div class="line"><span class="keywordflow">if</span> (parser.parse() != 0)</div><div class="line">   ... <span class="comment">// error</span></div></div><!-- fragment --> </div><p>🔝 <a href="#">Back to table of contents</a></p>
+<h3><a class="anchor" id="reflex-bison-cc-locations"></a>
+Bison-cc &amp; locations</h3>
+<p>The <b>reflex</b> option <code>−−bison-cc</code> with <code>−−bison-locations</code> expects a Bison 3.0 <code>%skeleton "lalr1.cc"</code> C++ parser that is declared as follows in a Yacc specification:</p>
+<div class="alt"> <div class="fragment"><div class="line"><span class="comment">/* yacc grammar (.yxx file) for C++ */</span></div><div class="line"></div><div class="line">%skeleton <span class="stringliteral">&quot;lalr1.cc&quot;</span></div><div class="line">%require  <span class="stringliteral">&quot;3.0&quot;</span></div><div class="line"></div><div class="line">%code requires{</div><div class="line">  <span class="keyword">namespace </span>yy {</div><div class="line">    <span class="keyword">class </span>Lexer;  <span class="comment">// Generated by reflex with namespace=yy lexer=Lexer</span></div><div class="line">  }</div><div class="line">}</div><div class="line"></div><div class="line">%locations</div><div class="line"></div><div class="line">%parse-param { yy::Lexer&amp; lexer }  <span class="comment">// Construct parser object with lexer</span></div><div class="line"></div><div class="line">%code{</div><div class="line"><span class="preprocessor">  #include &quot;lex.yy.h&quot;</span></div><div class="line"><span class="preprocessor">  #undef yylex</span></div><div class="line"><span class="preprocessor">  #define yylex lexer.yylex  // Within bison&#39;s parse() we should invoke lexer.yylex(), not the global yylex()</span></div><div class="line">}</div><div class="line"></div><div class="line">%<span class="keyword">union </span>{         <span class="comment">// yy::parser::semantic_type yylval is a union:</span></div><div class="line">  <span class="keywordtype">int</span> num;       <span class="comment">// type of yylval.num is int</span></div><div class="line">  <span class="keywordtype">char</span>* str;     <span class="comment">// type of yylval.str is char*</span></div><div class="line">}</div><div class="line"></div><div class="line">%token &lt;num&gt; CONST_NUMBER       <span class="comment">// This defines yy::parser::token::CONST_NUMBER</span></div><div class="line">%token &lt;str&gt; CONST_STRING       <span class="comment">// This defines yy::parser::token::CONST_STRING</span></div><div class="line"></div><div class="line">%%</div><div class="line">...  <span class="comment">// grammar rules</span></div><div class="line">%%</div><div class="line"></div><div class="line"><span class="keywordtype">void</span> yy::parser::error(<span class="keyword">const</span> location_type&amp; loc, <span class="keyword">const</span> std::string&amp; msg)</div><div class="line">{</div><div class="line">  std::cerr &lt;&lt; msg &lt;&lt; <span class="stringliteral">&quot; at &quot;</span> &lt;&lt; loc &lt;&lt; std::endl;</div><div class="line">}</div></div><!-- fragment --> </div><p>With the <code>−−bison-cc</code> and <code>−−bison-locations</code> options of <b>reflex</b>, the <code>yylex()</code> function takes <code>yy::parser::semantic_type yylval</code> as the first argument that makes the <code>yylval</code> visible in the lexer rules to assign semantic values to, and takes a second argument <code>yy::location yylloc</code> that is set automatically by the <b>reflex</b> scanner to the line and column if the token matched.</p>
+<p>The scanner is generated with <b>reflex</b> options <code>−−bison-cc</code>, <code>−−bison-locations</code>, <code>−−namespace=yy</code>, <code>−−lexer=Lexer</code> and <code>−−lex=yylex</code>. The lexer specification should <code>#include</code> the Bison-generated header file to ensure that the <code>yy::parser::token</code> enums <code>CONST_NUMBER</code> and <code>CONST_STRING</code> are defined.</p>
+<p>Using the code above, we can now initialize a Bison parser. We first should create a scanner and pass it to the <code>parser</code> constructor as follows:</p>
+<div class="alt"> <div class="fragment"><div class="line">yy::Lexer lexer(std::cin);  <span class="comment">// read from stdin (or a stream, string or FILE)</span></div><div class="line">yy::parser parser(lexer);</div><div class="line"><span class="keywordflow">if</span> (parser.parse() != 0)</div><div class="line">   ... <span class="comment">// error</span></div></div><!-- fragment --> </div><p>🔝 <a href="#">Back to table of contents</a></p>
 <h3><a class="anchor" id="reflex-bison-bridge"></a>
 Bison-bridge</h3>
 <p>The <b>reflex</b> option <code>−−bison-bridge</code> expects a Bison "pure parser" that is declared as follows in a Yacc specification:</p>
-<div class="alt"> <div class="fragment"><div class="line"><span class="comment">/* yacc grammar (.y file) for C++ */</span></div><div class="line"></div><div class="line">%{</div><div class="line"><span class="preprocessor">  #include &quot;lex.yy.h&quot;</span></div><div class="line"><span class="preprocessor">  #define YYPARSE_PARAM scanner</span></div><div class="line"><span class="preprocessor">  #define YYLEX_PARAM   scanner</span></div><div class="line">%}</div><div class="line"></div><div class="line">%pure-parser</div><div class="line"></div><div class="line">%%</div><div class="line">...  <span class="comment">// grammar rules</span></div><div class="line">%%</div></div><!-- fragment --> </div><p>With the <code>−−bison-bridge</code> option of <b>reflex</b>, the <code>yyscan_t</code> argument type of <code>yylex()</code> is a <code>void*</code> type that passes the scanner object to this global function (as defined by <code>YYPARSE_PARAM</code> and <code>YYLEX_PARAM</code>). The function then invokes this scanner's lex function. This option also passes the <code>yylval</code> value to the lex function, which is a reference to an <code>YYSTYPE</code> value.</p>
+<div class="alt"> <div class="fragment"><div class="line"><span class="comment">/* yacc grammar (.y file) for C or C++ */</span></div><div class="line"></div><div class="line">%{</div><div class="line"><span class="preprocessor">  #include &quot;lex.yy.h&quot;</span></div><div class="line"><span class="preprocessor">  #define YYPARSE_PARAM scanner</span></div><div class="line"><span class="preprocessor">  #define YYLEX_PARAM   scanner</span></div><div class="line">%}</div><div class="line"></div><div class="line">%pure-parser</div><div class="line"></div><div class="line">%%</div><div class="line">...  <span class="comment">// grammar rules</span></div><div class="line">%%</div></div><!-- fragment --> </div><p>With the <code>−−bison-bridge</code> option of <b>reflex</b>, the <code>yyscan_t</code> argument type of <code>yylex()</code> is a <code>void*</code> type that passes the scanner object to this global function (as defined by <code>YYPARSE_PARAM</code> and <code>YYLEX_PARAM</code>). The function then invokes this scanner's lex function. This option also passes the <code>yylval</code> value to the lex function, which is a reference to an <code>YYSTYPE</code> value.</p>
 <p>Wtih the <code>−−bison-bridge</code> option two additional functions are generated that should be used to create a new scanner and delete the scanner in your program:</p>
 <div class="alt"> <div class="fragment"><div class="line">yyscan_t scanner = <span class="keyword">nullptr</span>;</div><div class="line">yylex_init(&amp;scanner);                <span class="comment">// create a new scanner</span></div><div class="line">...</div><div class="line">int token = yylex(&amp;yylval, scanner); <span class="comment">// scan with bison-bridge</span></div><div class="line">...</div><div class="line">yylex_destroy(scanner);              <span class="comment">// delete a scanner</span></div><div class="line">scanner = <span class="keyword">nullptr</span>;</div></div><!-- fragment --> </div><p>🔝 <a href="#">Back to table of contents</a></p>
 <h3><a class="anchor" id="reflex-bison-locations"></a>
 Bison-locations</h3>
 <p>The option <code>−−bison-locations</code> expects a Bison parser with the locations feature enabled. This feature provides line and column numbers of the matched text for error reporting. For example:</p>
-<div class="alt"> <div class="fragment"><div class="line"><span class="comment">/* yacc grammar (.y file) for C++ */</span></div><div class="line"></div><div class="line">%{</div><div class="line"><span class="preprocessor">  #include &quot;lex.yy.h&quot;</span></div><div class="line">  <span class="keywordtype">void</span> yyerror(<span class="keyword">const</span> <span class="keywordtype">char</span>*);</div><div class="line">%}</div><div class="line"></div><div class="line">%locations</div><div class="line"></div><div class="line">%<span class="keyword">union </span>{         <span class="comment">// YYSTYPE yylval is a union:</span></div><div class="line">  <span class="keywordtype">int</span> num;       <span class="comment">// type of yylval.num is int</span></div><div class="line">  <span class="keywordtype">char</span>* str;     <span class="comment">// type of yylval.str is char*</span></div><div class="line">}</div><div class="line"></div><div class="line">%{</div><div class="line">  <span class="comment">/* reflex option --bison-locations makes yylex() take yylval and yylloc */</span></div><div class="line">  <span class="keyword">extern</span> <span class="keywordtype">int</span> yylex(YYSTYPE*, YYLTYPE*);</div><div class="line"><span class="preprocessor">  #define YYLEX_PARAM &amp;yylval, &amp;yylloc</span></div><div class="line">%}</div><div class="line"></div><div class="line"><span class="comment">/* add &amp;yylval and &amp;yyloc parameters to yylex() with a trick: use YYLEX_PARAM */</span></div><div class="line">%lex-param { <span class="keywordtype">void</span> *YYLEX_PARAM }</div><div class="line"></div><div class="line">%token &lt;num&gt; CONST_NUMBER</div><div class="line">%token &lt;str&gt; CONST_STRING</div><div class="line"></div><div class="line">%%</div><div class="line">...  <span class="comment">// grammar rules</span></div><div class="line">%%</div><div class="line"></div><div class="line"><span class="keywordtype">void</span> yyerror(<span class="keyword">const</span> <span class="keywordtype">char</span> *msg)</div><div class="line">{</div><div class="line">  fprintf(stderr, <span class="stringliteral">&quot;%s at %d,%d to line %d,%d\n&quot;</span>,</div><div class="line">      msg,</div><div class="line">      yylloc.first_line,</div><div class="line">      yylloc.first_column,</div><div class="line">      yylloc.last_line,</div><div class="line">      yylloc.last_column);</div><div class="line">}</div></div><!-- fragment --> </div><p>The <code>yylval</code> value is passed to the lex function. The <code>yylloc</code> structure is automatically set by the RE/flex scanner, so you do not need to define a <code>YY_USER_ACTION</code> macro as you have to with Flex.</p>
+<div class="alt"> <div class="fragment"><div class="line"><span class="comment">/* yacc grammar (.y file) for C or C++ */</span></div><div class="line"></div><div class="line">%{</div><div class="line"><span class="preprocessor">  #include &quot;lex.yy.h&quot;</span></div><div class="line">  <span class="keywordtype">void</span> yyerror(<span class="keyword">const</span> <span class="keywordtype">char</span>*);</div><div class="line">%}</div><div class="line"></div><div class="line">%locations</div><div class="line"></div><div class="line">%<span class="keyword">union </span>{         <span class="comment">// YYSTYPE yylval is a union:</span></div><div class="line">  <span class="keywordtype">int</span> num;       <span class="comment">// type of yylval.num is int</span></div><div class="line">  <span class="keywordtype">char</span>* str;     <span class="comment">// type of yylval.str is char*</span></div><div class="line">}</div><div class="line"></div><div class="line">%{</div><div class="line">  <span class="comment">/* reflex option --bison-locations makes yylex() take yylval and yylloc */</span></div><div class="line">  <span class="keyword">extern</span> <span class="keywordtype">int</span> yylex(YYSTYPE*, YYLTYPE*);</div><div class="line"><span class="preprocessor">  #define YYLEX_PARAM &amp;yylval, &amp;yylloc</span></div><div class="line">%}</div><div class="line"></div><div class="line"><span class="comment">/* add &amp;yylval and &amp;yyloc parameters to yylex() with a trick: use YYLEX_PARAM */</span></div><div class="line">%lex-param { <span class="keywordtype">void</span> *YYLEX_PARAM }</div><div class="line"></div><div class="line">%token &lt;num&gt; CONST_NUMBER</div><div class="line">%token &lt;str&gt; CONST_STRING</div><div class="line"></div><div class="line">%%</div><div class="line">...  <span class="comment">// grammar rules</span></div><div class="line">%%</div><div class="line"></div><div class="line"><span class="keywordtype">void</span> yyerror(<span class="keyword">const</span> <span class="keywordtype">char</span> *msg)</div><div class="line">{</div><div class="line">  fprintf(stderr, <span class="stringliteral">&quot;%s at %d,%d to line %d,%d\n&quot;</span>,</div><div class="line">      msg,</div><div class="line">      yylloc.first_line,</div><div class="line">      yylloc.first_column,</div><div class="line">      yylloc.last_line,</div><div class="line">      yylloc.last_column);</div><div class="line">}</div></div><!-- fragment --> </div><p>The <code>yylval</code> value is passed to the lex function. The <code>yylloc</code> structure is automatically set by the RE/flex scanner, so you do not need to define a <code>YY_USER_ACTION</code> macro as you have to with Flex.</p>
 <p>Note that with the <code>−−bison-location</code> option, <code>yylex()</code> takes an additional <code>YYLTYPE</code> argument that a Bison parser provides.</p>
 <p>🔝 <a href="#">Back to table of contents</a></p>
 <h3><a class="anchor" id="reflex-bison-bridge-locations"></a>
 Bison-bridge &amp; locations</h3>
 <p>Here is a final example that combines options <code>−−bison-locations</code> and <code>−−bison-bridge</code>, The Bison parser should be a Bison pure-parser with locations enabled:</p>
-<div class="alt"> <div class="fragment"><div class="line"><span class="comment">/* yacc grammar (.y file) */</span></div><div class="line"></div><div class="line">%{</div><div class="line"><span class="preprocessor">  #include &quot;lex.yy.h&quot;</span></div><div class="line">  <span class="keywordtype">void</span> yyerror(YYLTYPE*, yyscan_t, <span class="keyword">const</span> <span class="keywordtype">char</span>*);</div><div class="line"><span class="preprocessor">  #define YYPARSE_PARAM scanner</span></div><div class="line"><span class="preprocessor">  #define YYLEX_PARAM   scanner</span></div><div class="line">%}</div><div class="line"></div><div class="line">%locations</div><div class="line">%pure-parser</div><div class="line">%lex-param { <span class="keywordtype">void</span> *scanner }</div><div class="line">%parse-param { <span class="keywordtype">void</span> *scanner }</div><div class="line"></div><div class="line">%<span class="keyword">union </span>{         <span class="comment">// YYSTYPE yylval is a union:</span></div><div class="line">  <span class="keywordtype">int</span> num;       <span class="comment">// yylval.num</span></div><div class="line">  <span class="keywordtype">char</span>* str;     <span class="comment">// yylval.str</span></div><div class="line">}</div><div class="line"></div><div class="line">%token &lt;num&gt; CONST_NUMBER</div><div class="line">%token &lt;str&gt; CONST_STRING</div><div class="line"></div><div class="line">%%</div><div class="line">...  <span class="comment">// grammar rules</span></div><div class="line">%%</div><div class="line"></div><div class="line"><span class="keywordtype">void</span> yyerror(YYLTYPE *yylloc, yyscan_t scanner, <span class="keyword">const</span> <span class="keywordtype">char</span> *msg)</div><div class="line">{</div><div class="line">  fprintf(stderr, <span class="stringliteral">&quot;%s at %d,%d to line %d,%d\n&quot;</span>,</div><div class="line">    msg,</div><div class="line">    yylloc.first_line,</div><div class="line">    yylloc.first_column,</div><div class="line">    yylloc.last_line,</div><div class="line">    yylloc.last_column);</div><div class="line">}</div></div><!-- fragment --> </div><dl class="section note"><dt>Note</dt><dd>when Bison <code>locations</code> with <code>define api.pure full</code> is used, <code>yyerror</code> has the signature <code>void yyerror(YYLTYPE *locp, char const *msg)</code>. This function signature is required to obtain the location information with Bison pure-parsers.</dd>
+<div class="alt"> <div class="fragment"><div class="line"><span class="comment">/* yacc grammar (.y file) for C or C++ */</span></div><div class="line"></div><div class="line">%{</div><div class="line"><span class="preprocessor">  #include &quot;lex.yy.h&quot;</span></div><div class="line">  <span class="keywordtype">void</span> yyerror(YYLTYPE*, yyscan_t, <span class="keyword">const</span> <span class="keywordtype">char</span>*);</div><div class="line"><span class="preprocessor">  #define YYPARSE_PARAM scanner</span></div><div class="line"><span class="preprocessor">  #define YYLEX_PARAM   scanner</span></div><div class="line">%}</div><div class="line"></div><div class="line">%locations</div><div class="line">%pure-parser</div><div class="line">%lex-param { <span class="keywordtype">void</span> *scanner }</div><div class="line">%parse-param { <span class="keywordtype">void</span> *scanner }</div><div class="line"></div><div class="line">%<span class="keyword">union </span>{         <span class="comment">// YYSTYPE yylval is a union:</span></div><div class="line">  <span class="keywordtype">int</span> num;       <span class="comment">// yylval.num</span></div><div class="line">  <span class="keywordtype">char</span>* str;     <span class="comment">// yylval.str</span></div><div class="line">}</div><div class="line"></div><div class="line">%token &lt;num&gt; CONST_NUMBER</div><div class="line">%token &lt;str&gt; CONST_STRING</div><div class="line"></div><div class="line">%%</div><div class="line">...  <span class="comment">// grammar rules</span></div><div class="line">%%</div><div class="line"></div><div class="line"><span class="keywordtype">void</span> yyerror(YYLTYPE *yylloc, yyscan_t scanner, <span class="keyword">const</span> <span class="keywordtype">char</span> *msg)</div><div class="line">{</div><div class="line">  fprintf(stderr, <span class="stringliteral">&quot;%s at %d,%d to line %d,%d\n&quot;</span>,</div><div class="line">    msg,</div><div class="line">    yylloc.first_line,</div><div class="line">    yylloc.first_column,</div><div class="line">    yylloc.last_line,</div><div class="line">    yylloc.last_column);</div><div class="line">}</div></div><!-- fragment --> </div><dl class="section note"><dt>Note</dt><dd>when Bison <code>%locations</code> with <code>%define api.pure full</code> is used, <code>yyerror</code> has the signature <code>void yyerror(YYLTYPE *locp, char const *msg)</code>. This function signature is required to obtain the location information with Bison pure-parsers.</dd>
 <dd>
 <code>yylval</code> is not a pointer argument but is always passed by reference and can be used as such in the scanner's rules.</dd>
 <dd>
@@ -2582,7 +2613,7 @@ <h1><a class="anchor" id="license"></a>
 </div></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/index_8md.html b/doc/html/index_8md.html
index bae9740fe..78b52f317 100644
--- a/doc/html/index_8md.html
+++ b/doc/html/index_8md.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">index.md File Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -52,7 +52,7 @@
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/inherits.html b/doc/html/inherits.html
index 02e3bcaaf..fb24b6c5f 100644
--- a/doc/html/inherits.html
+++ b/doc/html/inherits.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Class Hierarchy</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -226,7 +226,7 @@
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/input_8h.html b/doc/html/input_8h.html
index 506e65af8..1e4ce388f 100644
--- a/doc/html/input_8h.html
+++ b/doc/html/input_8h.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">input.h File Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -112,7 +112,7 @@
 </div></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/matcher_8h.html b/doc/html/matcher_8h.html
index c2a02e0f9..9bb77d4f8 100644
--- a/doc/html/matcher_8h.html
+++ b/doc/html/matcher_8h.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">matcher.h File Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -104,7 +104,7 @@
 </div></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/namespacemembers.html b/doc/html/namespacemembers.html
index b1442c668..2c084c80d 100644
--- a/doc/html/namespacemembers.html
+++ b/doc/html/namespacemembers.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Namespace Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -131,7 +131,7 @@
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/namespacemembers_func.html b/doc/html/namespacemembers_func.html
index f126d48d0..6ff4d54a2 100644
--- a/doc/html/namespacemembers_func.html
+++ b/doc/html/namespacemembers_func.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Namespace Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -95,7 +95,7 @@
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/namespacemembers_type.html b/doc/html/namespacemembers_type.html
index 54ff77460..dadc0788f 100644
--- a/doc/html/namespacemembers_type.html
+++ b/doc/html/namespacemembers_type.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Namespace Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -67,7 +67,7 @@
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/namespacemembers_vars.html b/doc/html/namespacemembers_vars.html
index 255005725..8ee742f04 100644
--- a/doc/html/namespacemembers_vars.html
+++ b/doc/html/namespacemembers_vars.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Namespace Members</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -85,7 +85,7 @@
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/namespacereflex.html b/doc/html/namespacereflex.html
index 53bfa68dc..e9f1b3334 100644
--- a/doc/html/namespacereflex.html
+++ b/doc/html/namespacereflex.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex Namespace Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -847,7 +847,7 @@ <h2 class="groupheader">Function Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/namespacereflex_1_1_posix.html b/doc/html/namespacereflex_1_1_posix.html
index 785c0850b..aa25e9136 100644
--- a/doc/html/namespacereflex_1_1_posix.html
+++ b/doc/html/namespacereflex_1_1_posix.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::Posix Namespace Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -87,7 +87,7 @@ <h2 class="groupheader">Function Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/namespacereflex_1_1_unicode.html b/doc/html/namespacereflex_1_1_unicode.html
index bd796f155..2818d34ba 100644
--- a/doc/html/namespacereflex_1_1_unicode.html
+++ b/doc/html/namespacereflex_1_1_unicode.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::Unicode Namespace Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -87,7 +87,7 @@ <h2 class="groupheader">Function Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/namespacereflex_1_1convert__flag.html b/doc/html/namespacereflex_1_1convert__flag.html
index e3429815e..fa91817c1 100644
--- a/doc/html/namespacereflex_1_1convert__flag.html
+++ b/doc/html/namespacereflex_1_1convert__flag.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::convert_flag Namespace Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -216,7 +216,7 @@ <h2 class="groupheader">Variable Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/namespaces.html b/doc/html/namespaces.html
index 5ddea9fe7..c9a45cf9c 100644
--- a/doc/html/namespaces.html
+++ b/doc/html/namespaces.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Namespace List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -60,7 +60,7 @@
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:29 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:47 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/pattern_8h.html b/doc/html/pattern_8h.html
index 2d9677957..0e9647335 100644
--- a/doc/html/pattern_8h.html
+++ b/doc/html/pattern_8h.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">pattern.h File Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -127,7 +127,7 @@
 </div></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/posix_8h.html b/doc/html/posix_8h.html
index 3c64d9d94..8234ddc22 100644
--- a/doc/html/posix_8h.html
+++ b/doc/html/posix_8h.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">posix.h File Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -104,7 +104,7 @@
 </div></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/ranges_8h.html b/doc/html/ranges_8h.html
index a71ba9c36..30bbefd06 100644
--- a/doc/html/ranges_8h.html
+++ b/doc/html/ranges_8h.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">ranges.h File Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -104,7 +104,7 @@
 </div></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/reflex_8cpp.html b/doc/html/reflex_8cpp.html
index 198d99694..e460e7216 100644
--- a/doc/html/reflex_8cpp.html
+++ b/doc/html/reflex_8cpp.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex.cpp File Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -353,7 +353,7 @@ <h2 class="groupheader">Variable Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/reflex_8h.html b/doc/html/reflex_8h.html
index a634af988..f3dc3d88b 100644
--- a/doc/html/reflex_8h.html
+++ b/doc/html/reflex_8h.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex.h File Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -116,7 +116,7 @@
 Macros</h2></td></tr>
 <tr class="memitem:a1fa4f1561216be34f745f32aaa38d943"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="reflex_8h.html#a1fa4f1561216be34f745f32aaa38d943">PLATFORM</a>&#160;&#160;&#160;&quot;(unknown OS)&quot;</td></tr>
 <tr class="separator:a1fa4f1561216be34f745f32aaa38d943"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a4126f60eecffe17e1a0385c6cfc41d8c"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="reflex_8h.html#a4126f60eecffe17e1a0385c6cfc41d8c">REFLEX_VERSION</a>&#160;&#160;&#160;&quot;1.0.5&quot;</td></tr>
+<tr class="memitem:a4126f60eecffe17e1a0385c6cfc41d8c"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="reflex_8h.html#a4126f60eecffe17e1a0385c6cfc41d8c">REFLEX_VERSION</a>&#160;&#160;&#160;&quot;1.0.6&quot;</td></tr>
 <tr class="separator:a4126f60eecffe17e1a0385c6cfc41d8c"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
@@ -143,7 +143,7 @@
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define REFLEX_VERSION&#160;&#160;&#160;&quot;1.0.5&quot;</td>
+          <td class="memname">#define REFLEX_VERSION&#160;&#160;&#160;&quot;1.0.6&quot;</td>
         </tr>
       </table>
 </div><div class="memdoc">
@@ -153,7 +153,7 @@
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/setop_8h.html b/doc/html/setop_8h.html
index f08525ec5..5261cc108 100644
--- a/doc/html/setop_8h.html
+++ b/doc/html/setop_8h.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">setop.h File Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -134,7 +134,7 @@ <h2>Example </h2>
 <div class="fragment"><div class="line">std::set&lt;int&gt; s1;</div><div class="line">s1.insert(1);</div><div class="line">assert(<a class="code" href="namespacereflex.html#a53a990336f7c3c72595d034bd685ee5c">reflex::is_in_set</a>(1, s1) == <span class="keyword">true</span>);</div><div class="line">std::set&lt;int&gt; s2;</div><div class="line">s2.insert(1);</div><div class="line">s2.insert(2);</div><div class="line">assert(<a class="code" href="namespacereflex.html#a3deed9d6b147d91074913f47c330d232">reflex::is_disjoint</a>(s1, s2) == <span class="keyword">false</span>);</div><div class="line">assert(<a class="code" href="namespacereflex.html#a088abc7ab84436832139b9c106cad426">reflex::is_subset</a>(s1, s2) == <span class="keyword">true</span>);</div><div class="line"><a class="code" href="structreflex_1_1lazy__union.html">reflex::lazy_union&lt; std::set&lt;int&gt;</a>,std::set&lt;int&gt; &gt; U(s1, s2);</div><div class="line"><span class="keywordflow">for</span> (<a class="code" href="structreflex_1_1lazy__union.html">reflex::lazy_union</a>&lt; std::set&lt;int&gt;,std::set&lt;int&gt; &gt;::iterator i = U.<a class="code" href="structreflex_1_1lazy__union.html#a47a05bc28ed049cf43b62df4e14e5f53">begin</a>(); i != U.end(); ++i)</div><div class="line">  std::cout &lt;&lt; *i &lt;&lt; std::endl; <span class="comment">// prints 1 and 2</span></div><div class="line"><a class="code" href="structreflex_1_1lazy__intersection.html">reflex::lazy_intersection&lt; std::set&lt;int&gt;</a>,std::set&lt;int&gt; &gt; I(s1, s2);</div><div class="line"><span class="keywordflow">for</span> (<a class="code" href="structreflex_1_1lazy__intersection.html">reflex::lazy_intersection</a>&lt; std::set&lt;int&gt;,std::set&lt;int&gt; &gt;::iterator i = I.<a class="code" href="structreflex_1_1lazy__intersection.html#a2473f5847b4ddb1a785d42b117f99910">begin</a>(); i != I.end(); ++i)</div><div class="line">  std::cout &lt;&lt; *i &lt;&lt; std::endl; <span class="comment">// prints 1</span></div></div><!-- fragment --> </div></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/stdmatcher_8h.html b/doc/html/stdmatcher_8h.html
index 42ad0111d..d783be3a3 100644
--- a/doc/html/stdmatcher_8h.html
+++ b/doc/html/stdmatcher_8h.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">stdmatcher.h File Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -102,7 +102,7 @@
 </div></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/struct_reflex_1_1_code-members.html b/doc/html/struct_reflex_1_1_code-members.html
index b6bd1f195..e161b4846 100644
--- a/doc/html/struct_reflex_1_1_code-members.html
+++ b/doc/html/struct_reflex_1_1_code-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -64,7 +64,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/struct_reflex_1_1_code.html b/doc/html/struct_reflex_1_1_code.html
index 354540766..7311bca7d 100644
--- a/doc/html/struct_reflex_1_1_code.html
+++ b/doc/html/struct_reflex_1_1_code.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Reflex::Code Struct Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -173,7 +173,7 @@ <h2 class="groupheader">Member Data Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/struct_reflex_1_1_library-members.html b/doc/html/struct_reflex_1_1_library-members.html
index ecb53fb0c..6656a8bff 100644
--- a/doc/html/struct_reflex_1_1_library-members.html
+++ b/doc/html/struct_reflex_1_1_library-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -65,7 +65,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/struct_reflex_1_1_library.html b/doc/html/struct_reflex_1_1_library.html
index f76cf5a58..992672871 100644
--- a/doc/html/struct_reflex_1_1_library.html
+++ b/doc/html/struct_reflex_1_1_library.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Reflex::Library Struct Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -160,7 +160,7 @@
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/struct_reflex_1_1_rule-members.html b/doc/html/struct_reflex_1_1_rule-members.html
index 7e2659d99..9bea99ac9 100644
--- a/doc/html/struct_reflex_1_1_rule-members.html
+++ b/doc/html/struct_reflex_1_1_rule-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -63,7 +63,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/struct_reflex_1_1_rule.html b/doc/html/struct_reflex_1_1_rule.html
index 1b20c435c..774190659 100644
--- a/doc/html/struct_reflex_1_1_rule.html
+++ b/doc/html/struct_reflex_1_1_rule.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Reflex::Rule Struct Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -154,7 +154,7 @@ <h2 class="groupheader">Member Data Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/structreflex_1_1_abstract_matcher_1_1_const-members.html b/doc/html/structreflex_1_1_abstract_matcher_1_1_const-members.html
index 1c9d31bc2..4eb1459fb 100644
--- a/doc/html/structreflex_1_1_abstract_matcher_1_1_const-members.html
+++ b/doc/html/structreflex_1_1_abstract_matcher_1_1_const-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -70,7 +70,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/structreflex_1_1_abstract_matcher_1_1_const.html b/doc/html/structreflex_1_1_abstract_matcher_1_1_const.html
index 2e9fb8d54..1631893f5 100644
--- a/doc/html/structreflex_1_1_abstract_matcher_1_1_const.html
+++ b/doc/html/structreflex_1_1_abstract_matcher_1_1_const.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::AbstractMatcher::Const Struct Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -325,7 +325,7 @@
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/structreflex_1_1_abstract_matcher_1_1_option-members.html b/doc/html/structreflex_1_1_abstract_matcher_1_1_option-members.html
index f7e0a203f..37b3c29d2 100644
--- a/doc/html/structreflex_1_1_abstract_matcher_1_1_option-members.html
+++ b/doc/html/structreflex_1_1_abstract_matcher_1_1_option-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -64,7 +64,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/structreflex_1_1_abstract_matcher_1_1_option.html b/doc/html/structreflex_1_1_abstract_matcher_1_1_option.html
index f02a26c49..92c21d3ef 100644
--- a/doc/html/structreflex_1_1_abstract_matcher_1_1_option.html
+++ b/doc/html/structreflex_1_1_abstract_matcher_1_1_option.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::AbstractMatcher::Option Struct Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -156,7 +156,7 @@ <h2 class="groupheader">Member Data Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/structreflex_1_1_bits_1_1_bitref-members.html b/doc/html/structreflex_1_1_bits_1_1_bitref-members.html
index bd9be6c11..dde299c42 100644
--- a/doc/html/structreflex_1_1_bits_1_1_bitref-members.html
+++ b/doc/html/structreflex_1_1_bits_1_1_bitref-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -68,7 +68,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/structreflex_1_1_bits_1_1_bitref.html b/doc/html/structreflex_1_1_bits_1_1_bitref.html
index 6b3ceb6ff..3b6f644b3 100644
--- a/doc/html/structreflex_1_1_bits_1_1_bitref.html
+++ b/doc/html/structreflex_1_1_bits_1_1_bitref.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::Bits::Bitref Struct Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -329,7 +329,7 @@ <h2 class="groupheader">Member Data Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/structreflex_1_1_input_1_1file__encoding-members.html b/doc/html/structreflex_1_1_input_1_1file__encoding-members.html
index c500b2aaa..efded0f05 100644
--- a/doc/html/structreflex_1_1_input_1_1file__encoding-members.html
+++ b/doc/html/structreflex_1_1_input_1_1file__encoding-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -80,7 +80,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/structreflex_1_1_input_1_1file__encoding.html b/doc/html/structreflex_1_1_input_1_1file__encoding.html
index 4d235eac6..7ee68e455 100644
--- a/doc/html/structreflex_1_1_input_1_1file__encoding.html
+++ b/doc/html/structreflex_1_1_input_1_1file__encoding.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::Input::file_encoding Struct Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -575,7 +575,7 @@
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/structreflex_1_1_matcher_1_1_f_s_m-members.html b/doc/html/structreflex_1_1_matcher_1_1_f_s_m-members.html
index c3af33579..205419427 100644
--- a/doc/html/structreflex_1_1_matcher_1_1_f_s_m-members.html
+++ b/doc/html/structreflex_1_1_matcher_1_1_f_s_m-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -67,7 +67,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/structreflex_1_1_matcher_1_1_f_s_m.html b/doc/html/structreflex_1_1_matcher_1_1_f_s_m.html
index ab0d468d4..93046b07d 100644
--- a/doc/html/structreflex_1_1_matcher_1_1_f_s_m.html
+++ b/doc/html/structreflex_1_1_matcher_1_1_f_s_m.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::Matcher::FSM Struct Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -173,7 +173,7 @@
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/structreflex_1_1_pattern_1_1_option-members.html b/doc/html/structreflex_1_1_pattern_1_1_option-members.html
index b336eaee7..7ad420b1b 100644
--- a/doc/html/structreflex_1_1_pattern_1_1_option-members.html
+++ b/doc/html/structreflex_1_1_pattern_1_1_option-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -74,7 +74,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/structreflex_1_1_pattern_1_1_option.html b/doc/html/structreflex_1_1_pattern_1_1_option.html
index ec0d1f7db..8f97f01e0 100644
--- a/doc/html/structreflex_1_1_pattern_1_1_option.html
+++ b/doc/html/structreflex_1_1_pattern_1_1_option.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::Pattern::Option Struct Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -320,7 +320,7 @@
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/structreflex_1_1_pattern_1_1_position-members.html b/doc/html/structreflex_1_1_pattern_1_1_position-members.html
index 55bec71c7..f8a96b29c 100644
--- a/doc/html/structreflex_1_1_pattern_1_1_position-members.html
+++ b/doc/html/structreflex_1_1_pattern_1_1_position-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -86,7 +86,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/structreflex_1_1_pattern_1_1_position.html b/doc/html/structreflex_1_1_pattern_1_1_position.html
index 2fc502d22..76df17cea 100644
--- a/doc/html/structreflex_1_1_pattern_1_1_position.html
+++ b/doc/html/structreflex_1_1_pattern_1_1_position.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::Pattern::Position Struct Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -718,7 +718,7 @@ <h2 class="groupheader">Member Data Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/structreflex_1_1_pattern_1_1_state-members.html b/doc/html/structreflex_1_1_pattern_1_1_state-members.html
index 810f09cd8..26b0bf24f 100644
--- a/doc/html/structreflex_1_1_pattern_1_1_state-members.html
+++ b/doc/html/structreflex_1_1_pattern_1_1_state-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -71,7 +71,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/structreflex_1_1_pattern_1_1_state.html b/doc/html/structreflex_1_1_pattern_1_1_state.html
index 292ec834f..f91930236 100644
--- a/doc/html/structreflex_1_1_pattern_1_1_state.html
+++ b/doc/html/structreflex_1_1_pattern_1_1_state.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::Pattern::State Struct Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -289,7 +289,7 @@ <h2 class="groupheader">Member Data Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/structreflex_1_1_posix_1_1_tables_1_1lt-members.html b/doc/html/structreflex_1_1_posix_1_1_tables_1_1lt-members.html
index 362136c1d..f86c32aad 100644
--- a/doc/html/structreflex_1_1_posix_1_1_tables_1_1lt-members.html
+++ b/doc/html/structreflex_1_1_posix_1_1_tables_1_1lt-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -61,7 +61,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/structreflex_1_1_posix_1_1_tables_1_1lt.html b/doc/html/structreflex_1_1_posix_1_1_tables_1_1lt.html
index 09ecd8cd8..fb585bea4 100644
--- a/doc/html/structreflex_1_1_posix_1_1_tables_1_1lt.html
+++ b/doc/html/structreflex_1_1_posix_1_1_tables_1_1lt.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::Posix::Tables::lt Struct Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -106,7 +106,7 @@ <h2 class="groupheader">Member Function Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/structreflex_1_1_type_op-members.html b/doc/html/structreflex_1_1_type_op-members.html
index 28c289559..e48686ffa 100644
--- a/doc/html/structreflex_1_1_type_op-members.html
+++ b/doc/html/structreflex_1_1_type_op-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -63,7 +63,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/structreflex_1_1_type_op.html b/doc/html/structreflex_1_1_type_op.html
index ea3007963..812428698 100644
--- a/doc/html/structreflex_1_1_type_op.html
+++ b/doc/html/structreflex_1_1_type_op.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::TypeOp&lt; T &gt; Struct Template Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -141,7 +141,7 @@
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/structreflex_1_1_type_op_3_01const_01_t_01_4-members.html b/doc/html/structreflex_1_1_type_op_3_01const_01_t_01_4-members.html
index 2f1effda8..fc28755bb 100644
--- a/doc/html/structreflex_1_1_type_op_3_01const_01_t_01_4-members.html
+++ b/doc/html/structreflex_1_1_type_op_3_01const_01_t_01_4-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -63,7 +63,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/structreflex_1_1_type_op_3_01const_01_t_01_4.html b/doc/html/structreflex_1_1_type_op_3_01const_01_t_01_4.html
index 330b13714..a502a8198 100644
--- a/doc/html/structreflex_1_1_type_op_3_01const_01_t_01_4.html
+++ b/doc/html/structreflex_1_1_type_op_3_01const_01_t_01_4.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::TypeOp&lt; const T &gt; Struct Template Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -126,7 +126,7 @@
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/structreflex_1_1lazy__intersection-members.html b/doc/html/structreflex_1_1lazy__intersection-members.html
index 12190e5bb..2d8372637 100644
--- a/doc/html/structreflex_1_1lazy__intersection-members.html
+++ b/doc/html/structreflex_1_1lazy__intersection-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -66,7 +66,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/structreflex_1_1lazy__intersection.html b/doc/html/structreflex_1_1lazy__intersection.html
index b48f6c11e..d0e71ab65 100644
--- a/doc/html/structreflex_1_1lazy__intersection.html
+++ b/doc/html/structreflex_1_1lazy__intersection.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::lazy_intersection&lt; S1, S2 &gt; Struct Template Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -238,7 +238,7 @@ <h2 class="groupheader">Member Data Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/structreflex_1_1lazy__intersection_1_1iterator-members.html b/doc/html/structreflex_1_1lazy__intersection_1_1iterator-members.html
index 115d5f677..b7079a285 100644
--- a/doc/html/structreflex_1_1lazy__intersection_1_1iterator-members.html
+++ b/doc/html/structreflex_1_1lazy__intersection_1_1iterator-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -74,7 +74,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/structreflex_1_1lazy__intersection_1_1iterator.html b/doc/html/structreflex_1_1lazy__intersection_1_1iterator.html
index bfb84083a..3e71b8369 100644
--- a/doc/html/structreflex_1_1lazy__intersection_1_1iterator.html
+++ b/doc/html/structreflex_1_1lazy__intersection_1_1iterator.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::lazy_intersection&lt; S1, S2 &gt;::iterator Struct Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -434,7 +434,7 @@ <h2 class="groupheader">Member Data Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/structreflex_1_1lazy__union-members.html b/doc/html/structreflex_1_1lazy__union-members.html
index eb8e5db92..1b9dfcdc2 100644
--- a/doc/html/structreflex_1_1lazy__union-members.html
+++ b/doc/html/structreflex_1_1lazy__union-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -66,7 +66,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/structreflex_1_1lazy__union.html b/doc/html/structreflex_1_1lazy__union.html
index 8515d3000..28edacf24 100644
--- a/doc/html/structreflex_1_1lazy__union.html
+++ b/doc/html/structreflex_1_1lazy__union.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::lazy_union&lt; S1, S2 &gt; Struct Template Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -238,7 +238,7 @@ <h2 class="groupheader">Member Data Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/structreflex_1_1lazy__union_1_1iterator-members.html b/doc/html/structreflex_1_1lazy__union_1_1iterator-members.html
index dace5411b..f9718e635 100644
--- a/doc/html/structreflex_1_1lazy__union_1_1iterator-members.html
+++ b/doc/html/structreflex_1_1lazy__union_1_1iterator-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -75,7 +75,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/structreflex_1_1lazy__union_1_1iterator.html b/doc/html/structreflex_1_1lazy__union_1_1iterator.html
index a3daeb6fe..c1c744da2 100644
--- a/doc/html/structreflex_1_1lazy__union_1_1iterator.html
+++ b/doc/html/structreflex_1_1lazy__union_1_1iterator.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::lazy_union&lt; S1, S2 &gt;::iterator Struct Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -450,7 +450,7 @@ <h2 class="groupheader">Member Data Documentation</h2>
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/structreflex_1_1range__compare-members.html b/doc/html/structreflex_1_1range__compare-members.html
index 27ce03358..68367556f 100644
--- a/doc/html/structreflex_1_1range__compare-members.html
+++ b/doc/html/structreflex_1_1range__compare-members.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">Member List</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -61,7 +61,7 @@
 </table></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/structreflex_1_1range__compare.html b/doc/html/structreflex_1_1range__compare.html
index 2ab47bd47..984e3ce64 100644
--- a/doc/html/structreflex_1_1range__compare.html
+++ b/doc/html/structreflex_1_1range__compare.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">reflex::range_compare&lt; T &gt; Struct Template Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -127,7 +127,7 @@
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:23 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/timer_8h.html b/doc/html/timer_8h.html
index 96f09c93c..89bbb0207 100644
--- a/doc/html/timer_8h.html
+++ b/doc/html/timer_8h.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">timer.h File Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -95,7 +95,7 @@
 </div></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/traits_8h.html b/doc/html/traits_8h.html
index 70de68fca..69a26b2e8 100644
--- a/doc/html/traits_8h.html
+++ b/doc/html/traits_8h.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">traits.h File Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -94,7 +94,7 @@
 </div></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/unicode_8h.html b/doc/html/unicode_8h.html
index c2c684d27..737b4a1b8 100644
--- a/doc/html/unicode_8h.html
+++ b/doc/html/unicode_8h.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">unicode.h File Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -96,7 +96,7 @@
 </div></div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/html/utf8_8h.html b/doc/html/utf8_8h.html
index 75ddf9919..00ed24e20 100644
--- a/doc/html/utf8_8h.html
+++ b/doc/html/utf8_8h.html
@@ -21,7 +21,7 @@
      <td>
       <div style="float: right; font-size: 18px; font-weight: bold;">utf8.h File Reference</div>
       <br>
-      <div style="float: right; font-size: 10px;">updated Fri Jun 29 2018 by Robert van Engelen</div>
+      <div style="float: right; font-size: 10px;">updated Mon Jul 9 2018 by Robert van Engelen</div>
      </td>
      <td width="10%">&nbsp;</td>
     </tr>
@@ -149,7 +149,7 @@
 </div><!-- contents -->
 <hr class="footer">
 <address class="footer"><small>
-Converted on Fri Jun 29 2018 19:56:22 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
+Converted on Mon Jul 9 2018 15:13:41 by <a target="_blank" href="http://www.doxygen.org/index.html">Doxygen</a> 1.8.11</small></address>
 <br>
 <div style="height: 246px; background: #DBDBDB;">
 </body>
diff --git a/doc/index.md b/doc/index.md
index 7e5573ded..a8149196e 100644
--- a/doc/index.md
+++ b/doc/index.md
@@ -31,7 +31,7 @@ Features:
 - efficient matching in direct code or with finite state machine tables;
 - visualization of finite state machines;
 - generates scanners that are thread-safe by default;
-- works with Bison and supports reentrant, bison-bridge and bison-locations;
+- works with Bison, supports reentrant, C++, bison-bridge and bison-locations;
 - includes a regex class library that is extensible;
 - Boost.Regex can be used as a regex engine;
 - C++11 std::regex can be used as a regex engine (but not with a scanner);
@@ -1001,7 +1001,8 @@ The second option `−−bison` generates a scanner class and the usual global "
 variables and functions for compatibility with non-reentrant
 [Bison](dinosaur.compilertools.net/#bison) parsers.  See \ref reflex-bison for
 more details on Bison parsers that are reentrant and/or use bison-bridge and
-bison-locations options.
+bison-locations options.  For Bison 3.0 C++ parsers, use `−−bison-cc` and
+optionally `−−bison-locations`.
 
 The lex.yy.cpp source code output is structured in sections that are clean,
 readable, and reusable.  To generate a C++ header file lex.yy.h to include in
@@ -1324,8 +1325,13 @@ dependency on the global `yywrap()` function.
 #### `−−bison-bridge`
 
 This generates a scanner that works with Bison pure (MT-safe and reentrant)
-parsers using a Bison bridge for one ore more scanner objects.  See \ref
-reflex-bison for more details.
+parsers using a Bison bridge for one ore more scanner objects.  See
+\ref reflex-bison for more details.
+
+#### `−−bison-cc`
+
+This generates a scanner that works with Bison 3.0 `%%skeleton "lalr1.cc"` C++
+parsers that are MT-safe.  See \ref reflex-bison for more details.
 
 #### `−−bison-locations`
 
@@ -1740,6 +1746,8 @@ the classic Flex actions shown in the second column of this table:
   `matcher().wchr()`   | *n/a*                | same as `wchr()`
   `matcher().size()`   | `YYLeng()`, `yyleng` | same as `size()`
   `matcher().wsize()`  | *n/a*                | same as `wsize()`
+  `matcher().lineno()` | `yylineno`           | same as `lineno()`
+  `matcher().columno()`| *n/a*                | same as `columno()`
   `matcher().begin()`  | *n/a*                | non-0-terminated text match
   `matcher().end()`    | *n/a*                | non-0-terminated text match end
   `matcher().input()`  | `yyinput()`          | get next 8-bit char from input
@@ -2874,7 +2882,7 @@ inherits Lexer and declares a public `int lex()` method:
 The `int MyLexer::lex()` method code is generated by **reflex** for this lexer
 specification.
 
-Options `−−lexer=NAME` and `--lex=NAME` can be combined with `−−class=NAME` to
+Options `−−lexer=NAME` and `−−lex=NAME` can be combined with `−−class=NAME` to
 change the name of the inherited Lexer class and change the name of the `lex()`
 method, respectively.
 
@@ -3504,7 +3512,7 @@ import from the scanner:
 </div>
 
 or a better approach is to generate a `lex.yy.h` header file with option
-`--header-file` and use this header file in the yacc grammar specification:
+`−−header-file` and use this header file in the yacc grammar specification:
 
 <div class="alt">
 ```cpp
@@ -3546,28 +3554,182 @@ these Bison-specific features.
 The following combinations of options are available to generate scanners for
 Bison:
 
-  Options                                       | Method                                    | Global functions and variables
-  --------------------------------------------- | ----------------------------------------- | ------------------------------
-  &nbsp;                                        | `int Lexer::lex()`                        | no global variables, but doesn't work with Bison
-  `−−flex`                                      | `int yyFlexLexer::yylex()`                | no global variables, but doesn't work with Bison
-  `−−bison`                                     | `int Lexer::lex()`                        | `Lexer YY_SCANNER`, `int yylex()`, `YYSTYPE yylval`
-  `−−flex` `−−bison`                            | `int yyFlexLexer::yylex()`                | `yyFlexLexer YY_SCANNER`, `int yylex()`, `YYSTYPE yylval`, `char *yytext`, `yy_size_t yyleng`, `int yylineno`
-  `−−bison` `−−reentrant`                       | `int Lexer::lex()`                        | `int yylex(yyscan_t)`, `void yylex_init(yyscan_t*)`, `void yylex_destroy(yyscan_t)` 
-  `−−flex` `−−bison` `−−reentrant`              | `int yyFlexLexer::lex()`                  | `int yylex(yyscan_t)`, `void yylex_init(yyscan_t*)`, `void yylex_destroy(yyscan_t)`
-  `−−bison-bridge`                              | `int Lexer::lex(YYSTYPE& yylval)`         | `int yylex(YYSTYPE*, yyscan_t)`, `void yylex_init(yyscan_t*)`, `void yylex_destroy(yyscan_t)`
-  `−−flex` `−−bison-bridge`                     | `int yyFlexLexer::yylex(YYSTYPE& yylval)` | `int yylex(YYSTYPE*, yyscan_t)`, `void yylex_init(yyscan_t*)`, `void yylex_destroy(yyscan_t)` 
-  `−−bison-locations`                           | `int Lexer::lex(YYSTYPE& yylval)`         | `Lexer YY_SCANNER`, `int yylex(YYSTYPE*, YYLTYPE*)` 
-  `−−flex` `−−bison-locations`                  | `int yyFlexLexer::yylex(YYSTYPE& yylval)` | `yyFlexLexer YY_SCANNER`, `int yylex(YYSTYPE*, YYLTYPE*)` 
-  `−−bison-locations` `−−bison-bridge`          | `int Lexer::lex(YYSTYPE& yylval)`         | `int yylex(YYSTYPE*, YYLTYPE*, yyscan_t)`, `void yylex_init(yyscan_t*)`, `void yylex_destroy(yyscan_t)` 
-  `−−flex` `−−bison-locations` `−−bison-bridge` | `int yyFlexLexer::yylex(YYSTYPE& yylval)` | `int yylex(YYSTYPE*, YYLTYPE*, yyscan_t)`, `void yylex_init(yyscan_t*)`, `void yylex_destroy(yyscan_t)` 
+  Options                                       | Method                                                     | Global functions and variables
+  --------------------------------------------- | ---------------------------------------------------------- | ------------------------------
+  &nbsp;                                        | `int Lexer::lex()`                                         | no global variables, but doesn't work with Bison
+  `−−flex`                                      | `int yyFlexLexer::yylex()`                                 | no global variables, but doesn't work with Bison
+  `−−bison`                                     | `int Lexer::lex()`                                         | `Lexer YY_SCANNER`, `int yylex()`, `YYSTYPE yylval`
+  `−−flex` `−−bison`                            | `int yyFlexLexer::yylex()`                                 | `yyFlexLexer YY_SCANNER`, `int yylex()`, `YYSTYPE yylval`, `char *yytext`, `yy_size_t yyleng`, `int yylineno`
+  `−−bison` `−−reentrant`                       | `int Lexer::lex()`                                         | `int yylex(yyscan_t)`, `void yylex_init(yyscan_t*)`, `void yylex_destroy(yyscan_t)` 
+  `−−flex` `−−bison` `−−reentrant`              | `int yyFlexLexer::lex()`                                   | `int yylex(yyscan_t)`, `void yylex_init(yyscan_t*)`, `void yylex_destroy(yyscan_t)`
+  `−−bison-locations`                           | `int Lexer::lex(YYSTYPE& yylval)`                          | `Lexer YY_SCANNER`, `int yylex(YYSTYPE *yylval, YYLTYPE *yylloc)` 
+  `−−flex` `−−bison-locations`                  | `int yyFlexLexer::yylex(YYSTYPE& yylval)`                  | `yyFlexLexer YY_SCANNER`, `int yylex(YYSTYPE *yylval, YYLTYPE *yylloc)` 
+  `−−bison-cc`                                  | `int Lexer::lex(YYSTYPE *yylval)`                          | no global variables
+  `−−flex` `−−bison-cc`                         | `int yyFlexLexer::yylex(YYSTYPE *yylval)`                  | no global variables
+  `−−bison-cc` `−−bison-locations`              | `int Lexer::lex(YYSTYPE *yylval, YYLTYPE *yylloc)`         | no global variables
+  `−−flex` `−−bison-cc` `−−bison-locations`     | `int yyFlexLexer::yylex(YYSTYPE *yylval, YYLTYPE *yylloc)` | no global variables
+  `−−bison-bridge`                              | `int Lexer::lex(YYSTYPE& yylval)`                          | `int yylex(YYSTYPE *yylval, yyscan_t)`, `void yylex_init(yyscan_t*)`, `void yylex_destroy(yyscan_t)`
+  `−−flex` `−−bison-bridge`                     | `int yyFlexLexer::yylex(YYSTYPE& yylval)`                  | `int yylex(YYSTYPE *yylval, yyscan_t)`, `void yylex_init(yyscan_t*)`, `void yylex_destroy(yyscan_t)` 
+  `−−bison-bridge` `−−bison-locations`          | `int Lexer::lex(YYSTYPE& yylval)`                          | `int yylex(YYSTYPE *yylval, YYLTYPE *yylloc, yyscan_t)`, `void yylex_init(yyscan_t*)`, `void yylex_destroy(yyscan_t)` 
+  `−−flex` `−−bison-bridge` `−−bison-locations` | `int yyFlexLexer::yylex(YYSTYPE& yylval)`                  | `int yylex(YYSTYPE *yylval, YYLTYPE *yylloc, yyscan_t)`, `void yylex_init(yyscan_t*)`, `void yylex_destroy(yyscan_t)` 
 
 Option `−−prefix` may be used with option `−−flex` to change the prefix of the
 generated `yyFlexLexer` and `yylex`.  This option can be combined with option
 `−−bison` to also change the prefix of the generated `yytext`, `yyleng`, and
 `yylineno`.
 
-The following sections explain the `−−bison` with `−−reentrant`,
-`−−bison-bridge` and `−−bison-locations` options for **reflex**.
+Furthermore, **reflex** options `−−namespace=NAMESPACE`, `−−lexer=LEXER` and
+`−−lex=LEX` can be used to add a C++ namespace, to rename the lexer class
+(`Lexer` or `yyFlexLexer` by default) and to rename the lexer function (`lex`
+or `yylex` by default), respectively.
+
+The following sections explain the `−−bison-cc`, `−−bison-bridge`,
+`−−bison-locations` and `−−reentrant` options for **reflex**.
+
+🔝 [Back to table of contents](#)
+
+
+### Bison-cc                                                 {#reflex-bison-cc}
+
+The **reflex** option `−−bison-cc` expects a Bison 3.0 `%%skeleton "lalr1.cc"`
+C++ parser that is declared as follows in a Yacc specification:
+
+<div class="alt">
+```cpp
+/* yacc grammar (.yxx file) for C++ */
+
+%skeleton "lalr1.cc"
+%require  "3.0"
+
+%code requires{
+  namespace yy {
+    class Lexer;  // Generated by reflex with namespace=yy lexer=Lexer lex=yylex
+  }
+}
+
+%parse-param { yy::Lexer& lexer }  // Construct parser object with lexer
+
+%code{
+  #include "lex.yy.h"
+  #undef yylex
+  #define yylex lexer.yylex  // Within bison's parse() we should invoke lexer.yylex(), not the global yylex()
+}
+
+%union {         // yy::parser::semantic_type yylval is a union:
+  int num;       // type of yylval.num is int
+  char* str;     // type of yylval.str is char*
+}
+
+%token <num> CONST_NUMBER       // This defines yy::parser::token::CONST_NUMBER
+%token <str> CONST_STRING       // This defines yy::parser::token::CONST_STRING
+
+%%
+...  // grammar rules
+%%
+
+void yy::parser::error(const std::string& msg)
+{
+  std::cerr << msg << std::endl;
+}
+```
+</div>
+
+With the `−−bison-cc` option of **reflex**, the `yylex()` function takes a
+`yy::parser::semantic_type yylval` argument that makes the `yylval` visible
+in the lexer rules to assign semantic values to.
+
+The scanner is generated with **reflex** options `−−bison-cc`, `−−namespace=yy`,
+`−−lexer=Lexer` and `−−lex=yylex`.  The lexer specification should `#include`
+the Bison-generated header file to ensure that the `yy::parser::token` enums
+`CONST_NUMBER` and `CONST_STRING` are defined.
+
+Using the code above, we can now initialize a Bison parser.  We first should
+create a scanner and pass it to the `parser` constructor as follows:
+
+<div class="alt">
+```cpp
+yy::Lexer lexer(std::cin);  // read from stdin (or a stream, string or FILE)
+yy::parser parser(lexer);
+if (parser.parse() != 0)
+   ... // error
+```
+</div>
+
+🔝 [Back to table of contents](#)
+
+
+### Bison-cc & locations                           {#reflex-bison-cc-locations}
+
+The **reflex** option `−−bison-cc` with `−−bison-locations` expects a Bison 3.0
+`%%skeleton "lalr1.cc"` C++ parser that is declared as follows in a Yacc
+specification:
+
+<div class="alt">
+```cpp
+/* yacc grammar (.yxx file) for C++ */
+
+%skeleton "lalr1.cc"
+%require  "3.0"
+
+%code requires{
+  namespace yy {
+    class Lexer;  // Generated by reflex with namespace=yy lexer=Lexer
+  }
+}
+
+%locations
+
+%parse-param { yy::Lexer& lexer }  // Construct parser object with lexer
+
+%code{
+  #include "lex.yy.h"
+  #undef yylex
+  #define yylex lexer.yylex  // Within bison's parse() we should invoke lexer.yylex(), not the global yylex()
+}
+
+%union {         // yy::parser::semantic_type yylval is a union:
+  int num;       // type of yylval.num is int
+  char* str;     // type of yylval.str is char*
+}
+
+%token <num> CONST_NUMBER       // This defines yy::parser::token::CONST_NUMBER
+%token <str> CONST_STRING       // This defines yy::parser::token::CONST_STRING
+
+%%
+...  // grammar rules
+%%
+
+void yy::parser::error(const location_type& loc, const std::string& msg)
+{
+  std::cerr << msg << " at " << loc << std::endl;
+}
+```
+</div>
+
+With the `−−bison-cc` and `−−bison-locations` options of **reflex**, the
+`yylex()` function takes `yy::parser::semantic_type yylval` as the first
+argument that makes the `yylval` visible in the lexer rules to assign semantic
+values to, and takes a second argument `yy::location yylloc` that is set
+automatically by the **reflex** scanner to the line and column if the token
+matched.
+
+The scanner is generated with **reflex** options `−−bison-cc`,
+`−−bison-locations`, `−−namespace=yy`, `−−lexer=Lexer` and `−−lex=yylex`.  The
+lexer specification should `#include` the Bison-generated header file to ensure
+that the `yy::parser::token` enums `CONST_NUMBER` and `CONST_STRING` are
+defined.
+
+Using the code above, we can now initialize a Bison parser.  We first should
+create a scanner and pass it to the `parser` constructor as follows:
+
+<div class="alt">
+```cpp
+yy::Lexer lexer(std::cin);  // read from stdin (or a stream, string or FILE)
+yy::parser parser(lexer);
+if (parser.parse() != 0)
+   ... // error
+```
+</div>
 
 🔝 [Back to table of contents](#)
 
@@ -3579,7 +3741,7 @@ declared as follows in a Yacc specification:
 
 <div class="alt">
 ```cpp
-/* yacc grammar (.y file) for C++ */
+/* yacc grammar (.y file) for C or C++ */
 
 %{
   #include "lex.yy.h"
@@ -3627,7 +3789,7 @@ text for error reporting.  For example:
 
 <div class="alt">
 ```cpp
-/* yacc grammar (.y file) for C++ */
+/* yacc grammar (.y file) for C or C++ */
 
 %{
   #include "lex.yy.h"
@@ -3687,7 +3849,7 @@ locations enabled:
 
 <div class="alt">
 ```cpp
-/* yacc grammar (.y file) */
+/* yacc grammar (.y file) for C or C++ */
 
 %{
   #include "lex.yy.h"
@@ -3725,7 +3887,7 @@ void yyerror(YYLTYPE *yylloc, yyscan_t scanner, const char *msg)
 ```
 </div>
 
-@note when Bison `%locations` with `%define api.pure full` is used, `yyerror`
+@note when Bison `%%locations` with `%%define api.pure full` is used, `yyerror`
 has the signature `void yyerror(YYLTYPE *locp, char const *msg)`.  This
 function signature is required to obtain the location information with Bison
 pure-parsers.
diff --git a/doc/man/reflex.1 b/doc/man/reflex.1
index 6c5ccdcd8..62cf7df7a 100644
--- a/doc/man/reflex.1
+++ b/doc/man/reflex.1
@@ -1,4 +1,4 @@
-.TH REFLEX "1" "June 29, 2018" "reflex 1.0.5" "User Commands"
+.TH REFLEX "1" "July 09, 2018" "reflex 1.0.6" "User Commands"
 .SH NAME
 reflex \- the regex\-centric fast and flexible lexical analyzer generator
 .SH SYNOPSIS
@@ -101,6 +101,9 @@ initialize input to std::cin instead of stdin
 \fB\-\-bison\fR
 generate global yylex() scanner for bison
 .TP
+\fB\-\-bison\-cc\fR
+generate bison C++ interface code for bison lalr1.cc skeleton
+.TP
 \fB\-\-bison\-bridge\fR
 generate reentrant yylex() scanner for bison pure parser
 .TP
diff --git a/examples/Make b/examples/Make
index ceb1d7940..90f974e5c 100644
--- a/examples/Make
+++ b/examples/Make
@@ -1,18 +1,22 @@
-# Makefile to quickly build the examples:
+# These examples require Bison or Yacc
+#
+# To quickly build the examples:
 # > make -f Make
-# Normally you should use configure and make to build and install:
+#
+# Or use configure and make to build:
 # > ./configure && make
 # > cd examples
 # > make
 #
-# requires Bison or Yacc
-#
+# To build examples3.0 requires Bison 3.0 or greater:
+# > make -f Make examples3.0
 
 CXX       = c++
 REFLEX    = ../bin/reflex
 REFLAGS   =
 LIBREFLEX =../lib/libreflex.a
 YACC      = bison -y
+BISON     = bison
 INCBOOST  = /opt/local/include
 LIBBOOST  = /opt/local/lib/libboost_regex-mt.dylib
 CXXOFLAGS = -O2
@@ -21,7 +25,13 @@ CXXIFLAGS = -I. -I../include -I $(INCBOOST)
 CXXMFLAGS =
 CXXFLAGS  = $(CXXWFLAGS) $(CXXOFLAGS) $(CXXIFLAGS) $(CXXMFLAGS)
 
-examples:	flexexample1 flexexample2 flexexample3 flexexample4 flexexample5 flexexample6 flexexample7 flexexample8 reflexexample3 reflexexample4 reflexexample5 reflexexample6 ctokens jtokens ptokens echo calc wc wcu wcpp wcwc tag tag_lazy tag_lazystates tag_unicode tag_tidy cow cows indent json braille unicode csv cards
+all:		examples examplesxx
+
+examples:	flexexample1 flexexample2 flexexample3 flexexample4 flexexample5 flexexample6 flexexample7 flexexample8 reflexexample3 reflexexample4 reflexexample5 reflexexample6 reflexexample7 reflexexample8 ctokens jtokens ptokens echo calc wc wcu wcpp wcwc tag tag_lazy tag_lazystates tag_unicode tag_tidy cow cows indent json braille unicode csv cards
+
+examplesxx:	flexexample3xx flexexample4xx flexexample5xx flexexample7xx flexexample8xx reflexexample3xx reflexexample4xx reflexexample5xx reflexexample7xx reflexexample8xx
+
+examples3.0:	flexexample9xx reflexexample9xx
 
 flexexample1:	flexexample1.l
 		$(REFLEX) $(REFLAGS) --flex flexexample1.l
@@ -40,18 +50,36 @@ flexexample3:	flexexample3.l flexexample3.y
 		$(CXX) $(CXXFLAGS) -o $@ y.tab.o lex.yy.cpp $(LIBREFLEX)
 		./flexexample3 < flexexample3.test
 
+flexexample3xx:		flexexample3.lxx flexexample3.yxx
+			$(BISON) -d flexexample3.yxx
+			$(REFLEX) $(REFLAGS) --flex --bison flexexample3.lxx
+			$(CXX) $(CXXFLAGS) -o $@ flexexample3.tab.cxx lex.yy.cpp $(LIBREFLEX)
+			./flexexample3xx < flexexample3.test
+
 flexexample4:	flexexample4.l flexexample4.y
 		$(YACC) -d flexexample4.y
 		$(REFLEX) $(REFLAGS) --flex --bison-bridge --header-file flexexample4.l
 		$(CXX) $(CXXFLAGS) -DWITH_NO_C -o $@ y.tab.c lex.yy.cpp $(LIBREFLEX)
 		./flexexample4 < flexexample4.test
 
+flexexample4xx:	flexexample4.lxx flexexample4.yxx
+		$(BISON) -d flexexample4.yxx
+		$(REFLEX) $(REFLAGS) --flex --bison-bridge --header-file flexexample4.lxx
+		$(CXX) $(CXXFLAGS) -DWITH_NO_C -o $@ flexexample4.tab.cxx lex.yy.cpp $(LIBREFLEX)
+		./flexexample4xx < flexexample4.test
+
 flexexample5:	flexexample5.l flexexample5.y
 		$(YACC) -d flexexample5.y
 		$(REFLEX) $(REFLAGS) --flex --bison-bridge --header-file flexexample5.l
 		$(CXX) $(CXXFLAGS) -o $@ y.tab.c lex.yy.cpp $(LIBREFLEX)
 		./flexexample5 < flexexample5.test
 
+flexexample5xx:	flexexample5.lxx flexexample5.yxx
+		$(BISON) -d flexexample5.yxx
+		$(REFLEX) $(REFLAGS) --flex --bison-bridge --header-file flexexample5.lxx
+		$(CXX) $(CXXFLAGS) -o $@ flexexample5.tab.cxx lex.yy.cpp $(LIBREFLEX)
+		./flexexample5xx < flexexample5.test
+
 flexexample6:	flexexample6.l
 		$(REFLEX) $(REFLAGS) --flex flexexample6.l
 		$(CXX) $(CXXFLAGS) -o $@ lex.yy.cpp $(LIBREFLEX)
@@ -64,35 +92,102 @@ flexexample7:	flexexample7.l flexexample7.y
 		$(CXX) $(CXXFLAGS) -o $@ y.tab.o lex.yy.cpp $(LIBREFLEX)
 		./flexexample7 < flexexample7.test
 
+flexexample7xx:		flexexample7.lxx flexexample7.yxx
+			$(BISON) -d flexexample7.yxx
+			$(REFLEX) $(REFLAGS) --flex --bison-locations flexexample7.lxx
+			$(CXX) $(CXXFLAGS) -o $@ flexexample7.tab.cxx lex.yy.cpp $(LIBREFLEX)
+			./flexexample7xx < flexexample7.test
+
 flexexample8:	flexexample8.l flexexample8.y
 		$(YACC) -d flexexample8.y
 		$(REFLEX) $(REFLAGS) --flex --bison-locations --bison-bridge --header-file flexexample8.l
 		$(CXX) $(CXXFLAGS) -o $@ y.tab.c lex.yy.cpp $(LIBREFLEX)
 		./flexexample8 < flexexample8.test
 
+flexexample8xx:		flexexample8.lxx flexexample8.yxx
+			$(BISON) -d flexexample8.yxx
+			$(REFLEX) $(REFLAGS) --flex --bison-locations --bison-bridge --header-file flexexample8.lxx
+			$(CXX) $(CXXFLAGS) -o $@ flexexample8.tab.cxx lex.yy.cpp $(LIBREFLEX)
+			./flexexample8xx < flexexample8.test
+
+flexexample9xx:		flexexample9.lxx flexexample9.yxx
+			$(BISON) -d flexexample9.yxx
+			$(REFLEX) $(REFLAGS) --flex --bison-cc --bison-locations --header-file flexexample9.lxx
+			$(CXX) $(CXXFLAGS) -o $@ flexexample9.tab.cxx lex.yy.cpp $(LIBREFLEX)
+			./flexexample9xx < flexexample9.test
+
 reflexexample3:	reflexexample3.l reflexexample3.y
 		$(YACC) -d reflexexample3.y
 		$(REFLEX) $(REFLAGS) --bison --header-file reflexexample3.l
 		$(CXX) $(CXXFLAGS) -o $@ y.tab.c lex.yy.cpp $(LIBREFLEX)
 		./reflexexample3 < flexexample3.test
 
+reflexexample3xx:	reflexexample3.lxx reflexexample3.yxx
+			$(BISON) -d reflexexample3.yxx
+			$(REFLEX) $(REFLAGS) --bison --header-file reflexexample3.lxx
+			$(CXX) $(CXXFLAGS) -o $@ reflexexample3.tab.cxx lex.yy.cpp $(LIBREFLEX)
+			./reflexexample3xx < flexexample3.test
+
 reflexexample4:	reflexexample4.l flexexample4.y
 		$(YACC) -d flexexample4.y
 		$(REFLEX) $(REFLAGS) --bison-bridge --header-file reflexexample4.l
 		$(CXX) $(CXXFLAGS) -DWITH_NO_C -o $@ y.tab.c lex.yy.cpp $(LIBREFLEX)
 		./reflexexample4 < flexexample4.test
 
+reflexexample4xx:	reflexexample4.lxx flexexample4.yxx
+			$(BISON) -d flexexample4.yxx
+			$(REFLEX) $(REFLAGS) --bison-bridge --header-file reflexexample4.lxx
+			$(CXX) $(CXXFLAGS) -DWITH_NO_C -o $@ flexexample4.tab.cxx lex.yy.cpp $(LIBREFLEX)
+			./reflexexample4xx < flexexample4.test
+
 reflexexample5:	reflexexample5.l flexexample5.y
 		$(YACC) -d flexexample5.y
 		$(REFLEX) $(REFLAGS) --bison-bridge --header-file reflexexample5.l
 		$(CXX) $(CXXFLAGS) -o $@ y.tab.c lex.yy.cpp $(LIBREFLEX)
 		./reflexexample5 < flexexample5.test
 
+reflexexample5xx:	reflexexample5.lxx flexexample5.yxx
+			$(BISON) -d flexexample5.yxx
+			$(REFLEX) $(REFLAGS) --bison-bridge --header-file reflexexample5.lxx
+			$(CXX) $(CXXFLAGS) -o $@ flexexample5.tab.cxx lex.yy.cpp $(LIBREFLEX)
+			./reflexexample5xx < flexexample5.test
+
 reflexexample6:	reflexexample6.l
 		$(REFLEX) $(REFLAGS) reflexexample6.l
 		$(CXX) $(CXXFLAGS) -o $@ lex.yy.cpp $(LIBREFLEX)
 		./reflexexample6 < reflexexample6.l
 
+reflexexample7:	reflexexample7.l flexexample7.y
+		$(YACC) -d flexexample7.y
+		$(REFLEX) $(REFLAGS) --bison-locations reflexexample7.l
+		$(CC) $(CXXFLAGS) -c y.tab.c
+		$(CXX) $(CXXFLAGS) -o $@ y.tab.o lex.yy.cpp $(LIBREFLEX)
+		./reflexexample7 < flexexample7.test
+
+reflexexample7xx:	reflexexample7.lxx flexexample7.yxx
+			$(BISON) -d flexexample7.yxx
+			$(REFLEX) $(REFLAGS) --bison-locations reflexexample7.lxx
+			$(CXX) $(CXXFLAGS) -o $@ flexexample7.tab.cxx lex.yy.cpp $(LIBREFLEX)
+			./reflexexample7xx < flexexample7.test
+
+reflexexample8:	reflexexample8.l flexexample8.y
+		$(YACC) -d flexexample8.y
+		$(REFLEX) $(REFLAGS) --flex --bison-locations --bison-bridge --header-file reflexexample8.l
+		$(CXX) $(CXXFLAGS) -o $@ y.tab.c lex.yy.cpp $(LIBREFLEX)
+		./reflexexample8 < flexexample8.test
+
+reflexexample8xx:	reflexexample8.lxx flexexample8.yxx
+			$(BISON) -d flexexample8.yxx
+			$(REFLEX) $(REFLAGS) --flex --bison-locations --bison-bridge --header-file reflexexample8.lxx
+			$(CXX) $(CXXFLAGS) -o $@ flexexample8.tab.cxx lex.yy.cpp $(LIBREFLEX)
+			./reflexexample8xx < flexexample8.test
+
+reflexexample9xx:	reflexexample9.lxx flexexample9.yxx
+			$(BISON) -d flexexample9.yxx
+			$(REFLEX) $(REFLAGS) --bison-cc --bison-locations --header-file reflexexample9.lxx
+			$(CXX) $(CXXFLAGS) -o $@ flexexample9.tab.cxx lex.yy.cpp $(LIBREFLEX)
+			./reflexexample9xx < flexexample9.test
+
 ctokens:	ctokens.l
 		$(REFLEX) $(REFLAGS) ctokens.l
 		$(CXX) $(CXXFLAGS) -o $@ lex.yy.cpp $(LIBREFLEX)
@@ -195,6 +290,6 @@ url:		url.cpp
 clean:
 		-rm -rf *.dSYM
 		-rm -f *.o *.gch *.log
-		-rm -f lex.yy.h lex.yy.cpp y.tab.h y.tab.c reflex.*.cpp reflex.*.gv reflex.*.txt
-		-rm -f flexexample? reflexexample?
+		-rm -f lex.yy.h lex.yy.cpp *.tab.h *.tab.c *.tab.hxx *.tab.cxx location.hh position.hh stack.hh reflex.*.cpp reflex.*.gv reflex.*.txt
+		-rm -f flexexample? reflexexample? flexexample?xx reflexexample?xx
 		-rm -f ctokens jtokens ptokens echo readline calc wc wcu wcpp wcwc tag tag_lazy tag_lazystates tag_unicode tag_tidy cow cows indent json braille unicode csv cards url
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 8d22c400f..073a65530 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,3 +1,16 @@
+# These examples require Bison or Yacc
+#
+# To quickly build the examples:
+# > make -f Make
+#
+# Or use configure and make to build:
+# > ./configure && make
+# > cd examples
+# > make
+#
+# To build examples3.0 requires Bison 3.0 or greater:
+# > make -f Make examples3.0
+
 REFLEX    = $(top_builddir)/src/reflex
 REFLAGS   =
 LIBREFLEX = $(top_builddir)/lib/libreflex.a
@@ -19,6 +32,8 @@ examples:	flexexample1 \
 		reflexexample4 \
 		reflexexample5 \
 		reflexexample6 \
+		reflexexample7 \
+		reflexexample8 \
 		ctokens \
 		jtokens \
 		ptokens \
@@ -112,6 +127,19 @@ reflexexample6:	reflexexample6.l
 		$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ lex.yy.cpp $(LIBREFLEX)
 		./reflexexample6 < reflexexample6.l
 
+reflexexample7:	reflexexample7.l flexexample7.y
+		$(YACC) -d flexexample7.y
+		$(REFLEX) $(REFLAGS) --bison-locations $<
+		$(CC) $(CPPFLAGS) $(CXXFLAGS) -c y.tab.c
+		$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ y.tab.o lex.yy.cpp $(LIBREFLEX)
+		./reflexexample7 < flexexample7.test
+
+reflexexample8:	reflexexample8.l flexexample8.y
+		$(YACC) -d flexexample8.y
+		$(REFLEX) $(REFLAGS) --bison-locations --bison-bridge --header-file $<
+		$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ y.tab.c lex.yy.cpp $(LIBREFLEX)
+		./reflexexample8 < flexexample8.test
+
 ctokens:	ctokens.l
 		$(REFLEX) $(REFLAGS) $<
 		$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ lex.yy.cpp $(LIBREFLEX)
@@ -214,6 +242,6 @@ url:		url.cpp
 clean-local:
 		-rm -rf *.dSYM
 		-rm -f *.o *.gch *.log
-		-rm -f lex.yy.h lex.yy.cpp y.tab.h y.tab.c reflex.*.cpp reflex.*.gv reflex.*.txt
+		-rm -f lex.yy.h lex.yy.cpp *.tab.h *.tab.c *.tab.hxx *.tab.cxx reflex.*.cpp reflex.*.gv reflex.*.txt
 		-rm -f flexexample? reflexexample?
 		-rm -f ctokens jtokens ptokens echo readline calc wc wcu wcpp wcwc tag tag_lazy tag_lazystates tag_unicode tag_tidy cow cows indent json csv braille unicode cards url
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 685e02275..bfc943d02 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -13,6 +13,19 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+
+# These examples require Bison or Yacc
+#
+# To quickly build the examples:
+# > make -f Make
+#
+# Or use configure and make to build:
+# > ./configure && make
+# > cd examples
+# > make
+#
+# To build examples3.0 requires Bison 3.0 or greater:
+# > make -f Make examples3.0
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
@@ -431,6 +444,8 @@ examples:	flexexample1 \
 		reflexexample4 \
 		reflexexample5 \
 		reflexexample6 \
+		reflexexample7 \
+		reflexexample8 \
 		ctokens \
 		jtokens \
 		ptokens \
@@ -524,6 +539,19 @@ reflexexample6:	reflexexample6.l
 		$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ lex.yy.cpp $(LIBREFLEX)
 		./reflexexample6 < reflexexample6.l
 
+reflexexample7:	reflexexample7.l flexexample7.y
+		$(YACC) -d flexexample7.y
+		$(REFLEX) $(REFLAGS) --bison-locations $<
+		$(CC) $(CPPFLAGS) $(CXXFLAGS) -c y.tab.c
+		$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ y.tab.o lex.yy.cpp $(LIBREFLEX)
+		./reflexexample7 < flexexample7.test
+
+reflexexample8:	reflexexample8.l flexexample8.y
+		$(YACC) -d flexexample8.y
+		$(REFLEX) $(REFLAGS) --bison-locations --bison-bridge --header-file $<
+		$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ y.tab.c lex.yy.cpp $(LIBREFLEX)
+		./reflexexample8 < flexexample8.test
+
 ctokens:	ctokens.l
 		$(REFLEX) $(REFLAGS) $<
 		$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ lex.yy.cpp $(LIBREFLEX)
@@ -626,7 +654,7 @@ url:		url.cpp
 clean-local:
 		-rm -rf *.dSYM
 		-rm -f *.o *.gch *.log
-		-rm -f lex.yy.h lex.yy.cpp y.tab.h y.tab.c reflex.*.cpp reflex.*.gv reflex.*.txt
+		-rm -f lex.yy.h lex.yy.cpp *.tab.h *.tab.c *.tab.hxx *.tab.cxx reflex.*.cpp reflex.*.gv reflex.*.txt
 		-rm -f flexexample? reflexexample?
 		-rm -f ctokens jtokens ptokens echo readline calc wc wcu wcpp wcwc tag tag_lazy tag_lazystates tag_unicode tag_tidy cow cows indent json csv braille unicode cards url
 
diff --git a/examples/README.md b/examples/README.md
index 185c08185..d83c1a0ae 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -9,12 +9,18 @@ Flex scanner examples
 - `jtokens.l` and `jdefs.l` a Java tokenizer, meets Java Lexical Structure requirements
 - `flexexample1.l` example taken from the Flex documentation
 - `flexexample2.l` example from <http://matt.might.net/articles/standalone-lexers-with-lex>
-- `flexexample3.l` example from the Flex documentation with bison
-- `flexexample4.l` example from the Flex documentation with bison-bridge
-- `flexexample5.l` example from the Flex documentation with bison-bridge
+- `flexexample3.l` example from the Flex documentation with C bison
+- `flexexample4.l` example from the Flex documentation with C bison-bridge
+- `flexexample5.l` example from the Flex documentation with C bison-bridge
 - `flexexample6.l` example reentrant scanner with state stacks
-- `flexexample7.l` example from the Flex documentation with bison-locations
-- `flexexample8.l` example from the Flex documentation with bison-bridge and bison-locations
+- `flexexample7.l` example from the Flex documentation with C bison-locations
+- `flexexample8.l` example from the Flex documentation with C bison-bridge and bison-locations
+- `flexexample3.lxx` example from the Flex documentation with C++ bison
+- `flexexample4.lxx` example from the Flex documentation with C++ bison-bridge
+- `flexexample5.lxx` example from the Flex documentation with C++ bison-bridge
+- `flexexample7.lxx` example from the Flex documentation with C++ bison-locations
+- `flexexample8.lxx` example from the Flex documentation with C++ bison-bridge and bison-locations
+- `flexexample9.lxx` example Bison 3.0 %skeleton "lalr1.cc" C++ parser with bison-cc and bison-locations
 - `wc.l` word count example
 - `wcu.l` word count example with Unicode matching (RE/flex only)
 - `wcpp.l` word count example with lexer class variables
@@ -34,10 +40,18 @@ RE/flex scanner examples
 - `indent.l` indentation detection and reformatting example
 - `braille.l` a braille translator, inspired by the re2c example but expanded
 - `unicode.l` a very simple Unicode word matcher to demonstrate Unicode matching
-- `reflexexample3.l` example RE/flex scanner adapted from the Flex documentation with bison
-- `reflexexample4.l` example RE/flex scanner adapted from the Flex documentation with bison-bridge
-- `reflexexample5.l` example RE/flex scanner adapted from the Flex documentation with bison-bridge
+- `reflexexample3.l` example RE/flex scanner adapted from the Flex documentation with C bison
+- `reflexexample4.l` example RE/flex scanner adapted from the Flex documentation with C bison-bridge
+- `reflexexample5.l` example RE/flex scanner adapted from the Flex documentation with C bison-bridge
 - `reflexexample6.l` example RE/flex reentrant scanner with state stacks
+- `reflexexample7.l` example RE/flex scanner adapted from the Flex documentation with C bison-locations
+- `reflexexample8.l` example RE/flex scanner adapted from the Flex documentation with C bison-bridge and bison-locations
+- `reflexexample3.lxx` example RE/flex scanner adapted from the Flex documentation with C++ bison
+- `reflexexample4.lxx` example RE/flex scanner adapted from the Flex documentation with C++ bison-bridge
+- `reflexexample5.lxx` example RE/flex scanner adapted from the Flex documentation with C++ bison-bridge
+- `reflexexample7.lxx` example RE/flex scanner adapted from the Flex documentation with C++ bison-locations
+- `reflexexample8.lxx` example RE/flex scanner adapted from the Flex documentation with C++ bison-bridge and bison-locations
+- `reflexexample9.lxx` example RE/flex scanner with Bison 3.0 %skeleton "lalr1.cc" C++ parser with bison-cc and bison-locations
 - `tag.l` simple lexer to print out all XML/HTML tags
 - `tag_lazy.l` simple lexer to print XML/HTML tags, uses lazy quants
 - `tag_lazystates.l` lexer to print XML tags, uses lazy quants and states
diff --git a/examples/build.sh b/examples/build.sh
index d40d240c8..a3913dc7d 100755
--- a/examples/build.sh
+++ b/examples/build.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 echo
-echo "Building the reflex examples"
+echo "Building the examples"
 make -f Make
 echo
 echo "OK"
diff --git a/examples/flexexample3.l b/examples/flexexample3.l
index 3e86c9e21..dfb03a52d 100644
--- a/examples/flexexample3.l
+++ b/examples/flexexample3.l
@@ -1,9 +1,10 @@
 /* Scanner for "C" assignment statements... sort of. */
 /* Compile: reflex --flex --bison flexexample3.l */
+/* Compile: bison -d -y flexexample3.y */
 
 %top{
 #include "y.tab.h"  /* Generated by bison. */
-#define YY_EXTERN_C extern "C" /* only needed for yylex C linkage when compiling y.tab.c in C */
+#define YY_EXTERN_C extern "C" /* this is needed for yylex C linkage when compiling y.tab.c in C */
 %}
 
 %option bison noyywrap
diff --git a/examples/flexexample3.lxx b/examples/flexexample3.lxx
new file mode 100644
index 000000000..22df2d9ef
--- /dev/null
+++ b/examples/flexexample3.lxx
@@ -0,0 +1,18 @@
+/* Scanner for "C" assignment statements... sort of. */
+/* Compile: reflex --flex --bison flexexample3.lxx */
+/* Compile: bison -d -y flexexample3.yxx */
+
+%top{
+#include "flexexample3.tab.hxx"  /* Generated by bison. */
+%}
+
+%option bison noyywrap
+
+%%
+
+[[:digit:]]+  { yylval.num = atoi(yytext);   return NUMBER; }
+[[:alnum:]]+  { yylval.str = strdup(yytext); return STRING; }
+"="|";"       { return yytext[0]; }
+.|\n          {}
+
+%%
diff --git a/examples/flexexample3.y b/examples/flexexample3.y
index 244bb964c..cc835690c 100644
--- a/examples/flexexample3.y
+++ b/examples/flexexample3.y
@@ -1,4 +1,4 @@
-/* Parser to convert "C" assignments to lisp. */
+/* Parser to convert "C" assignments to lisp using Bison in C. */
 /* Compile: bison -d -y flexexample3.y */
 
 %{
@@ -11,8 +11,8 @@ void yyerror(const char*);
 %}
 
 %union {
-    int num;
-    char* str;
+    int   num;
+    char *str;
 }
 
 %token <str> STRING
diff --git a/examples/flexexample3.yxx b/examples/flexexample3.yxx
new file mode 100644
index 000000000..76b6373a0
--- /dev/null
+++ b/examples/flexexample3.yxx
@@ -0,0 +1,40 @@
+/* Parser to convert "C" assignments to lisp using Bison in C++. */
+/* Compile: bison -d -y flexexample3.y */
+
+%{
+#include <iostream>
+extern int yylex(void);
+extern char *yytext;
+extern int yyleng;
+extern int yylineno;
+void yyerror(const char*);
+%}
+
+%union {
+    int   num;
+    char *str;
+}
+
+%token <str> STRING
+%token <num> NUMBER
+
+%%
+
+assignments : assignment
+            | assignment assignments
+            ;
+assignment  : STRING '=' NUMBER ';' { std::cout << "(setf " << $1 << " " << $3 << ")\n"; }
+            ;
+
+%%
+
+int main()
+{
+  yyparse();
+  return 0;
+}
+
+void yyerror(const char *msg)
+{
+  std::cerr << msg << " at line " << yylineno << std::endl;
+}
diff --git a/examples/flexexample4.l b/examples/flexexample4.l
index a76d85b42..4e31c21e2 100644
--- a/examples/flexexample4.l
+++ b/examples/flexexample4.l
@@ -1,5 +1,6 @@
 /* Scanner for "C" assignment statements... sort of. */
 /* Compile: reflex --flex --bison-bridge --header-file flexexample4.l */
+/* Compile: bison -d -y flexexample4.y */
 /* Example taken from Flex documentation A.2 */
 /* Bison bridge passes yylval to yylex (which limits yylval's scope to the rule actions) */
 /* Note: yylval is no longer a pointer with reflex */
diff --git a/examples/flexexample4.lxx b/examples/flexexample4.lxx
new file mode 100644
index 000000000..fb43a665f
--- /dev/null
+++ b/examples/flexexample4.lxx
@@ -0,0 +1,21 @@
+/* Scanner for "C" assignment statements... sort of. */
+/* Compile: reflex --flex --bison-bridge --header-file flexexample4.lxx */
+/* Compile: bison -d -y flexexample4.yxx */
+/* Example taken from Flex documentation A.2 */
+/* Bison bridge passes yylval to yylex (which limits yylval's scope to the rule actions) */
+/* Note: yylval is no longer a pointer with reflex */
+
+%top{
+#include "flexexample4.tab.hxx"  /* Generated by bison. */
+%}
+
+%option bison-bridge noyywrap
+
+%%
+
+[[:digit:]]+  { yylval.num = atoi(yytext);   return NUMBER; }
+[[:alnum:]]+  { yylval.str = strdup(yytext); return STRING; }
+"="|";"       { return yytext[0]; }
+.|\n          {}
+
+%%
diff --git a/examples/flexexample4.y b/examples/flexexample4.y
index 45cc4460f..c5b78c44c 100644
--- a/examples/flexexample4.y
+++ b/examples/flexexample4.y
@@ -1,4 +1,4 @@
-/* Parser to convert "C" assignments to lisp. */
+/* Parser to convert "C" assignments to lisp using Bison in C. */
 /* Demonstrates bison pure parsers */
 /* Compile: bison -d -y flexexample4.y */
 
@@ -15,8 +15,8 @@ void yyerror(yyscan_t, const char*);
 %parse-param { void *scanner }
 
 %union {
-    int num;
-    char* str;
+    int   num;
+    char *str;
 }
 
 %token <str> STRING
diff --git a/examples/flexexample4.yxx b/examples/flexexample4.yxx
new file mode 100644
index 000000000..938462c68
--- /dev/null
+++ b/examples/flexexample4.yxx
@@ -0,0 +1,53 @@
+/* Parser to convert "C" assignments to lisp using Bison in C++. */
+/* Demonstrates bison pure parsers */
+/* Compile: bison -d flexexample4.yxx */
+
+%{
+#include "lex.yy.h"  /* Generated by reflex: scanner_t, yyscan_t, yylex_init, yylex_destroy */
+void yyerror(yyscan_t, const char*);
+/* Pass the parameter 'scanner' to yyparse through to yylex. */
+#define YYPARSE_PARAM scanner
+#define YYLEX_PARAM   scanner
+%}
+
+%pure-parser
+%lex-param { void *scanner }
+%parse-param { void *scanner }
+
+%union {
+    int   num;
+    char *str;
+}
+
+%token <str> STRING
+%token <num> NUMBER
+
+%%
+
+assignments : assignment
+            | assignment assignments
+            ;
+assignment  : STRING '=' NUMBER ';' { std::cout << "(setf " << $1 << " " << $3 << ")\n"; }
+            ;
+
+%%
+
+int main()
+{
+#if WITH_NO_C
+  yyscanner_t scanner;	// new way in C++ using reflex-generated yyscanner_t
+  yyparse(&scanner);	// scanner is passed on to yylex()
+#else
+  yyscan_t scanner;	/* the old way in C */
+  yylex_init(&scanner);
+  yyparse(scanner);	/* scanner is passed on to yylex() */
+  yylex_destroy(scanner);
+#endif
+  return 0;
+}
+
+void yyerror(yyscan_t scanner, const char *msg)
+{
+  (void)scanner; /* appease -Wall -Werror */
+  std::cerr << msg << std::endl; /* how to use yylineno with bison-bridge? See flexexample5.yxx */
+}
diff --git a/examples/flexexample5.l b/examples/flexexample5.l
index f8fe73bed..d1df02cfb 100644
--- a/examples/flexexample5.l
+++ b/examples/flexexample5.l
@@ -1,5 +1,6 @@
 /* Scanner for "C" assignment statements... sort of. */
 /* Compile: reflex --flex --bison-bridge --header-file flexexample5.l */
+/* Compile: bison -d -y flexexample5.y */
 /* Example taken from Flex documentation A.2 */
 /* Bison bridge passes yylval to yylex (which limits yylval's scope to the rule actions) */
 /* Note: yylval is a reference, no longer a pointer with reflex */
diff --git a/examples/flexexample5.lxx b/examples/flexexample5.lxx
new file mode 100644
index 000000000..f520a6886
--- /dev/null
+++ b/examples/flexexample5.lxx
@@ -0,0 +1,21 @@
+/* Scanner for "C" assignment statements... sort of. */
+/* Compile: reflex --flex --bison-bridge --header-file flexexample5.lxx */
+/* Compile: bison -d flexexample5.yxx */
+/* Example taken from Flex documentation A.2 */
+/* Bison bridge passes yylval to yylex (which limits yylval's scope to the rule actions) */
+/* Note: yylval is a reference, no longer a pointer with reflex */
+
+%top{
+#include "flexexample5.tab.hxx"  /* Generated by bison. */
+%}
+
+%option bison-bridge noyywrap
+
+%%
+
+[[:digit:]]+  { yylval.num = atoi(yytext);   return NUMBER; }
+[[:alnum:]]+  { yylval.str = strdup(yytext); return STRING; }
+"="|";"       { return yytext[0]; }
+.|\n          {}
+
+%%
diff --git a/examples/flexexample5.y b/examples/flexexample5.y
index 50d1cc46f..06d4a44d6 100644
--- a/examples/flexexample5.y
+++ b/examples/flexexample5.y
@@ -1,4 +1,4 @@
-/* Parser to convert "C" assignments to lisp. */
+/* Parser to convert "C" assignments to lisp using Bison in C. */
 /* Demonstrates bison pure parser with parameters passed to yyparse and to yylex */
 /* Compile: bison -d -y flexexample5.y */
 
@@ -22,8 +22,8 @@ void yyerror(struct pass_through *param, const char *msg); /* yyerror accepts `p
 %parse-param { struct pass_through *params }
 
 %union {
-    int num;
-    char* str;
+    int   num;
+    char *str;
 }
 
 %token <str> STRING
diff --git a/examples/flexexample5.yxx b/examples/flexexample5.yxx
new file mode 100644
index 000000000..d06e7fa5e
--- /dev/null
+++ b/examples/flexexample5.yxx
@@ -0,0 +1,56 @@
+/* Parser to convert "C" assignments to lisp using Bison in C++. */
+/* Demonstrates bison pure parser with parameters passed to yyparse and to yylex */
+/* Compile: bison -d flexexample5.yxx */
+
+%{
+#include "lex.yy.h"  /* Generated by reflex: scanner_t, yyscan_t, yylex_init, yylex_destroy */
+/* %pure-parser requires us to pass the argument 'params->scanner' from yyparse through to yylex. */
+#define YYLEX_PARAM params->scanner
+/* Pass argument `struct pass_through *param` with scanner object and other data */
+struct pass_through {
+  yyscanner_t *scanner;
+  int count;
+};
+void yyerror(struct pass_through *param, const char *msg); /* yyerror accepts `params` */
+%}
+
+/* pure-parser adds yylval parameter to yylex() */
+%pure-parser
+/* Add params->scanner parameter to yylex() with a trick: use YYLEX_PARAM */
+%lex-param { void *YYLEX_PARAM }
+/* Add pass-through parameter to yyparse() */
+%parse-param { struct pass_through *params }
+
+%union {
+    int   num;
+    char *str;
+}
+
+%token <str> STRING
+%token <num> NUMBER
+
+%%
+
+assignments : assignment
+            | assignment assignments
+            ;
+assignment  : STRING '=' NUMBER ';' { std::cout << "(setf " << $1 << " " << $3 << ")\n"; ++params->count; }
+            ;
+
+%%
+
+int main()
+{
+  struct pass_through params;
+  yyscanner_t scanner;	// new way in C++ using reflex-generated yyscanner_t
+  params.scanner = &scanner;
+  params.count = 0;
+  yyparse(&params);	// %parse-param, we pass params->scanner on to yylex()
+  std::cout << "# assignments = " << params.count << std::endl;
+  return 0;
+}
+
+void yyerror(struct pass_through *params, const char*)
+{
+  std::cerr << "syntax error at " << params->scanner->matcher().lineno() << std::endl;
+}
diff --git a/examples/flexexample7.l b/examples/flexexample7.l
index 2a482a412..76ff19a05 100644
--- a/examples/flexexample7.l
+++ b/examples/flexexample7.l
@@ -1,9 +1,10 @@
 /* Scanner for "C" assignment statements... sort of. */
 /* Compile: reflex --flex --bison-locations flexexample7.l */
+/* Compile: bison -d -y flexexample7.y */
 
 %top{
 #include "y.tab.h"  /* Generated by bison. */
-#define YY_EXTERN_C extern "C" /* only needed for yylex C linkage when compiling y.tab.c in C */
+#define YY_EXTERN_C extern "C" /* this is needed for yylex C linkage when compiling y.tab.c in C */
 %}
 
 %option bison-locations noyywrap
diff --git a/examples/flexexample7.lxx b/examples/flexexample7.lxx
new file mode 100644
index 000000000..de5acecb8
--- /dev/null
+++ b/examples/flexexample7.lxx
@@ -0,0 +1,18 @@
+/* Scanner for "C" assignment statements... sort of. */
+/* Compile: reflex --flex --bison-locations flexexample7.lxx */
+/* Compile: bison -d flexexample7.yxx */
+
+%top{
+#include "flexexample7.tab.hxx"  /* Generated by bison. */
+%}
+
+%option bison-locations noyywrap
+
+%%
+
+[[:digit:]]+  { yylval.num = atoi(yytext);   return NUMBER; }
+[[:alnum:]]+  { yylval.str = strdup(yytext); return STRING; }
+"="|";"       { return yytext[0]; }
+.|\n          {}
+
+%%
diff --git a/examples/flexexample7.y b/examples/flexexample7.y
index 08f294bcc..c6d21c449 100644
--- a/examples/flexexample7.y
+++ b/examples/flexexample7.y
@@ -1,4 +1,4 @@
-/* Parser to convert "C" assignments to lisp. */
+/* Parser to convert "C" assignments to lisp using Bison in C. */
 /* Demonstrates bison locations with yylex() taking yylval and yylloc (reflex option bison-locations) */
 /* Compile: bison -d -y flexexample7.y */
 
@@ -10,8 +10,8 @@ void yyerror(const char*);
 %locations
 
 %union {
-    int num;
-    char* str;
+    int   num;
+    char *str;
 }
 
 %{
diff --git a/examples/flexexample7.yxx b/examples/flexexample7.yxx
new file mode 100644
index 000000000..ff15eef1d
--- /dev/null
+++ b/examples/flexexample7.yxx
@@ -0,0 +1,48 @@
+/* Parser to convert "C" assignments to lisp using Bison in C++. */
+/* Demonstrates bison locations with yylex() taking yylval and yylloc (reflex option bison-locations) */
+/* Compile: bison -d flexexample7.yxx */
+
+%{
+#include <iostream>
+void yyerror(const char*);
+%}
+
+%locations
+
+%union {
+    int   num;
+    char *str;
+}
+
+%{
+/* Patches old bison versions that don't produce correct YYLEX */
+extern int yylex(YYSTYPE*, YYLTYPE*);
+#define YYLEX_PARAM &yylval, &yylloc
+%}
+
+/* Add &yylval and &yyloc parameters to yylex() with a trick: use YYLEX_PARAM */
+%lex-param { void *YYLEX_PARAM }
+
+%token <str> STRING
+%token <num> NUMBER
+
+%%
+
+assignments : assignment
+            | assignment assignments
+            ;
+assignment  : STRING '=' NUMBER ';' { std::cout << "(setf " << $1 << " " << $3 << ")\n"; }
+            ;
+
+%%
+
+int main()
+{
+  yyparse();
+  return 0;
+}
+
+void yyerror(const char *msg)
+{
+  std::cerr << msg << " at (" << yylloc.first_line << "," << yylloc.first_column << ") to (" << yylloc.last_line << "," << yylloc.last_column << ")" << std::endl;
+}
diff --git a/examples/flexexample8.l b/examples/flexexample8.l
index e6a0e4100..689454bdb 100644
--- a/examples/flexexample8.l
+++ b/examples/flexexample8.l
@@ -1,5 +1,6 @@
 /* Scanner for "C" assignment statements... sort of. */
 /* Compile: reflex --flex --bison-locations --bison-bridge --header-file flexexample8.l */
+/* Compile: bison -d -y flexexample8.y */
 /* Example taken from Flex documentation A.2 */
 /* Bison bridge passes yylval to yylex (which limits yylval's scope to the rule actions) */
 /* Note: yylval is no longer a pointer with reflex */
diff --git a/examples/flexexample8.lxx b/examples/flexexample8.lxx
new file mode 100644
index 000000000..d12cbc32c
--- /dev/null
+++ b/examples/flexexample8.lxx
@@ -0,0 +1,21 @@
+/* Scanner for "C" assignment statements... sort of. */
+/* Compile: reflex --flex --bison-locations --bison-bridge --header-file flexexample8.lxx */
+/* Compile: bison -d flexexample8.yxx */
+/* Example taken from Flex documentation A.2 */
+/* Bison bridge passes yylval to yylex (which limits yylval's scope to the rule actions) */
+/* Note: yylval is no longer a pointer with reflex */
+
+%top{
+#include "flexexample8.tab.hxx"  /* Generated by bison. */
+%}
+
+%option bison-locations bison-bridge noyywrap
+
+%%
+
+[[:digit:]]+  { yylval.num = atoi(yytext);   return NUMBER; }
+[[:alnum:]]+  { yylval.str = strdup(yytext); return STRING; }
+"="|";"       { return yytext[0]; }
+.|\n          {}
+
+%%
diff --git a/examples/flexexample8.y b/examples/flexexample8.y
index 10efcaf82..09c62579d 100644
--- a/examples/flexexample8.y
+++ b/examples/flexexample8.y
@@ -1,4 +1,4 @@
-/* Parser to convert "C" assignments to lisp. */
+/* Parser to convert "C" assignments to lisp using Bison in C. */
 /* Compile: bison -d -y flexexample8.y */
 
 %{
@@ -16,8 +16,8 @@ void yyerror(YYLTYPE*, yyscan_t, const char*);
 %parse-param { void *scanner }
 
 %union {
-    int num;
-    char* str;
+    int   num;
+    char *str;
 }
 
 %token <str> STRING
diff --git a/examples/flexexample8.yxx b/examples/flexexample8.yxx
new file mode 100644
index 000000000..d1d64acda
--- /dev/null
+++ b/examples/flexexample8.yxx
@@ -0,0 +1,47 @@
+/* Parser to convert "C" assignments to lisp using Bison in C. */
+/* Compile: bison -d flexexample8.yxx */
+
+%{
+#include "lex.yy.h"  /* Generated by reflex: scanner_t, yyscan_t, yylex_init, yylex_destroy */
+extern int yylex(YYSTYPE*, YYLTYPE*, yyscan_t);
+void yyerror(YYLTYPE*, yyscan_t, const char*);
+/* Pass the parameter 'scanner' to yyparse through to yylex. */
+#define YYPARSE_PARAM scanner
+#define YYLEX_PARAM   scanner
+%}
+
+%locations
+%pure-parser
+%lex-param { void *scanner }
+%parse-param { void *scanner }
+
+%union {
+    int   num;
+    char *str;
+}
+
+%token <str> STRING
+%token <num> NUMBER
+
+%%
+
+assignments : assignment
+            | assignment assignments
+            ;
+assignment  : STRING '=' NUMBER ';' { std::cout << "(setf " << $1 << " " << $3 << ")\n"; }
+            ;
+
+%%
+
+int main()
+{
+  yyscanner_t scanner;	// new way in C++ using reflex-generated yyscanner_t
+  yyparse(&scanner);	// scanner is passed on to yylex()
+  return 0;
+}
+
+void yyerror(YYLTYPE *yylloc, yyscan_t scanner, const char *msg)
+{
+  (void)scanner; // appease -Wall -Werror
+  std::cerr << msg << " at " << yylloc->first_line << "," << yylloc->first_column << std::endl;
+}
diff --git a/examples/flexexample9.lxx b/examples/flexexample9.lxx
new file mode 100644
index 000000000..435dbda67
--- /dev/null
+++ b/examples/flexexample9.lxx
@@ -0,0 +1,19 @@
+/* Scanner for "C" assignment statements... sort of. */
+/* Compile: reflex --flex --bison-cc --bison-locations --header-file flexexample9.lxx */
+/* Compile: bison -d flexexample9.yxx */
+
+%top{
+#include "flexexample9.tab.hxx"  /* Generated by bison. */
+%}
+
+%option bison-cc bison-locations noyywrap
+%option namespace=yy lexer=Lexer
+
+%%
+
+[[:digit:]]+  { yylval.num = atoi(yytext);   return yy::parser::token::NUMBER; }
+[[:alnum:]]+  { yylval.str = strdup(yytext); return yy::parser::token::STRING; }
+"="|";"       { return yytext[0]; }
+.|\n          {}
+
+%%
diff --git a/examples/flexexample9.test b/examples/flexexample9.test
new file mode 100644
index 000000000..05b0e9552
--- /dev/null
+++ b/examples/flexexample9.test
@@ -0,0 +1,2 @@
+foo = 123;
+bar = 456;
diff --git a/examples/flexexample9.yxx b/examples/flexexample9.yxx
new file mode 100644
index 000000000..7881a0fc9
--- /dev/null
+++ b/examples/flexexample9.yxx
@@ -0,0 +1,64 @@
+/* Parser to convert "C" assignments to lisp using Bison in C. */
+/* Demonstrates Bison C++ interface with %skeleton "lalr1.cc" */
+/* Compile: bison -d flexexample9.yxx */
+
+%skeleton "lalr1.cc"
+%require  "3.0"
+
+%code requires{
+  namespace yy {
+    class Lexer;  /* Generated by reflex with namespace=yy lexer=Lexer */
+  }
+  class Driver;   /* Defined below */
+}
+
+%locations
+
+%parse-param { yy::Lexer& lexer }  /* Construct parser object with lexer */
+%parse-param { Driver& driver }    /* Construct parser object with driver (optional) */
+
+%code{
+  #include "lex.yy.h"
+
+  #undef yylex
+  #define yylex lexer.yylex  /* Within bison's parse() we should invoke lexer.yylex(), not the global yylex() */
+
+  class Driver {
+   public:
+    Driver(reflex::Input in) : lexer(in), parser(new yy::parser(lexer, *this)) { }
+    ~Driver() { delete parser; }
+    int parse() { return parser->parse(); }
+   private:
+    yy::Lexer   lexer;
+    yy::parser *parser;
+  };
+}
+
+%union {
+    int   num;
+    char *str;
+}
+
+%token <str> STRING
+%token <num> NUMBER
+
+%%
+
+assignments : assignment
+            | assignment assignments
+            ;
+assignment  : STRING '=' NUMBER ';' { std::cout << "(setf " << $1 << " " << $3 << ")\n"; }
+            ;
+
+%%
+
+int main()
+{
+  Driver driver(std::cin);
+  return driver.parse();
+}
+
+void yy::parser::error(const location_type& loc, const std::string& msg)
+{
+  std::cerr << msg << " at " << loc << std::endl;
+}
diff --git a/examples/reflexexample3.l b/examples/reflexexample3.l
index 51f805bbf..e62d10e11 100644
--- a/examples/reflexexample3.l
+++ b/examples/reflexexample3.l
@@ -1,11 +1,12 @@
 /* Scanner for "C" assignment statements... sort of. */
 /* Compile: reflex --bison reflexexample3.l */
+/* Compile: bison -d -y reflexexample3.y */
 
 %{
 #include "y.tab.h"  /* Generated by bison. */
 %}
 
-%option bison
+%option bison noyywrap
 
 %%
 
diff --git a/examples/reflexexample3.lxx b/examples/reflexexample3.lxx
new file mode 100644
index 000000000..188ebe954
--- /dev/null
+++ b/examples/reflexexample3.lxx
@@ -0,0 +1,18 @@
+/* Scanner for "C" assignment statements... sort of. */
+/* Compile: reflex --bison reflexexample3.lxx */
+/* Compile: bison -d flexexample3.yxx */
+
+%{
+#include "reflexexample3.tab.hxx"  /* Generated by bison. */
+%}
+
+%option bison noyywrap
+
+%%
+
+[[:digit:]]+  { yylval.num = atoi(text());   return NUMBER; }
+[[:alnum:]]+  { yylval.str = strdup(text()); return STRING; }
+"="|";"       { return text()[0]; }
+.|\n          {}
+
+%%
diff --git a/examples/reflexexample3.y b/examples/reflexexample3.y
index 03e81ec25..1bbfd2f6a 100644
--- a/examples/reflexexample3.y
+++ b/examples/reflexexample3.y
@@ -1,4 +1,4 @@
-/* Parser to convert "C" assignments to lisp. */
+/* Parser to convert "C" assignments to lisp using Bison in C. */
 /* Compile: bison -d -y reflexexample3.y */
 
 %{
@@ -8,8 +8,8 @@ void yyerror(const char*);
 %}
 
 %union {
-    int num;
-    char* str;
+    int   num;
+    char *str;
 }
 
 %token <str> STRING
diff --git a/examples/reflexexample3.yxx b/examples/reflexexample3.yxx
new file mode 100644
index 000000000..4e8c4811d
--- /dev/null
+++ b/examples/reflexexample3.yxx
@@ -0,0 +1,37 @@
+/* Parser to convert "C" assignments to lisp using Bison in C++. */
+/* Compile: bison -d reflexexample3.yxx */
+
+%{
+#include <iostream>
+#include "lex.yy.h"
+void yyerror(const char*);
+%}
+
+%union {
+    int   num;
+    char *str;
+}
+
+%token <str> STRING
+%token <num> NUMBER
+
+%%
+
+assignments : assignment
+            | assignment assignments
+            ;
+assignment  : STRING '=' NUMBER ';' { std::cout << "(setf " << $1 << " " << $3 << ")\n"; }
+            ;
+
+%%
+
+int main()
+{
+  yyparse();
+  return 0;
+}
+
+void yyerror(const char *msg)
+{
+  std::cerr << msg << " at line " << YY_SCANNER.matcher().lineno() << std::endl; /* reflex-generated global `YY_SCANNER` */
+}
diff --git a/examples/reflexexample4.l b/examples/reflexexample4.l
index 33ccb8b3d..cec18f4df 100644
--- a/examples/reflexexample4.l
+++ b/examples/reflexexample4.l
@@ -1,6 +1,6 @@
 /* Scanner for "C" assignment statements... sort of. */
 /* Compile: reflex --bison-bridge --header-file reflexexample4.l */
-/*          bison -d -y flexexample4.y */
+/* compile: bison -d -y flexexample4.y */
 /* Example taken from Flex documentation A.2 */
 /* Bison bridge passes yylval to yylex (which limits yylval's scope to the rule actions) */
 /* Note: yylval is a reference, no longer a pointer with reflex */
diff --git a/examples/reflexexample4.lxx b/examples/reflexexample4.lxx
new file mode 100644
index 000000000..648e9afdd
--- /dev/null
+++ b/examples/reflexexample4.lxx
@@ -0,0 +1,21 @@
+/* Scanner for "C" assignment statements... sort of. */
+/* Compile: reflex --bison-bridge --header-file reflexexample4.lxx */
+/* Compile: bison -d flexexample4.yxx */
+/* Example taken from Flex documentation A.2 */
+/* Bison bridge passes yylval to yylex (which limits yylval's scope to the rule actions) */
+/* Note: yylval is a reference, no longer a pointer with reflex */
+
+%top{
+#include "flexexample4.tab.hxx"  /* Generated by bison. */
+%}
+
+%option bison-bridge
+
+%%
+
+[[:digit:]]+  { yylval.num = atoi(text());   return NUMBER; }
+[[:alnum:]]+  { yylval.str = strdup(text()); return STRING; }
+"="|";"       { return text()[0]; }
+.|\n          {}
+
+%%
diff --git a/examples/reflexexample5.l b/examples/reflexexample5.l
index 7baab061e..5f13b0fea 100644
--- a/examples/reflexexample5.l
+++ b/examples/reflexexample5.l
@@ -1,6 +1,6 @@
 /* Scanner for "C" assignment statements... sort of. */
 /* Compile: reflex --bison-bridge --header-file reflexexample5.l */
-/*          bison -d -y flexexample5.y */
+/* Compile: bison -d -y flexexample5.y */
 /* Example taken from Flex documentation A.2 */
 /* Bison bridge passes yylval to yylex (which limits yylval's scope to the rule actions) */
 /* Note: yylval is a reference, no longer a pointer with reflex */
diff --git a/examples/reflexexample5.lxx b/examples/reflexexample5.lxx
new file mode 100644
index 000000000..abb295ead
--- /dev/null
+++ b/examples/reflexexample5.lxx
@@ -0,0 +1,21 @@
+/* Scanner for "C" assignment statements... sort of. */
+/* Compile: reflex --bison-bridge --header-file reflexexample5.lxx */
+/* Compile: bison -d flexexample5.yxx */
+/* Example taken from Flex documentation A.2 */
+/* Bison bridge passes yylval to yylex (which limits yylval's scope to the rule actions) */
+/* Note: yylval is a reference, no longer a pointer with reflex */
+
+%top{
+#include "flexexample5.tab.hxx"  /* Generated by bison. */
+%}
+
+%option bison-bridge
+
+%%
+
+[[:digit:]]+  { yylval.num = atoi(text());   return NUMBER; }
+[[:alnum:]]+  { yylval.str = strdup(text()); return STRING; }
+"="|";"       { return text()[0]; }
+.|\n          {}
+
+%%
diff --git a/examples/reflexexample7.l b/examples/reflexexample7.l
new file mode 100644
index 000000000..122c501ca
--- /dev/null
+++ b/examples/reflexexample7.l
@@ -0,0 +1,19 @@
+/* Scanner for "C" assignment statements... sort of. */
+/* Compile: reflex --bison-locations reflexexample7.l */
+/* Compile: bison -d -y flexexample7.y */
+
+%top{
+#include "y.tab.h"  /* Generated by bison. */
+#define YY_EXTERN_C extern "C" /* this is needed for yylex C linkage when compiling y.tab.c in C */
+%}
+
+%option bison-locations noyywrap
+
+%%
+
+[[:digit:]]+  { yylval.num = atoi(text());   return NUMBER; }
+[[:alnum:]]+  { yylval.str = strdup(text()); return STRING; }
+"="|";"       { return text()[0]; }
+.|\n          {}
+
+%%
diff --git a/examples/reflexexample7.lxx b/examples/reflexexample7.lxx
new file mode 100644
index 000000000..fe569d9e6
--- /dev/null
+++ b/examples/reflexexample7.lxx
@@ -0,0 +1,18 @@
+/* Scanner for "C" assignment statements... sort of. */
+/* Compile: reflex --bison-locations reflexexample7.lxx */
+/* Compile: bison -d flexexample7.yxx */
+
+%top{
+#include "flexexample7.tab.hxx"  /* Generated by bison. */
+%}
+
+%option bison-locations noyywrap
+
+%%
+
+[[:digit:]]+  { yylval.num = atoi(text());   return NUMBER; }
+[[:alnum:]]+  { yylval.str = strdup(text()); return STRING; }
+"="|";"       { return text()[0]; }
+.|\n          {}
+
+%%
diff --git a/examples/reflexexample8.l b/examples/reflexexample8.l
new file mode 100644
index 000000000..7bd763506
--- /dev/null
+++ b/examples/reflexexample8.l
@@ -0,0 +1,21 @@
+/* Scanner for "C" assignment statements... sort of. */
+/* Compile: reflex --bison-locations --bison-bridge --header-file reflexexample8.l */
+/* Compile: bison -d -y flexexample8.y */
+/* Example taken from Flex documentation A.2 */
+/* Bison bridge passes yylval to yylex (which limits yylval's scope to the rule actions) */
+/* Note: yylval is no longer a pointer with reflex */
+
+%top{
+#include "y.tab.h"  /* Generated by bison. */
+%}
+
+%option bison-locations bison-bridge noyywrap
+
+%%
+
+[[:digit:]]+  { yylval.num = atoi(text());   return NUMBER; }
+[[:alnum:]]+  { yylval.str = strdup(text()); return STRING; }
+"="|";"       { return text()[0]; }
+.|\n          {}
+
+%%
diff --git a/examples/reflexexample8.lxx b/examples/reflexexample8.lxx
new file mode 100644
index 000000000..0a4b75560
--- /dev/null
+++ b/examples/reflexexample8.lxx
@@ -0,0 +1,21 @@
+/* Scanner for "C" assignment statements... sort of. */
+/* Compile: reflex --bison-locations --bison-bridge --header-file reflexexample8.lxx */
+/* Compile: bison -d flexexample8.yxx */
+/* Example taken from Flex documentation A.2 */
+/* Bison bridge passes yylval to yylex (which limits yylval's scope to the rule actions) */
+/* Note: yylval is no longer a pointer with reflex */
+
+%top{
+#include "flexexample8.tab.hxx"  /* Generated by bison. */
+%}
+
+%option bison-locations bison-bridge noyywrap
+
+%%
+
+[[:digit:]]+  { yylval.num = atoi(text());   return NUMBER; }
+[[:alnum:]]+  { yylval.str = strdup(text()); return STRING; }
+"="|";"       { return text()[0]; }
+.|\n          {}
+
+%%
diff --git a/examples/reflexexample9.lxx b/examples/reflexexample9.lxx
new file mode 100644
index 000000000..44a137298
--- /dev/null
+++ b/examples/reflexexample9.lxx
@@ -0,0 +1,19 @@
+/* Scanner for "C" assignment statements... sort of. */
+/* Compile: reflex --bison-cc --bison-locations --header-file reflexexample9.lxx */
+/* Compile: bison -d flexexample9.yxx */
+
+%top{
+#include "flexexample9.tab.hxx"  /* Generated by bison. */
+%}
+
+%option bison-cc bison-locations noyywrap
+%option namespace=yy lexer=Lexer lex=yylex
+
+%%
+
+[[:digit:]]+  { yylval.num = atoi(text());   return yy::parser::token::NUMBER; }
+[[:alnum:]]+  { yylval.str = strdup(text()); return yy::parser::token::STRING; }
+"="|";"       { return text()[0]; }
+.|\n          {}
+
+%%
diff --git a/include/reflex/flexlexer.h b/include/reflex/flexlexer.h
index df5ef28f5..5246dc98d 100644
--- a/include/reflex/flexlexer.h
+++ b/include/reflex/flexlexer.h
@@ -67,7 +67,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 /// Flex and Bison-compatible `%%option bison` generates a global `YY_SCANNER` scanner object, otherwise we use *this.
-#if defined(REFLEX_OPTION_reentrant) || defined(REFLEX_OPTION_bison_bridge) || (!defined(REFLEX_OPTION_bison) && !defined(REFLEX_OPTION_bison_locations) && !defined(YY_SCANNER))
+#if defined(REFLEX_OPTION_reentrant) || defined(REFLEX_OPTION_bison_cc) || defined(REFLEX_OPTION_bison_bridge) || (!defined(REFLEX_OPTION_bison) && !defined(REFLEX_OPTION_bison_locations) && !defined(YY_SCANNER))
 #define YY_SCANNER             (*this)
 #endif
 
diff --git a/src/reflex.cpp b/src/reflex.cpp
index e2acc21c1..196f4b703 100644
--- a/src/reflex.cpp
+++ b/src/reflex.cpp
@@ -54,6 +54,7 @@ static const char *options_table[] = {
   "batch",
   "bison",
   "bison_bridge",
+  "bison_cc",
   "bison_locations",
   "case_insensitive",
   "class",
@@ -541,6 +542,8 @@ void Reflex::help(const char *message, const char *arg)
                 initialize input to std::cin instead of stdin\n\
         --bison\n\
                 generate global yylex() scanner for bison\n\
+        --bison-cc\n\
+                generate bison C++ interface code for bison lalr1.cc skeleton\n\
         --bison-bridge\n\
                 generate reentrant yylex() scanner for bison pure parser\n\
         --bison-locations\n\
@@ -1469,6 +1472,8 @@ void Reflex::write()
       options["header_file"] = std::string("lex.").append(options["prefix"]).append(".h");
   }
   std::ofstream ofs;
+  std::string yystype = options["bison_cc"].empty() ? "YYSTYPE" : "yy::parser::semantic_type";
+  std::string yyltype = options["bison_cc"].empty() ? "YYLTYPE" : "yy::location";
   if (options["stdout"].empty())
   {
     if (options["outfile"].empty())
@@ -1554,7 +1559,11 @@ void Reflex::write()
     write_prelude();
     write_section_top();
     write_class();
-    if (!options["reentrant"].empty() || !options["bison_bridge"].empty())
+    if (!options["bison_cc"].empty())
+    {
+      write_banner("BISON C++");
+    }
+    else if (!options["reentrant"].empty() || !options["bison_bridge"].empty())
     {
       if (!options["bison_locations"].empty())
         write_banner("BISON BRIDGE LOCATIONS");
@@ -1578,9 +1587,9 @@ void Reflex::write()
         "#define YY_EXTERN_C\n"
         "#endif\n\n";
       if (!options["bison_locations"].empty())
-        *out << "YY_EXTERN_C int yylex(YYSTYPE*, YYLTYPE*, yyscan_t);\n";
+        *out << "YY_EXTERN_C int yylex(" << yystype << "*, " << yyltype << "*, yyscan_t);\n";
       else if (!options["bison_bridge"].empty())
-        *out << "YY_EXTERN_C int yylex(YYSTYPE*, yyscan_t);\n";
+        *out << "YY_EXTERN_C int yylex(" << yystype << "*, yyscan_t);\n";
       else
         *out << "YY_EXTERN_C int yylex(yyscan_t);\n";
       *out << "YY_EXTERN_C void yylex_init(yyscan_t*);\n";
@@ -1606,7 +1615,7 @@ void Reflex::write()
         "#ifndef YY_EXTERN_C\n"
         "#define YY_EXTERN_C\n"
         "#endif\n\n"
-        "YY_EXTERN_C int yylex(YYSTYPE*, YYLTYPE*);\n";
+        "YY_EXTERN_C int yylex(" << yystype << "*, " << yyltype << "*);\n";
     }
     else if (!options["bison"].empty())
     {
@@ -1713,6 +1722,8 @@ void Reflex::write_class()
   *out << "#include <" << library->file << ">" << std::endl;
   const char *matcher = library->matcher;
   std::string lex = options["lex"];
+  std::string yystype = options["bison_cc"].empty() ? "YYSTYPE" : "yy::parser::semantic_type";
+  std::string yyltype = options["bison_cc"].empty() ? "YYLTYPE" : "yy::location";
   std::string base;
   if (!options["flex"].empty())
   {
@@ -1763,23 +1774,49 @@ void Reflex::write_class()
       "    :\n"
       "      " << base << "(input, os)\n";
     write_section_init();
-    if (!options["bison_bridge"].empty() || !options["bison_locations"].empty())
+    if (!options["bison_cc"].empty())
+    {
+      if (!options["bison_locations"].empty())
+        *out <<
+          "  virtual int " << lex << "(" << yystype << " *yylval, " << yyltype << " *yylloc)\n"
+          "  {\n"
+          "    yylloc->step();\n"
+          "    int ret = " << lex << "(*yylval);\n"
+          "    yylloc->end.line = matcher().lineno();\n"
+          "    yylloc->end.column = matcher().columno();\n"
+          "    return ret;\n"
+          "  }\n";
+      else
+        *out <<
+          "  virtual int " << lex << "(" << yystype << " *yylval)\n"
+          "  {\n"
+          "    return yylex(*yylval);\n"
+          "  }\n";
+      *out <<
+        "  virtual int yylex(void)\n"
+        "  {\n"
+        "    LexerError(\"" << lexer << "::yylex invoked but %option bison-cc is used\");\n"
+        "    return 0;\n"
+        "  }\n"
+        "  virtual int " << lex << "(" << yystype << "& yylval)";
+    }
+    else if (!options["bison_bridge"].empty() || !options["bison_locations"].empty())
     {
       *out <<
         "  virtual int yylex(void)\n"
         "  {\n"
-        "    LexerError(\"" << lexer << "::yylex invoked but %option bison-bridge or bison-location used\");\n"
+        "    LexerError(\"" << lexer << "::yylex invoked but %option bison-bridge and/or bison-locations is used\");\n"
         "    return 0;\n"
         "  }\n"
-        "  virtual int " << lex << "(YYSTYPE& yylval)";
+        "  virtual int " << lex << "(" << yystype << "& yylval)";
     }
     else
     {
-      if (options["lex"] != "yylex")
+      if (lex != "yylex")
         *out <<
           "  virtual int yylex(void)\n"
           "  {\n"
-          "    LexerError(\"" << lexer << "::yylex invoked but %option lex=" << lex << " used\");\n"
+          "    LexerError(\"" << lexer << "::yylex invoked but %option lex=" << lex << " is used\");\n"
           "    return 0;\n"
           "  }\n";
       *out <<
@@ -1791,22 +1828,10 @@ void Reflex::write_class()
       *out <<
         "\n"
         "  {\n"
-        "    LexerError(\"" << lexer << "::" << lex << " invoked but %option yyclass=" << options["yyclass"] << " used\");\n"
+        "    LexerError(\"" << lexer << "::" << lex << " invoked but %option yyclass=" << options["yyclass"] << " is used\");\n"
         "    return 0;\n"
         "  }"
         << std::endl;
-    if (options["bison_bridge"].empty())
-      *out <<
-        "  int " << lex << "(\n"
-        "      const reflex::Input& input,\n"
-        "      std::ostream        *os = NULL)\n"
-        "  {\n"
-        "    in(input);\n"
-        "    if (os)\n"
-        "      out(*os);\n"
-        "    return " << lex << "();\n"
-        "  }"
-        << std::endl;
   }
   else
   {
@@ -1822,9 +1847,30 @@ void Reflex::write_class()
     for (Start start = 0; start < conditions.size(); ++start)
       *out <<
         "  static const int " << conditions[start] << " = " << start << ";\n";
-    if (!options["bison_bridge"].empty() || !options["bison_locations"].empty())
+    if (!options["bison_cc"].empty())
+    {
+      if (!options["bison_locations"].empty())
+        *out <<
+          "  virtual int " << lex << "(" << yystype << " *yylval, " << yyltype << " *yylloc)\n"
+          "  {\n"
+          "    yylloc->step();\n"
+          "    int ret = " << lex << "(*yylval);\n"
+          "    yylloc->end.line = matcher().lineno();\n"
+          "    yylloc->end.column = matcher().columno();\n"
+          "    return ret;\n"
+          "  }\n";
+      else
+        *out <<
+          "  virtual int " << lex << "(" << yystype << " *yylval)\n"
+          "  {\n"
+          "    return yylex(*yylval);\n"
+          "  }\n";
       *out <<
-        "  virtual int " << lex << "(YYSTYPE& yylval)";
+        "  virtual int " << lex << "(" << yystype << "& yylval)";
+    }
+    else if (!options["bison_bridge"].empty() || !options["bison_locations"].empty())
+      *out <<
+        "  virtual int " << lex << "(" << yystype << "& yylval)";
     else
       *out <<
         "  virtual int " << lex << "()";
@@ -1832,18 +1878,18 @@ void Reflex::write_class()
       *out << ";\n";
     else
       *out << " = 0;\n";
-    if (options["bison_bridge"].empty())
-      *out <<
-        "  int " << lex << "(\n"
-        "      const reflex::Input& input,\n"
-        "      std::ostream        *os = NULL)\n"
-        "  {\n"
-        "    in(input);\n"
-        "    if (os)\n"
-        "      out(*os);\n"
-        "    return " << lex << "();\n"
-        "  }\n";
   }
+  if (options["bison_cc"].empty() && options["bison_bridge"].empty() && options["bison_locations"].empty())
+    *out <<
+      "  int " << lex << "(\n"
+      "      const reflex::Input& input,\n"
+      "      std::ostream        *os = NULL)\n"
+      "  {\n"
+      "    in(input);\n"
+      "    if (os)\n"
+      "      out(*os);\n"
+      "    return " << lex << "();\n"
+      "  }\n";
   write_perf_report();
   *out <<
     "};" << std::endl;
@@ -2024,7 +2070,14 @@ void Reflex::write_lexer()
 {
   if (!out->good())
     return;
-  if (!options["reentrant"].empty() || !options["bison_bridge"].empty())
+  std::string lex = options["lex"];
+  std::string yystype = options["bison_cc"].empty() ? "YYSTYPE" : "yy::parser::semantic_type";
+  std::string yyltype = options["bison_cc"].empty() ? "YYLTYPE" : "yy::location";
+  if (!options["bison_cc"].empty())
+  {
+    write_banner("BISON C++");
+  }
+  else if (!options["reentrant"].empty() || !options["bison_bridge"].empty())
   {
     if (!options["bison_locations"].empty())
       write_banner("BISON BRIDGE LOCATIONS");
@@ -2049,26 +2102,26 @@ void Reflex::write_lexer()
       "#endif\n\n";
     if (!options["bison_locations"].empty())
       *out <<
-        "YY_EXTERN_C int yylex(YYSTYPE *lvalp, YYLTYPE *llocp, yyscan_t scanner)\n"
+        "YY_EXTERN_C int yylex(" << yystype << " *lvalp, " << yyltype << " *llocp, yyscan_t scanner)\n"
         "{\n"
         "  llocp->first_line = llocp->last_line;\n"
         "  llocp->first_column = llocp->last_column;\n"
-        "  int res = static_cast<yyscanner_t*>(scanner)->" << options["lex"] << "(*lvalp);\n"
+        "  int res = static_cast<yyscanner_t*>(scanner)->" << lex << "(*lvalp);\n"
         "  llocp->last_line = static_cast<yyscanner_t*>(scanner)->matcher().lineno();\n"
         "  llocp->last_column = static_cast<yyscanner_t*>(scanner)->matcher().columno();\n"
         "  return res;\n"
         "}\n\n";
     else if (!options["bison_bridge"].empty())
       *out <<
-        "YY_EXTERN_C int yylex(YYSTYPE *lvalp, yyscan_t scanner)\n"
+        "YY_EXTERN_C int yylex(" << yystype << " *lvalp, yyscan_t scanner)\n"
         "{\n"
-        "  return static_cast<yyscanner_t*>(scanner)->" << options["lex"] << "(*lvalp);\n"
+        "  return static_cast<yyscanner_t*>(scanner)->" << lex << "(*lvalp);\n"
         "}\n\n";
     else
       *out <<
         "YY_EXTERN_C int yylex(yyscan_t scanner)\n"
         "{\n"
-        "  return static_cast<yyscanner_t*>(scanner)->" << options["lex"] << "();\n"
+        "  return static_cast<yyscanner_t*>(scanner)->" << lex << "();\n"
         "}\n\n";
     *out <<
       "YY_EXTERN_C void yylex_init(yyscan_t *scanner)\n"
@@ -2104,11 +2157,11 @@ void Reflex::write_lexer()
       "#ifndef YY_EXTERN_C\n"
       "#define YY_EXTERN_C\n"
       "#endif\n\n"
-      "YY_EXTERN_C int yylex(YYSTYPE *lvalp, YYLTYPE *llocp)\n"
+      "YY_EXTERN_C int yylex(" << yystype << " *lvalp, " << yyltype << " *llocp)\n"
       "{\n"
       "  llocp->first_line = llocp->last_line;\n"
       "  llocp->first_column = llocp->last_column;\n"
-      "  int res = YY_SCANNER." << options["lex"] << "(*lvalp);\n"
+      "  int res = YY_SCANNER." << lex << "(*lvalp);\n"
       "  llocp->last_line = YY_SCANNER.matcher().lineno();\n"
       "  llocp->last_column = YY_SCANNER.matcher().columno();\n"
       "  return res;\n"
@@ -2137,7 +2190,7 @@ void Reflex::write_lexer()
         "int " << options["prefix"] << "lineno;\n"
         "YY_EXTERN_C int " << options["prefix"] << "lex(void)\n"
         "{\n"
-        "  int res = YY_SCANNER." << options["lex"] << "();\n"
+        "  int res = YY_SCANNER." << lex << "();\n"
         "  " << options["prefix"] << "text = const_cast<char*>(YY_SCANNER.YYText());\n"
         "  " << options["prefix"] << "leng = static_cast<yy_size_t>(YY_SCANNER.YYLeng());\n"
         "  " << options["prefix"] << "lineno = static_cast<int>(YY_SCANNER.lineno());\n"
@@ -2150,7 +2203,7 @@ void Reflex::write_lexer()
       *out <<
         "YY_EXTERN_C int yylex(void)\n"
         "{\n"
-        "  return YY_SCANNER." << options["lex"] << "();\n"
+        "  return YY_SCANNER." << lex << "();\n"
         "}\n";
   }
   write_banner("SECTION 2: rules");
@@ -2187,10 +2240,10 @@ void Reflex::write_lexer()
     *out << options["class"];
   else
     *out << options["lexer"];
-  if (!options["bison_bridge"].empty() || !options["bison_locations"].empty())
-    *out << "::" << options["lex"] << "(YYSTYPE& yylval)\n{\n";
+  if (!options["bison_cc"].empty() || !options["bison_bridge"].empty() || !options["bison_locations"].empty())
+    *out << "::" << lex << "(" << yystype << "& yylval)\n{\n";
   else
-    *out << "::" << options["lex"] << "()\n{\n";
+    *out << "::" << lex << "()\n{\n";
   for (Start start = 0; start < conditions.size(); ++start)
   {
     if (options["matcher"].empty())
diff --git a/src/reflex.h b/src/reflex.h
index 76dc7bf93..f8b8fe184 100644
--- a/src/reflex.h
+++ b/src/reflex.h
@@ -64,7 +64,7 @@
 #endif
 
 // DO NOT ALTER THIS LINE: the makemake.sh script updates the version
-#define REFLEX_VERSION "1.0.5"
+#define REFLEX_VERSION "1.0.6"
 
 /// RE/flex scanner generator class, a variation of the classic "lex" tool to generate scanners.
 /**