diff --git a/example/Jamfile b/example/Jamfile
index f87cb3d4..e165401d 100644
--- a/example/Jamfile
+++ b/example/Jamfile
@@ -1,4 +1,4 @@
-#  (C) Copyright Gennadiy Rozental 2001-2005.
+#  (C) Copyright Gennadiy Rozental 2001-2006.
 #  Use, modification, and distribution are subject to the 
 #  Boost Software License, Version 1.0. (See accompanying file 
 #  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -35,7 +35,7 @@ test-suite "boost_test_examples"
 
   [ boost-test-example test_case_template_example : run : boost_unit_test_framework ]
 
-  [ boost-test-example unit_test_example_01 : run-fail  : boost_unit_test_framework ]
+  [ boost-test-example unit_test_example_01 : run-fail ]
   [ boost-test-example unit_test_example_02 : run       : boost_unit_test_framework ]
   [ boost-test-example unit_test_example_03 : run       : boost_unit_test_framework ]
   [ boost-test-example unit_test_example_04 : run-fail  : boost_unit_test_framework ]
@@ -55,6 +55,6 @@ test-suite "boost_test_examples"
 
   [ boost-test-example named_param_example  : run ]
 
-  [ boost-test-example unit_test_example_01_dll : run-fail : boost_unit_test_framework : unit_test_example_01.cpp : 1 ]
+  [ boost-test-example unit_test_example_04_dll : run-fail : boost_unit_test_framework : unit_test_example_04.cpp : 1 ]
 
 ;
diff --git a/example/cla/Jamfile b/example/cla/Jamfile
index 4735620c..5d10a9fe 100755
--- a/example/cla/Jamfile
+++ b/example/cla/Jamfile
@@ -1,4 +1,4 @@
-#  (C) Copyright Gennadiy Rozental 2001-2005.
+#  (C) Copyright Gennadiy Rozental 2001-2006.
 #  Use, modification, and distribution are subject to the 
 #  Boost Software License, Version 1.0. (See accompanying file 
 #  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/assign_to.cpp b/example/cla/assign_to.cpp
index 9c2beb9b..284999c8 100755
--- a/example/cla/assign_to.cpp
+++ b/example/cla/assign_to.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/basic_float.cpp b/example/cla/basic_float.cpp
index 3899310c..4a0d96f9 100755
--- a/example/cla/basic_float.cpp
+++ b/example/cla/basic_float.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/basic_int.cpp b/example/cla/basic_int.cpp
index a38613e0..f110ec16 100755
--- a/example/cla/basic_int.cpp
+++ b/example/cla/basic_int.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/basic_list.cpp b/example/cla/basic_list.cpp
index 88ddceb3..92ffa859 100755
--- a/example/cla/basic_list.cpp
+++ b/example/cla/basic_list.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/basic_string.cpp b/example/cla/basic_string.cpp
index 0133aad0..c1df4745 100755
--- a/example/cla/basic_string.cpp
+++ b/example/cla/basic_string.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/basic_udt.cpp b/example/cla/basic_udt.cpp
index 5b7b8c86..fdf4c4f0 100755
--- a/example/cla/basic_udt.cpp
+++ b/example/cla/basic_udt.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/char_parameter.cpp b/example/cla/char_parameter.cpp
index af994aad..cdd8748b 100755
--- a/example/cla/char_parameter.cpp
+++ b/example/cla/char_parameter.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/custom_handler.cpp b/example/cla/custom_handler.cpp
index efdd6f61..44655e0d 100755
--- a/example/cla/custom_handler.cpp
+++ b/example/cla/custom_handler.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/custom_interpreter.cpp b/example/cla/custom_interpreter.cpp
index cf79ec54..998dfa34 100755
--- a/example/cla/custom_interpreter.cpp
+++ b/example/cla/custom_interpreter.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/custom_parameter.cpp b/example/cla/custom_parameter.cpp
index f50f76e2..734bf883 100755
--- a/example/cla/custom_parameter.cpp
+++ b/example/cla/custom_parameter.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/default_value.cpp b/example/cla/default_value.cpp
index 05f79aff..d4253149 100755
--- a/example/cla/default_value.cpp
+++ b/example/cla/default_value.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/dual_name.cpp b/example/cla/dual_name.cpp
index 9e2a783e..06f77b6d 100755
--- a/example/cla/dual_name.cpp
+++ b/example/cla/dual_name.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/global.cpp b/example/cla/global.cpp
index e5371739..3d67eb9f 100755
--- a/example/cla/global.cpp
+++ b/example/cla/global.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/guess_name.cpp b/example/cla/guess_name.cpp
index 42930f33..8e1c880c 100755
--- a/example/cla/guess_name.cpp
+++ b/example/cla/guess_name.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/help.cpp b/example/cla/help.cpp
index def4d5cb..4adfc9ce 100755
--- a/example/cla/help.cpp
+++ b/example/cla/help.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/ignore_mismatch.cpp b/example/cla/ignore_mismatch.cpp
index a6604338..30dad7b8 100755
--- a/example/cla/ignore_mismatch.cpp
+++ b/example/cla/ignore_mismatch.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/input_separator.cpp b/example/cla/input_separator.cpp
index 81f495ea..af638b47 100755
--- a/example/cla/input_separator.cpp
+++ b/example/cla/input_separator.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/multiplicable.cpp b/example/cla/multiplicable.cpp
index 08b4ffdf..627509db 100755
--- a/example/cla/multiplicable.cpp
+++ b/example/cla/multiplicable.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/name.cpp b/example/cla/name.cpp
index 8c1ef77f..4001099f 100755
--- a/example/cla/name.cpp
+++ b/example/cla/name.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/optional.cpp b/example/cla/optional.cpp
index 11dd4d1a..ae4ed164 100755
--- a/example/cla/optional.cpp
+++ b/example/cla/optional.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/optional_value.cpp b/example/cla/optional_value.cpp
index d34a3ccb..f78d8688 100755
--- a/example/cla/optional_value.cpp
+++ b/example/cla/optional_value.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/positional.cpp b/example/cla/positional.cpp
index 6419907f..dc69eef4 100755
--- a/example/cla/positional.cpp
+++ b/example/cla/positional.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/prefix.cpp b/example/cla/prefix.cpp
index 61e7dbc9..0ba32b0b 100755
--- a/example/cla/prefix.cpp
+++ b/example/cla/prefix.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/reference.cpp b/example/cla/reference.cpp
index ff94a958..19f58d47 100755
--- a/example/cla/reference.cpp
+++ b/example/cla/reference.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/remainder.cpp b/example/cla/remainder.cpp
index 3abbcdba..4b23b678 100755
--- a/example/cla/remainder.cpp
+++ b/example/cla/remainder.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/separator.cpp b/example/cla/separator.cpp
index 4218d514..8d03f502 100755
--- a/example/cla/separator.cpp
+++ b/example/cla/separator.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/usage.cpp b/example/cla/usage.cpp
index 46edc085..d966863d 100755
--- a/example/cla/usage.cpp
+++ b/example/cla/usage.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/validation/Jamfile b/example/cla/validation/Jamfile
index 1e6335d5..40e4355f 100755
--- a/example/cla/validation/Jamfile
+++ b/example/cla/validation/Jamfile
@@ -1,4 +1,4 @@
-#  (C) Copyright Gennadiy Rozental 2001-2005.
+#  (C) Copyright Gennadiy Rozental 2001-2006.
 #  Use, modification, and distribution are subject to the 
 #  Boost Software License, Version 1.0. (See accompanying file 
 #  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/validation/access_unknown.cpp b/example/cla/validation/access_unknown.cpp
index 1fdaf471..a830c235 100755
--- a/example/cla/validation/access_unknown.cpp
+++ b/example/cla/validation/access_unknown.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/validation/ambiguous_access.cpp b/example/cla/validation/ambiguous_access.cpp
index e71411e5..9bf3201b 100755
--- a/example/cla/validation/ambiguous_access.cpp
+++ b/example/cla/validation/ambiguous_access.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/validation/ambiguous_input.cpp b/example/cla/validation/ambiguous_input.cpp
index 24b8f2b5..e702ba53 100755
--- a/example/cla/validation/ambiguous_input.cpp
+++ b/example/cla/validation/ambiguous_input.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/validation/definition_conflict.cpp b/example/cla/validation/definition_conflict.cpp
index 31112824..66d0dfad 100755
--- a/example/cla/validation/definition_conflict.cpp
+++ b/example/cla/validation/definition_conflict.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/validation/invalid_short_name.cpp b/example/cla/validation/invalid_short_name.cpp
index 28209010..25c56a08 100755
--- a/example/cla/validation/invalid_short_name.cpp
+++ b/example/cla/validation/invalid_short_name.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/validation/multiple_generators.cpp b/example/cla/validation/multiple_generators.cpp
index dd0775f3..d57df067 100755
--- a/example/cla/validation/multiple_generators.cpp
+++ b/example/cla/validation/multiple_generators.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/validation/multiple_value_handlers.cpp b/example/cla/validation/multiple_value_handlers.cpp
index 48842fd8..41d74c75 100755
--- a/example/cla/validation/multiple_value_handlers.cpp
+++ b/example/cla/validation/multiple_value_handlers.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/validation/opt_with_default_value.cpp b/example/cla/validation/opt_with_default_value.cpp
index 2ce4e2a7..e331e2ad 100755
--- a/example/cla/validation/opt_with_default_value.cpp
+++ b/example/cla/validation/opt_with_default_value.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/validation/optional_plus_multiplicable.cpp b/example/cla/validation/optional_plus_multiplicable.cpp
index 16babb3f..b6edd658 100755
--- a/example/cla/validation/optional_plus_multiplicable.cpp
+++ b/example/cla/validation/optional_plus_multiplicable.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/validation/required_missing.cpp b/example/cla/validation/required_missing.cpp
index b5d2e820..a31904bf 100755
--- a/example/cla/validation/required_missing.cpp
+++ b/example/cla/validation/required_missing.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/validation/unexpected_input.cpp b/example/cla/validation/unexpected_input.cpp
index 3ec0b260..37e3fca7 100755
--- a/example/cla/validation/unexpected_input.cpp
+++ b/example/cla/validation/unexpected_input.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/validation/unexpected_repetition.cpp b/example/cla/validation/unexpected_repetition.cpp
index 52c3abcb..ab0b7374 100755
--- a/example/cla/validation/unexpected_repetition.cpp
+++ b/example/cla/validation/unexpected_repetition.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/cla/wide_string.cpp b/example/cla/wide_string.cpp
index 6f67dc13..0fd891c6 100755
--- a/example/cla/wide_string.cpp
+++ b/example/cla/wide_string.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/env/Jamfile b/example/env/Jamfile
index 97cd0537..d7ae6ccb 100755
--- a/example/env/Jamfile
+++ b/example/env/Jamfile
@@ -1,4 +1,4 @@
-#  (C) Copyright Gennadiy Rozental 2001-2005.
+#  (C) Copyright Gennadiy Rozental 2001-2006.
 #  Use, modification, and distribution are subject to the 
 #  Boost Software License, Version 1.0. (See accompanying file 
 #  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/env/custom_interpreter_env.cpp b/example/env/custom_interpreter_env.cpp
index 012dd6b5..0a197c5b 100755
--- a/example/env/custom_interpreter_env.cpp
+++ b/example/env/custom_interpreter_env.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/env/env_var_default_value.cpp b/example/env/env_var_default_value.cpp
index 2640fbde..25b725fa 100755
--- a/example/env/env_var_default_value.cpp
+++ b/example/env/env_var_default_value.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/env/environment_ex.cpp b/example/env/environment_ex.cpp
index 432d91bd..2799bdcb 100755
--- a/example/env/environment_ex.cpp
+++ b/example/env/environment_ex.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/env/global_id.cpp b/example/env/global_id.cpp
index 7fe933bc..71f01791 100755
--- a/example/env/global_id.cpp
+++ b/example/env/global_id.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/env/modifier_combination.cpp b/example/env/modifier_combination.cpp
index 277d3238..8fa8a425 100755
--- a/example/env/modifier_combination.cpp
+++ b/example/env/modifier_combination.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/env/validation/Jamfile b/example/env/validation/Jamfile
index b723d307..36c72182 100755
--- a/example/env/validation/Jamfile
+++ b/example/env/validation/Jamfile
@@ -1,4 +1,4 @@
-#  (C) Copyright Gennadiy Rozental 2001-2005.
+#  (C) Copyright Gennadiy Rozental 2001-2006.
 #  Use, modification, and distribution are subject to the 
 #  Boost Software License, Version 1.0. (See accompanying file 
 #  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/env/validation/need_typed_access.cpp b/example/env/validation/need_typed_access.cpp
index 1babb181..5b957902 100755
--- a/example/env/validation/need_typed_access.cpp
+++ b/example/env/validation/need_typed_access.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/env/variable_ex.cpp b/example/env/variable_ex.cpp
index ae66f960..873d8909 100755
--- a/example/env/variable_ex.cpp
+++ b/example/env/variable_ex.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/est_example1.cpp b/example/est_example1.cpp
index 8863cb19..eee0d4b8 100644
--- a/example/est_example1.cpp
+++ b/example/est_example1.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2005.
+//  (C) Copyright Gennadiy Rozental 2005-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/est_example2.cpp b/example/est_example2.cpp
index 0b584567..b963ed98 100644
--- a/example/est_example2.cpp
+++ b/example/est_example2.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2005.
+//  (C) Copyright Gennadiy Rozental 2005-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/exec_mon_example.cpp b/example/exec_mon_example.cpp
index 8fa385f1..24933581 100644
--- a/example/exec_mon_example.cpp
+++ b/example/exec_mon_example.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2003-2005.
+//  (C) Copyright Gennadiy Rozental 2003-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/logged_exp_example.cpp b/example/logged_exp_example.cpp
index 9379b606..52a7588d 100644
--- a/example/logged_exp_example.cpp
+++ b/example/logged_exp_example.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2005.
+//  (C) Copyright Gennadiy Rozental 2005-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/named_param_example.cpp b/example/named_param_example.cpp
index 42721b6b..3f33dc1a 100755
--- a/example/named_param_example.cpp
+++ b/example/named_param_example.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/prg_exec_example.cpp b/example/prg_exec_example.cpp
index c5f77844..2ee710d0 100644
--- a/example/prg_exec_example.cpp
+++ b/example/prg_exec_example.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/test_case_template_example.cpp b/example/test_case_template_example.cpp
index 5ba4bed3..14933e00 100644
--- a/example/test_case_template_example.cpp
+++ b/example/test_case_template_example.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
diff --git a/example/unit_test_example_01.cpp b/example/unit_test_example_01.cpp
index 1cfa3928..0438a3c5 100644
--- a/example/unit_test_example_01.cpp
+++ b/example/unit_test_example_01.cpp
@@ -1,39 +1,52 @@
-//  (C) Copyright Gennadiy Rozental 2005.
-//  Distributed under the Boost Software License, Version 1.0.
-//  (See accompanying file LICENSE_1_0.txt or copy at 
-//  http://www.boost.org/LICENSE_1_0.txt)
+#include <iostream>
 
-//  See http://www.boost.org/libs/test for the library home page.
+namespace ieee_754 {
 
-// Boost.Test
+template<typename T>
+struct decoded {
+    typedef long long mantissa_holder_type;
+    typedef short     exponent_holder_type;
 
-// each test module could contain no more then one 'main' file with init function defined
-// alternatively you could define init function yourself
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
+    bool                  p_sign;
+    mantissa_holder_type  p_mantissa;
+    exponent_holder_type  p_exponent;
+};
 
-//____________________________________________________________________________//
+//___________________________________________________________________________//
 
-// most frequently you implement test cases as a free functions with automatic registration
-BOOST_AUTO_TEST_CASE( test1 )
+void decode( double v, decoded<double>& d )
 {
-    // reports 'error in "test1": test 2 == 1 failed'
-    BOOST_CHECK( 2 == 1 );
+    union {
+        double v;
+        long long m;
+    } tmp;
+
+    tmp.v = v;
+
+    d.p_sign     = !(tmp.m & 0x8000000000000000LL);
+    d.p_mantissa = tmp.m & 0x000FFFFFFFFFFFFFLL;
+    d.p_exponent = (short)((tmp.m & 0x7FF0000000000000LL) >> 52) - 1075;
+
+    if( d.p_exponent != 0 )
+        d.p_mantissa |= 0x0010000000000000LL;
 }
 
-//____________________________________________________________________________//
+//___________________________________________________________________________//
 
-// each test file may contain any number of test cases; each test case has to have unique name
-BOOST_AUTO_TEST_CASE( test2 )
+} // namespace ieee_754
+
+using namespace ieee_754;
+
+int
+main()
 {
-    int i = 0;
+    double d = 0.2;
+    decoded<double> dec;
 
-    // reports 'error in "test2": check i == 2 failed [0 != 2]'
-    BOOST_CHECK_EQUAL( i, 2 );
+    decode( d, dec );
 
-    BOOST_CHECK_EQUAL( i, 0 );
+    std::cout << "orig = "           << std::hex << *(long long*)&d << std::endl;
+    std::cout << "dec.p_sign = "     << (dec.p_sign ? '+' : '-') << std::endl;
+    std::cout << "dec.p_mantissa = " << std::hex << dec.p_mantissa << std::endl;
+    std::cout << "dec.p_exponent = " << std::dec << dec.p_exponent << std::endl;
 }
-
-//____________________________________________________________________________//
-
-// EOF
diff --git a/example/unit_test_example_02.cpp b/example/unit_test_example_02.cpp
index a0c2380e..e49ad55e 100644
--- a/example/unit_test_example_02.cpp
+++ b/example/unit_test_example_02.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2002-2005.
+//  (C) Copyright Gennadiy Rozental 2002-2006.
 //  (C) Copyright Gennadiy Rozental & Ullrich Koethe 2001.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
@@ -33,8 +33,9 @@ init_unit_test_suite( int, char* [] ) {
     framework::master_test_suite().p_name.value = "Unit test example 02";
 
     // register the test case in test tree and specify number of expected failures so
-    // this example will pass at runtime
-    framework::master_test_suite().add( BOOST_TEST_CASE( &free_test_function ), 1 /* expected one error */ );
+    // this example will pass at runtime. We expect 2 errors: one from failed check and 
+    // one from memory acces violation
+    framework::master_test_suite().add( BOOST_TEST_CASE( &free_test_function ), 2 );
 
     return 0;
 }
diff --git a/example/unit_test_example_03.cpp b/example/unit_test_example_03.cpp
index 20940126..afdce4d2 100644
--- a/example/unit_test_example_03.cpp
+++ b/example/unit_test_example_03.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2002-2005.
+//  (C) Copyright Gennadiy Rozental 2002-2006.
 //  (C) Copyright Gennadiy Rozental & Ullrich Koethe 2001.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
diff --git a/example/unit_test_example_04.cpp b/example/unit_test_example_04.cpp
index 31c5dad1..8719d64f 100644
--- a/example/unit_test_example_04.cpp
+++ b/example/unit_test_example_04.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2005.
+//  (C) Copyright Gennadiy Rozental 2005-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
@@ -6,15 +6,15 @@
 //  See http://www.boost.org/libs/test for the library home page.
 
 // Boost.Test
-#define BOOST_TEST_MAIN
+#define BOOST_TEST_MODULE Unit_test_example_04 
 #include <boost/test/unit_test.hpp>
 
 //____________________________________________________________________________//
 
 // automatically registerred test cases could be organized in test suites
-BOOST_AUTO_TEST_SUITE( suite1 );
+BOOST_AUTO_TEST_SUITE( my_suite1 );
 
-BOOST_AUTO_TEST_CASE( test1 )
+BOOST_AUTO_TEST_CASE( my_test1 )
 {
     BOOST_CHECK( 2 == 1 );
 }
@@ -22,7 +22,7 @@ BOOST_AUTO_TEST_CASE( test1 )
 //____________________________________________________________________________//
 
 // this test case belongs to suite1 test suite
-BOOST_AUTO_TEST_CASE( test2 )
+BOOST_AUTO_TEST_CASE( my_test2 )
 {
     int i = 0;
 
@@ -36,7 +36,7 @@ BOOST_AUTO_TEST_SUITE_END();
 //____________________________________________________________________________//
 
 // this test case belongs to master test suite
-BOOST_AUTO_TEST_CASE( test3 )
+BOOST_AUTO_TEST_CASE( my_test3 )
 {
     int i = 0;
 
@@ -45,10 +45,10 @@ BOOST_AUTO_TEST_CASE( test3 )
 
 //____________________________________________________________________________//
 
-BOOST_AUTO_TEST_SUITE( suite2 );
+BOOST_AUTO_TEST_SUITE( my_suite2 );
 
 // this test case belongs to suite2 test suite
-BOOST_AUTO_TEST_CASE( test4 )
+BOOST_AUTO_TEST_CASE( my_test4 )
 {
     int i = 0;
 
diff --git a/example/unit_test_example_05.cpp b/example/unit_test_example_05.cpp
index 33b3658a..c31b741d 100644
--- a/example/unit_test_example_05.cpp
+++ b/example/unit_test_example_05.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2005.
+//  (C) Copyright Gennadiy Rozental 2005-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
@@ -6,12 +6,12 @@
 //  See http://www.boost.org/libs/test for the library home page.
 
 // Boost.Test
-#define BOOST_TEST_MAIN
+#define BOOST_TEST_MODULE "Unit test example 05"
 #include <boost/test/unit_test.hpp>
 
 //____________________________________________________________________________//
 
-BOOST_AUTO_TEST_SUITE( suite );
+BOOST_AUTO_TEST_SUITE( my_suite );
 
 struct F {
     F() : i( 0 ) { BOOST_TEST_MESSAGE( "setup fixture" ); }
@@ -23,7 +23,7 @@ struct F {
 //____________________________________________________________________________//
 
 // this test case will use struct F as fixture
-BOOST_FIXTURE_TEST_CASE( test1, F )
+BOOST_FIXTURE_TEST_CASE( my_test1, F )
 {
     // you have direct access to non-private members of fixture structure
     BOOST_CHECK( i == 1 );
@@ -32,7 +32,7 @@ BOOST_FIXTURE_TEST_CASE( test1, F )
 //____________________________________________________________________________//
 
 // you could have any number of test cases with the same fixture
-BOOST_FIXTURE_TEST_CASE( test2, F )
+BOOST_FIXTURE_TEST_CASE( my_test2, F )
 {
     BOOST_CHECK_EQUAL( i, 2 );
 
diff --git a/example/unit_test_example_06.cpp b/example/unit_test_example_06.cpp
index 8f8552fa..10487e78 100644
--- a/example/unit_test_example_06.cpp
+++ b/example/unit_test_example_06.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2005.
+//  (C) Copyright Gennadiy Rozental 2005-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
@@ -6,7 +6,7 @@
 //  See http://www.boost.org/libs/test for the library home page.
 
 // Boost.Test
-#define BOOST_TEST_MAIN
+#define BOOST_TEST_MODULE Unit test example 06
 #include <boost/test/unit_test.hpp>
 
 //____________________________________________________________________________//
@@ -23,14 +23,14 @@ struct F {
 // struct F is going to be used as a fixture for all test cases in this test suite
 BOOST_FIXTURE_TEST_SUITE( s, F )
 
-BOOST_AUTO_TEST_CASE( test1 )
+BOOST_AUTO_TEST_CASE( my_test1 )
 {
     BOOST_CHECK( i == 1 );
 }
 
 //____________________________________________________________________________//
 
-BOOST_AUTO_TEST_CASE( test2 )
+BOOST_AUTO_TEST_CASE( my_test2 )
 {
     BOOST_CHECK_EQUAL( i, 2 );
 
diff --git a/example/unit_test_example_07.cpp b/example/unit_test_example_07.cpp
index 4be4fd9b..b38c6fd5 100644
--- a/example/unit_test_example_07.cpp
+++ b/example/unit_test_example_07.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2005.
+//  (C) Copyright Gennadiy Rozental 2005-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
@@ -6,7 +6,7 @@
 //  See http://www.boost.org/libs/test for the library home page.
 
 // Boost.Test
-#define BOOST_TEST_MAIN
+#define BOOST_TEST_MODULE Unit_test_example_07
 #include <boost/test/unit_test.hpp>
 #include <boost/test/test_case_template.hpp>
 #include <boost/mpl/list.hpp>
@@ -27,7 +27,7 @@ BOOST_FIXTURE_TEST_SUITE( s, F )
 typedef boost::mpl::list<char,int,float,double> test_types;
 // this test case template produce a separate test case for each type listed in test_types
 // each produced test case uses strct F as a fixture
-BOOST_AUTO_TEST_CASE_TEMPLATE( test, T, test_types )
+BOOST_AUTO_TEST_CASE_TEMPLATE( my_test, T, test_types )
 {
     T t = i;
 
diff --git a/example/unit_test_example_08.cpp b/example/unit_test_example_08.cpp
index fa76c6fa..072335fa 100644
--- a/example/unit_test_example_08.cpp
+++ b/example/unit_test_example_08.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2005.
+//  (C) Copyright Gennadiy Rozental 2005-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
@@ -6,15 +6,15 @@
 //  See http://www.boost.org/libs/test for the library home page.
 
 // Boost.Test
-#define BOOST_TEST_MAIN
+#define BOOST_TEST_MODULE Unit_test_example_08
 #include <boost/test/unit_test.hpp>
 
 //____________________________________________________________________________//
 
 // this way we could specify a number of expected failures in automatically registered test case
-BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES( test1, 1 )
+BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES( my_test1, 1 )
 
-BOOST_AUTO_TEST_CASE( test1 )
+BOOST_AUTO_TEST_CASE( my_test1 )
 {
     BOOST_CHECK( 2 == 1 );
 }
diff --git a/example/unit_test_example_09_1.cpp b/example/unit_test_example_09_1.cpp
index d661319d..3f47bef8 100644
--- a/example/unit_test_example_09_1.cpp
+++ b/example/unit_test_example_09_1.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2005.
+//  (C) Copyright Gennadiy Rozental 2005-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
@@ -6,7 +6,7 @@
 //  See http://www.boost.org/libs/test for the library home page.
 
 // Boost.Test
-#define BOOST_TEST_MAIN // this file is main
+#define BOOST_TEST_MODULE Unit_test_example_09
 #include <boost/test/unit_test.hpp>
 
 // STL
@@ -24,7 +24,7 @@ BOOST_GLOBAL_FIXTURE( MyConfig )
 
 //____________________________________________________________________________//
 
-BOOST_AUTO_TEST_CASE( test1 )
+BOOST_AUTO_TEST_CASE( my_test1 )
 {
     BOOST_CHECK( true );
 }
diff --git a/example/unit_test_example_09_2.cpp b/example/unit_test_example_09_2.cpp
index 181b6072..ff68a387 100644
--- a/example/unit_test_example_09_2.cpp
+++ b/example/unit_test_example_09_2.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2005.
+//  (C) Copyright Gennadiy Rozental 2005-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)
@@ -6,7 +6,7 @@
 //  See http://www.boost.org/libs/test for the library home page.
 
 // Boost.Test
-// only one file should define BOOST_TEST_MAIN
+// only one file should define BOOST_TEST_MAIN/BOOST_TEST_MODULE
 #include <boost/test/unit_test.hpp>
 
 // STL
@@ -24,7 +24,7 @@ BOOST_GLOBAL_FIXTURE( MyConfig2 )
 
 //____________________________________________________________________________//
 
-BOOST_AUTO_TEST_CASE( test2 )
+BOOST_AUTO_TEST_CASE( my_test2 )
 {
     BOOST_CHECK( true );
 }
diff --git a/example/unit_test_example_10.cpp b/example/unit_test_example_10.cpp
index 1ed65304..64634a41 100644
--- a/example/unit_test_example_10.cpp
+++ b/example/unit_test_example_10.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  (C) Copyright Gennadiy Rozental & Ullrich Koethe 2001.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
diff --git a/example/unit_test_example_11.cpp b/example/unit_test_example_11.cpp
index 3cf3f852..ade44446 100644
--- a/example/unit_test_example_11.cpp
+++ b/example/unit_test_example_11.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2002-2005.
+//  (C) Copyright Gennadiy Rozental 2002-2006.
 //  (C) Copyright Gennadiy Rozental & Ullrich Koethe 2001.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
diff --git a/example/unit_test_example_12.cpp b/example/unit_test_example_12.cpp
index dc05cfc8..a80e8667 100644
--- a/example/unit_test_example_12.cpp
+++ b/example/unit_test_example_12.cpp
@@ -1,4 +1,4 @@
-//  (C) Copyright Gennadiy Rozental 2001-2005.
+//  (C) Copyright Gennadiy Rozental 2001-2006.
 //  Distributed under the Boost Software License, Version 1.0.
 //  (See accompanying file LICENSE_1_0.txt or copy at 
 //  http://www.boost.org/LICENSE_1_0.txt)