diff --git a/Core/Code/CppMicroServices/documentation/doxygen.conf.in b/Core/Code/CppMicroServices/documentation/doxygen.conf.in
index e248754c37..d2a37838d6 100644
--- a/Core/Code/CppMicroServices/documentation/doxygen.conf.in
+++ b/Core/Code/CppMicroServices/documentation/doxygen.conf.in
@@ -1,1804 +1,1803 @@
 # Doxyfile 1.8.0-20120408
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
 #
 # All text after a hash (#) is considered a comment and will be ignored.
 # The format is:
 #       TAG = value [value, ...]
 # For lists items can also be appended using:
 #       TAG += value [value, ...]
 # Values that contain spaces should be placed between quotes (" ").
 
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
 
 # This tag specifies the encoding used for all characters in the config file
 # that follow. The default is UTF-8 which is also the encoding used for all
 # text before the first occurrence of this tag. Doxygen uses libiconv (or the
 # iconv built into libc) for the transcoding. See
 # http://www.gnu.org/software/libiconv for the list of possible encodings.
 
 DOXYFILE_ENCODING      = UTF-8
 
 # The PROJECT_NAME tag is a single word (or sequence of words) that should
 # identify the project. Note that if you do not use Doxywizard you need
 # to put quotes around the project name if it contains spaces.
 
 PROJECT_NAME           = "C++ Micro Services"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number.
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
 PROJECT_NUMBER         = @CppMicroServices_VERSION@
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer
 # a quick idea about the purpose of the project. Keep the description short.
 
 PROJECT_BRIEF          = "A dynamic OSGi-like C++ service registry"
 
 # With the PROJECT_LOGO tag one can specify an logo or icon that is
 # included in the documentation. The maximum height of the logo should not
 # exceed 55 pixels and the maximum width should not exceed 200 pixels.
 # Doxygen will copy the logo to the output directory.
 
 PROJECT_LOGO           =
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
 # If a relative path is entered, it will be relative to the location
 # where doxygen was started. If left blank the current directory will be used.
 
 OUTPUT_DIRECTORY       = @US_DOXYGEN_OUTPUT_DIR@
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
 # 4096 sub-directories (in 2 levels) under the output directory of each output
 # format and will distribute the generated files over these directories.
 # Enabling this option can be useful when feeding doxygen a huge amount of
 # source files, where putting all generated files in the same directory would
 # otherwise cause performance problems for the file system.
 
 CREATE_SUBDIRS         = NO
 
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all
 # documentation generated by doxygen is written. Doxygen will use this
 # information to generate all constant output in the proper language.
 # The default language is English, other supported languages are:
 # Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
 # Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
 # Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
 # messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
 # Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
 # Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
 
 OUTPUT_LANGUAGE        = English
 
 # If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
 # include brief member descriptions after the members that are listed in
 # the file and class documentation (similar to JavaDoc).
 # Set to NO to disable this.
 
 BRIEF_MEMBER_DESC      = YES
 
 # If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
 # the brief description of a member or function before the detailed description.
 # Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
 # brief descriptions will be completely suppressed.
 
 REPEAT_BRIEF           = YES
 
 # This tag implements a quasi-intelligent brief description abbreviator
 # that is used to form the text in various listings. Each string
 # in this list, if found as the leading text of the brief description, will be
 # stripped from the text and the result after processing the whole list, is
 # used as the annotated text. Otherwise, the brief description is used as-is.
 # If left blank, the following values are used ("$name" is automatically
 # replaced with the name of the entity): "The $name class" "The $name widget"
 # "The $name file" "is" "provides" "specifies" "contains"
 # "represents" "a" "an" "the"
 
 ABBREVIATE_BRIEF       =
 
 # If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
 # Doxygen will generate a detailed section even if there is only a brief
 # description.
 
 ALWAYS_DETAILED_SEC    = NO
 
 # If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
 # inherited members of a class in the documentation of that class as if those
 # members were ordinary class members. Constructors, destructors and assignment
 # operators of the base classes will not be shown.
 
 INLINE_INHERITED_MEMB  = NO
 
 # If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
 # path before files name in the file list and in the header files. If set
 # to NO the shortest path that makes the file name unique will be used.
 
 FULL_PATH_NAMES        = NO
 
 # If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
 # can be used to strip a user-defined part of the path. Stripping is
 # only done if one of the specified strings matches the left-hand part of
 # the path. The tag can be used to show relative paths in the file list.
 # If left blank the directory from which doxygen is run is used as the
 # path to strip.
 
 STRIP_FROM_PATH        =
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
 # the path mentioned in the documentation of a class, which tells
 # the reader which header file to include in order to use a class.
 # If left blank only the name of the header file containing the class
 # definition is used. Otherwise one should specify the include paths that
 # are normally passed to the compiler using the -I flag.
 
 STRIP_FROM_INC_PATH    =
 
 # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
 # (but less readable) file names. This can be useful if your file system
 # doesn't support long names like on DOS, Mac, or CD-ROM.
 
 SHORT_NAMES            = NO
 
 # If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
 # will interpret the first line (until the first dot) of a JavaDoc-style
 # comment as the brief description. If set to NO, the JavaDoc
 # comments will behave just like regular Qt-style comments
 # (thus requiring an explicit @brief command for a brief description.)
 
 JAVADOC_AUTOBRIEF      = NO
 
 # If the QT_AUTOBRIEF tag is set to YES then Doxygen will
 # interpret the first line (until the first dot) of a Qt-style
 # comment as the brief description. If set to NO, the comments
 # will behave just like regular Qt-style comments (thus requiring
 # an explicit \brief command for a brief description.)
 
 QT_AUTOBRIEF           = NO
 
 # The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
 # treat a multi-line C++ special comment block (i.e. a block of //! or ///
 # comments) as a brief description. This used to be the default behaviour.
 # The new default is to treat a multi-line C++ comment block as a detailed
 # description. Set this tag to YES if you prefer the old behaviour instead.
 
 MULTILINE_CPP_IS_BRIEF = NO
 
 # If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
 # member inherits the documentation from any documented member that it
 # re-implements.
 
 INHERIT_DOCS           = YES
 
 # If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
 # a new page for each member. If set to NO, the documentation of a member will
 # be part of the file/class/namespace that contains it.
 
 SEPARATE_MEMBER_PAGES  = NO
 
 # The TAB_SIZE tag can be used to set the number of spaces in a tab.
 # Doxygen uses this value to replace tabs by spaces in code fragments.
 
 TAB_SIZE               = 2
 
 # This tag can be used to specify a number of aliases that acts
 # as commands in the documentation. An alias has the form "name=value".
 # For example adding "sideeffect=\par Side Effects:\n" will allow you to
 # put the command \sideeffect (or @sideeffect) in the documentation, which
 # will result in a user-defined paragraph with heading "Side Effects:".
 # You can put \n's in the value part of an alias to insert newlines.
 
 ALIASES                = "FIXME=\par Fix Me's:\n" \
-                         "embmainpage{1}=@US_DOXYGEN_MAIN_PAGE_CMD@" \
-                         "standalone=\if us_standalone" \
-                         "endstandalone=\endif"
+                         "embmainpage{1}=@US_DOXYGEN_MAIN_PAGE_CMD@"
 
 # This tag can be used to specify a number of word-keyword mappings (TCL only).
 # A mapping has the form "name=value". For example adding
 # "class=itcl::class" will allow you to use the command class in the
 # itcl::class meaning.
 
 TCL_SUBST              =
 
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
 # sources only. Doxygen will then generate output that is more tailored for C.
 # For instance, some of the names that are used will be different. The list
 # of all members will be omitted, etc.
 
 OPTIMIZE_OUTPUT_FOR_C  = NO
 
 # Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
 # sources only. Doxygen will then generate output that is more tailored for
 # Java. For instance, namespaces will be presented as packages, qualified
 # scopes will look different, etc.
 
 OPTIMIZE_OUTPUT_JAVA   = NO
 
 # Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
 # sources only. Doxygen will then generate output that is more tailored for
 # Fortran.
 
 OPTIMIZE_FOR_FORTRAN   = NO
 
 # Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
 # sources. Doxygen will then generate output that is tailored for
 # VHDL.
 
 OPTIMIZE_OUTPUT_VHDL   = NO
 
 # Doxygen selects the parser to use depending on the extension of the files it
 # parses. With this tag you can assign which parser to use for a given extension.
 # Doxygen has a built-in mapping, but you can override or extend it using this
 # tag. The format is ext=language, where ext is a file extension, and language
 # is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C,
 # C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make
 # doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
 # (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions
 # you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
 
 EXTENSION_MAPPING      =
 
 # If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
 # comments according to the Markdown format, which allows for more readable
 # documentation. See http://daringfireball.net/projects/markdown/ for details.
 # The output of markdown processing is further processed by doxygen, so you
 # can mix doxygen, HTML, and XML commands with Markdown formatting.
 # Disable only in case of backward compatibilities issues.
 
 MARKDOWN_SUPPORT       = YES
 
 # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
 # to include (a tag file for) the STL sources as input, then you should
 # set this tag to YES in order to let doxygen match functions declarations and
 # definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
 # func(std::string) {}). This also makes the inheritance and collaboration
 # diagrams that involve STL classes more complete and accurate.
 
 BUILTIN_STL_SUPPORT    = YES
 
 # If you use Microsoft's C++/CLI language, you should set this option to YES to
 # enable parsing support.
 
 CPP_CLI_SUPPORT        = NO
 
 # Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
 # Doxygen will parse them like normal C++ but will assume all classes use public
 # instead of private inheritance when no explicit protection keyword is present.
 
 SIP_SUPPORT            = NO
 
 # For Microsoft's IDL there are propget and propput attributes to indicate getter
 # and setter methods for a property. Setting this option to YES (the default)
 # will make doxygen replace the get and set methods by a property in the
 # documentation. This will only work if the methods are indeed getting or
 # setting a simple type. If this is not the case, or you want to show the
 # methods anyway, you should set this option to NO.
 
 IDL_PROPERTY_SUPPORT   = YES
 
 # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
 # tag is set to YES, then doxygen will reuse the documentation of the first
 # member in the group (if any) for the other members of the group. By default
 # all members of a group must be documented explicitly.
 
 DISTRIBUTE_GROUP_DOC   = NO
 
 # Set the SUBGROUPING tag to YES (the default) to allow class member groups of
 # the same type (for instance a group of public functions) to be put as a
 # subgroup of that type (e.g. under the Public Functions section). Set it to
 # NO to prevent subgrouping. Alternatively, this can be done per class using
 # the \nosubgrouping command.
 
 SUBGROUPING            = YES
 
 # When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
 # unions are shown inside the group in which they are included (e.g. using
 # @ingroup) instead of on a separate page (for HTML and Man pages) or
 # section (for LaTeX and RTF).
 
 INLINE_GROUPED_CLASSES = NO
 
 # When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
 # unions with only public data fields will be shown inline in the documentation
 # of the scope in which they are defined (i.e. file, namespace, or group
 # documentation), provided this scope is documented. If set to NO (the default),
 # structs, classes, and unions are shown on a separate page (for HTML and Man
 # pages) or section (for LaTeX and RTF).
 
 INLINE_SIMPLE_STRUCTS  = NO
 
 # When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
 # is documented as struct, union, or enum with the name of the typedef. So
 # typedef struct TypeS {} TypeT, will appear in the documentation as a struct
 # with name TypeT. When disabled the typedef will appear as a member of a file,
 # namespace, or class. And the struct will be named TypeS. This can typically
 # be useful for C code in case the coding convention dictates that all compound
 # types are typedef'ed and only the typedef is referenced, never the tag name.
 
 TYPEDEF_HIDES_STRUCT   = NO
 
 # The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
 # determine which symbols to keep in memory and which to flush to disk.
 # When the cache is full, less often used symbols will be written to disk.
 # For small to medium size projects (<1000 input files) the default value is
 # probably good enough. For larger projects a too small cache size can cause
 # doxygen to be busy swapping symbols to and from disk most of the time
 # causing a significant performance penalty.
 # If the system has enough physical memory increasing the cache will improve the
 # performance by keeping more symbols in memory. Note that the value works on
 # a logarithmic scale so increasing the size by one will roughly double the
 # memory usage. The cache size is given by this formula:
 # 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
 # corresponding to a cache size of 2^16 = 65536 symbols.
 
 SYMBOL_CACHE_SIZE      = 0
 
 # Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be
 # set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given
 # their name and scope. Since this can be an expensive process and often the
 # same symbol appear multiple times in the code, doxygen keeps a cache of
 # pre-resolved symbols. If the cache is too small doxygen will become slower.
 # If the cache is too large, memory is wasted. The cache size is given by this
 # formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0,
 # corresponding to a cache size of 2^16 = 65536 symbols.
 
 LOOKUP_CACHE_SIZE      = 0
 
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
 
 # If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
 # documentation are documented, even if no documentation was available.
 # Private class members and static file members will be hidden unless
 # the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
 
 EXTRACT_ALL            = YES
 
 # If the EXTRACT_PRIVATE tag is set to YES all private members of a class
 # will be included in the documentation.
 
 EXTRACT_PRIVATE        = NO
 
 # If the EXTRACT_PACKAGE tag is set to YES all members with package or internal scope will be included in the documentation.
 
 EXTRACT_PACKAGE        = NO
 
 # If the EXTRACT_STATIC tag is set to YES all static members of a file
 # will be included in the documentation.
 
 EXTRACT_STATIC         = YES
 
 # If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
 # defined locally in source files will be included in the documentation.
 # If set to NO only classes defined in header files are included.
 
 EXTRACT_LOCAL_CLASSES  = NO
 
 # This flag is only useful for Objective-C code. When set to YES local
 # methods, which are defined in the implementation section but not in
 # the interface are included in the documentation.
 # If set to NO (the default) only methods in the interface are included.
 
 EXTRACT_LOCAL_METHODS  = NO
 
 # If this flag is set to YES, the members of anonymous namespaces will be
 # extracted and appear in the documentation as a namespace called
 # 'anonymous_namespace{file}', where file will be replaced with the base
 # name of the file that contains the anonymous namespace. By default
 # anonymous namespaces are hidden.
 
 EXTRACT_ANON_NSPACES   = NO
 
 # If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
 # undocumented members of documented classes, files or namespaces.
 # If set to NO (the default) these members will be included in the
 # various overviews, but no documentation section is generated.
 # This option has no effect if EXTRACT_ALL is enabled.
 
 HIDE_UNDOC_MEMBERS     = NO
 
 # If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
 # undocumented classes that are normally visible in the class hierarchy.
 # If set to NO (the default) these classes will be included in the various
 # overviews. This option has no effect if EXTRACT_ALL is enabled.
 
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
 # friend (class|struct|union) declarations.
 # If set to NO (the default) these declarations will be included in the
 # documentation.
 
 HIDE_FRIEND_COMPOUNDS  = YES
 
 # If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
 # documentation blocks found inside the body of a function.
 # If set to NO (the default) these blocks will be appended to the
 # function's detailed documentation block.
 
 HIDE_IN_BODY_DOCS      = NO
 
 # The INTERNAL_DOCS tag determines if documentation
 # that is typed after a \internal command is included. If the tag is set
 # to NO (the default) then the documentation will be excluded.
 # Set it to YES to include the internal documentation.
 
 INTERNAL_DOCS          = NO
 
 # If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
 # file names in lower-case letters. If set to YES upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
 # and Mac users are advised to set this option to NO.
 
 CASE_SENSE_NAMES       = YES
 
 # If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
 # will show members with their full class and namespace scopes in the
 # documentation. If set to YES the scope will be hidden.
 
 HIDE_SCOPE_NAMES       = NO
 
 # If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
 # will put a list of the files that are included by a file in the documentation
 # of that file.
 
 SHOW_INCLUDE_FILES     = NO
 
 # If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
 # will list include files with double quotes in the documentation
 # rather than with sharp brackets.
 
 FORCE_LOCAL_INCLUDES   = NO
 
 # If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
 # is inserted in the documentation for inline members.
 
 INLINE_INFO            = YES
 
 # If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
 # will sort the (detailed) documentation of file and class members
 # alphabetically by member name. If set to NO the members will appear in
 # declaration order.
 
 SORT_MEMBER_DOCS       = YES
 
 # If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
 # brief documentation of file, namespace and class members alphabetically
 # by member name. If set to NO (the default) the members will appear in
 # declaration order.
 
 SORT_BRIEF_DOCS        = NO
 
 # If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
 # will sort the (brief and detailed) documentation of class members so that
 # constructors and destructors are listed first. If set to NO (the default)
 # the constructors will appear in the respective orders defined by
 # SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
 # This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
 # and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
 
 SORT_MEMBERS_CTORS_1ST = NO
 
 # If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
 # hierarchy of group names into alphabetical order. If set to NO (the default)
 # the group names will appear in their defined order.
 
 SORT_GROUP_NAMES       = NO
 
 # If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
 # sorted by fully-qualified names, including namespaces. If set to
 # NO (the default), the class list will be sorted only by class name,
 # not including the namespace part.
 # Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
 # Note: This option applies only to the class list, not to the
 # alphabetical list.
 
 SORT_BY_SCOPE_NAME     = YES
 
 # If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
 # do proper type resolution of all parameters of a function it will reject a
 # match between the prototype and the implementation of a member function even
 # if there is only one candidate or it is obvious which candidate to choose
 # by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
 # will still accept a match between prototype and implementation in such cases.
 
 STRICT_PROTO_MATCHING  = NO
 
 # The GENERATE_TODOLIST tag can be used to enable (YES) or
 # disable (NO) the todo list. This list is created by putting \todo
 # commands in the documentation.
 
 GENERATE_TODOLIST      = YES
 
 # The GENERATE_TESTLIST tag can be used to enable (YES) or
 # disable (NO) the test list. This list is created by putting \test
 # commands in the documentation.
 
 GENERATE_TESTLIST      = YES
 
 # The GENERATE_BUGLIST tag can be used to enable (YES) or
 # disable (NO) the bug list. This list is created by putting \bug
 # commands in the documentation.
 
 GENERATE_BUGLIST       = YES
 
 # The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
 # disable (NO) the deprecated list. This list is created by putting
 # \deprecated commands in the documentation.
 
 GENERATE_DEPRECATEDLIST= YES
 
 # The ENABLED_SECTIONS tag can be used to enable conditional
 # documentation sections, marked by \if sectionname ... \endif.
 
 ENABLED_SECTIONS       = @US_DOXYGEN_ENABLED_SECTIONS@
 
 # The MAX_INITIALIZER_LINES tag determines the maximum number of lines
 # the initial value of a variable or macro consists of for it to appear in
 # the documentation. If the initializer consists of more lines than specified
 # here it will be hidden. Use a value of 0 to hide initializers completely.
 # The appearance of the initializer of individual variables and macros in the
 # documentation can be controlled using \showinitializer or \hideinitializer
 # command in the documentation regardless of this setting.
 
 MAX_INITIALIZER_LINES  = 0
 
 # Set the SHOW_USED_FILES tag to NO to disable the list of files generated
 # at the bottom of the documentation of classes and structs. If set to YES the
 # list will mention the files that were used to generate the documentation.
 
 SHOW_USED_FILES        = NO
 
 # Set the SHOW_FILES tag to NO to disable the generation of the Files page.
 # This will remove the Files entry from the Quick Index and from the
 # Folder Tree View (if specified). The default is YES.
 
 SHOW_FILES             = NO
 
 # Set the SHOW_NAMESPACES tag to NO to disable the generation of the
 # Namespaces page.
 # This will remove the Namespaces entry from the Quick Index
 # and from the Folder Tree View (if specified). The default is YES.
 
 SHOW_NAMESPACES        = YES
 
 # The FILE_VERSION_FILTER tag can be used to specify a program or script that
 # doxygen should invoke to get the current version for each file (typically from
 # the version control system). Doxygen will invoke the program by executing (via
 # popen()) the command <command> <input-file>, where <command> is the value of
 # the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
 # provided by doxygen. Whatever the program writes to standard output
 # is used as the file version. See the manual for examples.
 
 FILE_VERSION_FILTER    =
 
 # The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
 # by doxygen. The layout file controls the global structure of the generated
 # output files in an output format independent way. The create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option.
 # You can optionally specify a file name after the option, if omitted
 # DoxygenLayout.xml will be used as the name of the layout file.
 
 LAYOUT_FILE            =
 
 # The CITE_BIB_FILES tag can be used to specify one or more bib files
 # containing the references data. This must be a list of .bib files. The
 # .bib extension is automatically appended if omitted. Using this command
 # requires the bibtex tool to be installed. See also
 # http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
 # of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
 # feature you need bibtex and perl available in the search path.
 
 CITE_BIB_FILES         =
 
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
 
 # The QUIET tag can be used to turn on/off the messages that are generated
 # by doxygen. Possible values are YES and NO. If left blank NO is used.
 
 QUIET                  = NO
 
 # The WARNINGS tag can be used to turn on/off the warning messages that are
 # generated by doxygen. Possible values are YES and NO. If left blank
 # NO is used.
 
 WARNINGS               = YES
 
 # If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
 # for undocumented members. If EXTRACT_ALL is set to YES then this flag will
 # automatically be disabled.
 
 WARN_IF_UNDOCUMENTED   = YES
 
 # If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
 # potential errors in the documentation, such as not documenting some
 # parameters in a documented function, or documenting parameters that
 # don't exist or using markup commands wrongly.
 
 WARN_IF_DOC_ERROR      = YES
 
 # The WARN_NO_PARAMDOC option can be enabled to get warnings for
 # functions that are documented, but have no documentation for their parameters
 # or return value. If set to NO (the default) doxygen will only warn about
 # wrong or incomplete parameter documentation, but not about the absence of
 # documentation.
 
 WARN_NO_PARAMDOC       = NO
 
 # The WARN_FORMAT tag determines the format of the warning messages that
 # doxygen can produce. The string should contain the $file, $line, and $text
 # tags, which will be replaced by the file and line number from which the
 # warning originated and the warning text. Optionally the format may contain
 # $version, which will be replaced by the version of the file (if it could
 # be obtained via FILE_VERSION_FILTER)
 
 WARN_FORMAT            = "$file:$line: $text"
 
 # The WARN_LOGFILE tag can be used to specify a file to which warning
 # and error messages should be written. If left blank the output is written
 # to stderr.
 
 WARN_LOGFILE           =
 
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
 
 # The INPUT tag can be used to specify the files and/or directories that contain
 # documented source files. You may enter file names like "myfile.cpp" or
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = @PROJECT_SOURCE_DIR@
+INPUT                  = @PROJECT_SOURCE_DIR@ \
+                         @PROJECT_BINARY_DIR@/include/usConfig.h
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
 # also the default input encoding. Doxygen uses libiconv (or the iconv built
 # into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
 # the list of possible encodings.
 
 INPUT_ENCODING         = UTF-8
 
 # If the value of the INPUT tag contains directories, you can use the
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
 # and *.h) to filter out the source-files in the directories. If left
 # blank the following patterns are tested:
 # *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
 # *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
 # *.f90 *.f *.for *.vhd *.vhdl
 
 FILE_PATTERNS          = *.h \
                          *.dox \
                          *.md
 
 # The RECURSIVE tag can be used to turn specify whether or not subdirectories
 # should be searched for input files as well. Possible values are YES and NO.
 # If left blank NO is used.
 
 RECURSIVE              = YES
 
 # The EXCLUDE tag can be used to specify files and/or directories that should be
 # excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
 EXCLUDE                = @PROJECT_SOURCE_DIR@/README.md \
                          @PROJECT_SOURCE_DIR@/documentation/snippets/ \
                          @PROJECT_SOURCE_DIR@/test/ \
                          @PROJECT_SOURCE_DIR@/gh-pages \
                          @PROJECT_SOURCE_DIR@/.git/
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
 # from the input.
 
 EXCLUDE_SYMLINKS       = NO
 
 # If the value of the INPUT tag contains directories, you can use the
 # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
 # certain files from those directories. Note that the wildcards are matched
 # against the file with absolute path, so to exclude all test directories
 # for example use the pattern */test/*
 
 EXCLUDE_PATTERNS       = */.git/* \
                          *_p.h \
                          *Private.*
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
 # output. The symbol name can be a fully qualified name, a word, or if the
 # wildcard * is used, a substring. Examples: ANamespace, AClass,
 # AClass::ANamespace, ANamespace::*Test
 
 EXCLUDE_SYMBOLS        =
 
 # The EXAMPLE_PATH tag can be used to specify one or more files or
 # directories that contain example code fragments that are included (see
 # the \include command).
 
 EXAMPLE_PATH           = @PROJECT_SOURCE_DIR@/documentation/snippets/
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
 # and *.h) to filter out the source-files in the directories. If left
 # blank all files are included.
 
 EXAMPLE_PATTERNS       =
 
 # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
 # searched for input files to be used with the \include or \dontinclude
 # commands irrespective of the value of the RECURSIVE tag.
 # Possible values are YES and NO. If left blank NO is used.
 
 EXAMPLE_RECURSIVE      = YES
 
 # The IMAGE_PATH tag can be used to specify one or more files or
 # directories that contain image that are included in the documentation (see
 # the \image command).
 
 IMAGE_PATH             =
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
 # by executing (via popen()) the command <filter> <input-file>, where <filter>
 # is the value of the INPUT_FILTER tag, and <input-file> is the name of an
 # input file. Doxygen will then use the output that the filter program writes
 # to standard output.
 # If FILTER_PATTERNS is specified, this tag will be
 # ignored.
 
 INPUT_FILTER           =
 
 # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
 # basis.
 # Doxygen will compare the file name with each pattern and apply the
 # filter if there is a match.
 # The filters are a list of the form:
 # pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
 # info on how filters are used. If FILTER_PATTERNS is empty or if
 # non of the patterns match the file name, INPUT_FILTER is applied.
 
 FILTER_PATTERNS        =
 
 # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
 # INPUT_FILTER) will be used to filter the input files when producing source
 # files to browse (i.e. when SOURCE_BROWSER is set to YES).
 
 FILTER_SOURCE_FILES    = NO
 
 # The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
 # pattern. A pattern will override the setting for FILTER_PATTERN (if any)
 # and it is also possible to disable source filtering for a specific pattern
 # using *.ext= (so without naming a filter). This option only has effect when
 # FILTER_SOURCE_FILES is enabled.
 
 FILTER_SOURCE_PATTERNS =
 
 #---------------------------------------------------------------------------
 # configuration options related to source browsing
 #---------------------------------------------------------------------------
 
 # If the SOURCE_BROWSER tag is set to YES then a list of source files will
 # be generated. Documented entities will be cross-referenced with these sources.
 # Note: To get rid of all source code in the generated output, make sure also
 # VERBATIM_HEADERS is set to NO.
 
 SOURCE_BROWSER         = NO
 
 # Setting the INLINE_SOURCES tag to YES will include the body
 # of functions and classes directly in the documentation.
 
 INLINE_SOURCES         = NO
 
 # Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
 # doxygen to hide any special comment blocks from generated source code
 # fragments. Normal C and C++ comments will always remain visible.
 
 STRIP_CODE_COMMENTS    = YES
 
 # If the REFERENCED_BY_RELATION tag is set to YES
 # then for each documented function all documented
 # functions referencing it will be listed.
 
 REFERENCED_BY_RELATION = YES
 
 # If the REFERENCES_RELATION tag is set to YES
 # then for each documented function all documented entities
 # called/used by that function will be listed.
 
 REFERENCES_RELATION    = YES
 
 # If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
 # and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
 # functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
 # link to the source code.
 # Otherwise they will link to the documentation.
 
 REFERENCES_LINK_SOURCE = YES
 
 # If the USE_HTAGS tag is set to YES then the references to source code
 # will point to the HTML generated by the htags(1) tool instead of doxygen
 # built-in source browser. The htags tool is part of GNU's global source
 # tagging system (see http://www.gnu.org/software/global/global.html). You
 # will need version 4.8.6 or higher.
 
 USE_HTAGS              = NO
 
 # If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
 # will generate a verbatim copy of the header file for each class for
 # which an include is specified. Set to NO to disable this.
 
 VERBATIM_HEADERS       = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
 
 # If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
 # of all compounds will be generated. Enable this if the project
 # contains a lot of classes, structs, unions or interfaces.
 
 ALPHABETICAL_INDEX     = YES
 
 # If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
 # the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
 # in which this list will be split (can be a number in the range [1..20])
 
 COLS_IN_ALPHA_INDEX    = 3
 
 # In case all classes in a project start with a common prefix, all
 # classes will be put under the same header in the alphabetical index.
 # The IGNORE_PREFIX tag can be used to specify one or more prefixes that
 # should be ignored while generating the index headers.
 
 IGNORE_PREFIX          =
 
 #---------------------------------------------------------------------------
 # configuration options related to the HTML output
 #---------------------------------------------------------------------------
 
 # If the GENERATE_HTML tag is set to YES (the default) Doxygen will
 # generate HTML output.
 
 GENERATE_HTML          = YES
 
 # The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `html' will be used as the default path.
 
 HTML_OUTPUT            = @US_DOXYGEN_HTML_OUTPUT@
 
 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for
 # each generated HTML page (for example: .htm,.php,.asp). If it is left blank
 # doxygen will generate files with .html extension.
 
 HTML_FILE_EXTENSION    = .html
 
 # The HTML_HEADER tag can be used to specify a personal HTML header for
 # each generated HTML page. If it is left blank doxygen will generate a
 # standard header. Note that when using a custom header you are responsible
 #  for the proper inclusion of any scripts and style sheets that doxygen
 # needs, which is dependent on the configuration options used.
 # It is advised to generate a default header using "doxygen -w html
 # header.html footer.html stylesheet.css YourConfigFile" and then modify
 # that header. Note that the header is subject to change so you typically
 # have to redo this when upgrading to a newer version of doxygen or when
 # changing the value of configuration settings such as GENERATE_TREEVIEW!
 
 HTML_HEADER            = @US_DOXYGEN_HEADER@
 
 # The HTML_FOOTER tag can be used to specify a personal HTML footer for
 # each generated HTML page. If it is left blank doxygen will generate a
 # standard footer.
 
 HTML_FOOTER            = @US_DOXYGEN_FOOTER@
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading
 # style sheet that is used by each HTML page. It can be used to
 # fine-tune the look of the HTML output. If the tag is left blank doxygen
 # will generate a default style sheet. Note that doxygen will try to copy
 # the style sheet file to the HTML output directory, so don't put your own
 # style sheet in the HTML output directory as well, or it will be erased!
 
 HTML_STYLESHEET        = @US_DOXYGEN_CSS@
 
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note
 # that these files will be copied to the base HTML output directory. Use the
 # $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
 # files. In the HTML_STYLESHEET file, use the file name only. Also note that
 # the files will be copied as-is; there are no commands or markers available.
 
 HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
 # Doxygen will adjust the colors in the style sheet and background images
 # according to this color. Hue is specified as an angle on a colorwheel,
 # see http://en.wikipedia.org/wiki/Hue for more information.
 # For instance the value 0 represents red, 60 is yellow, 120 is green,
 # 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
 # The allowed range is 0 to 359.
 
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
 # the colors in the HTML output. For a value of 0 the output will use
 # grayscales only. A value of 255 will produce the most vivid colors.
 
 HTML_COLORSTYLE_SAT    = 100
 
 # The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
 # the luminance component of the colors in the HTML output. Values below
 # 100 gradually make the output lighter, whereas values above 100 make
 # the output darker. The value divided by 100 is the actual gamma applied,
 # so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
 # and 100 does not change the gamma.
 
 HTML_COLORSTYLE_GAMMA  = 80
 
 # If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
 # page will contain the date and time when the page was generated. Setting
 # this to NO can help when comparing the output of multiple runs.
 
 HTML_TIMESTAMP         = YES
 
 # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
 # files or namespaces will be aligned in HTML using tables. If set to
 # NO a bullet list will be used.
 
 HTML_ALIGN_MEMBERS     = YES
 
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
 # documentation will contain sections that can be hidden and shown after the
 # page has loaded. For this to work a browser that supports
 # JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
 # Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
 
 HTML_DYNAMIC_SECTIONS  = NO
 
 # If the GENERATE_DOCSET tag is set to YES, additional index files
 # will be generated that can be used as input for Apple's Xcode 3
 # integrated development environment, introduced with OSX 10.5 (Leopard).
 # To create a documentation set, doxygen will generate a Makefile in the
 # HTML output directory. Running make will produce the docset in that
 # directory and running "make install" will install the docset in
 # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
 # it at startup.
 # See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
 # for more information.
 
 GENERATE_DOCSET        = NO
 
 # When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
 # feed. A documentation feed provides an umbrella under which multiple
 # documentation sets from a single provider (such as a company or product suite)
 # can be grouped.
 
 DOCSET_FEEDNAME        = "Doxygen generated docs"
 
 # When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
 # should uniquely identify the documentation set bundle. This should be a
 # reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
 # will append .docset to the name.
 
 DOCSET_BUNDLE_ID       = org.doxygen.Project
 
 # When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify
 # the documentation publisher. This should be a reverse domain-name style
 # string, e.g. com.mycompany.MyDocSet.documentation.
 
 DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
 
 # The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
 
 DOCSET_PUBLISHER_NAME  = Publisher
 
 # If the GENERATE_HTMLHELP tag is set to YES, additional index files
 # will be generated that can be used as input for tools like the
 # Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
 # of the generated HTML documentation.
 
 GENERATE_HTMLHELP      = NO
 
 # If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
 # be used to specify the file name of the resulting .chm file. You
 # can add a path in front of the file if the result should not be
 # written to the html output directory.
 
 CHM_FILE               =
 
 # If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
 # be used to specify the location (absolute path including file name) of
 # the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
 # the HTML help compiler on the generated index.hhp.
 
 HHC_LOCATION           =
 
 # If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
 # controls if a separate .chi index file is generated (YES) or that
 # it should be included in the master .chm file (NO).
 
 GENERATE_CHI           = NO
 
 # If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
 # is used to encode HtmlHelp index (hhk), content (hhc) and project file
 # content.
 
 CHM_INDEX_ENCODING     =
 
 # If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
 # controls whether a binary table of contents is generated (YES) or a
 # normal table of contents (NO) in the .chm file.
 
 BINARY_TOC             = NO
 
 # The TOC_EXPAND flag can be set to YES to add extra items for group members
 # to the contents of the HTML help documentation and to the tree view.
 
 TOC_EXPAND             = NO
 
 # If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
 # QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
 # that can be used as input for Qt's qhelpgenerator to generate a
 # Qt Compressed Help (.qch) of the generated HTML documentation.
 
 GENERATE_QHP           = NO
 
 # If the QHG_LOCATION tag is specified, the QCH_FILE tag can
 # be used to specify the file name of the resulting .qch file.
 # The path specified is relative to the HTML output folder.
 
 QCH_FILE               =
 
 # The QHP_NAMESPACE tag specifies the namespace to use when generating
 # Qt Help Project output. For more information please see
 # http://doc.trolltech.com/qthelpproject.html#namespace
 
 QHP_NAMESPACE          =
 
 # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
 # Qt Help Project output. For more information please see
 # http://doc.trolltech.com/qthelpproject.html#virtual-folders
 
 QHP_VIRTUAL_FOLDER     =
 
 # If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
 # add. For more information please see
 # http://doc.trolltech.com/qthelpproject.html#custom-filters
 
 QHP_CUST_FILTER_NAME   =
 
 # The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
 # custom filter to add. For more information please see
 # <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
 # Qt Help Project / Custom Filters</a>.
 
 QHP_CUST_FILTER_ATTRS  =
 
 # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
 # project's
 # filter section matches.
 # <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
 # Qt Help Project / Filter Attributes</a>.
 
 QHP_SECT_FILTER_ATTRS  =
 
 # If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
 # be used to specify the location of Qt's qhelpgenerator.
 # If non-empty doxygen will try to run qhelpgenerator on the generated
 # .qhp file.
 
 QHG_LOCATION           =
 
 # If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
 #  will be generated, which together with the HTML files, form an Eclipse help
 # plugin. To install this plugin and make it available under the help contents
 # menu in Eclipse, the contents of the directory containing the HTML and XML
 # files needs to be copied into the plugins directory of eclipse. The name of
 # the directory within the plugins directory should be the same as
 # the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
 # the help appears.
 
 GENERATE_ECLIPSEHELP   = NO
 
 # A unique identifier for the eclipse help plugin. When installing the plugin
 # the directory name containing the HTML and XML files should also have
 # this name.
 
 ECLIPSE_DOC_ID         = org.doxygen.Project
 
 # The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
 # at top of each HTML page. The value NO (the default) enables the index and
 # the value YES disables it. Since the tabs have the same information as the
 # navigation tree you can set this option to NO if you already set
 # GENERATE_TREEVIEW to YES.
 
 DISABLE_INDEX          = NO
 
 # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
 # structure should be generated to display hierarchical information.
 # If the tag value is set to YES, a side panel will be generated
 # containing a tree-like index structure (just like the one that
 # is generated for HTML Help). For this to work a browser that supports
 # JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
 # Windows users are probably better off using the HTML help feature.
 # Since the tree basically has the same information as the tab index you
 # could consider to set DISABLE_INDEX to NO when enabling this option.
 
 GENERATE_TREEVIEW      = NO
 
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
 # (range [0,1..20]) that doxygen will group on one line in the generated HTML
 # documentation. Note that a value of 0 will completely suppress the enum
 # values from appearing in the overview section.
 
 ENUM_VALUES_PER_LINE   = 4
 
 # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
 # used to set the initial width (in pixels) of the frame in which the tree
 # is shown.
 
 TREEVIEW_WIDTH         = 300
 
 # When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
 # links to external symbols imported via tag files in a separate window.
 
 EXT_LINKS_IN_WINDOW    = NO
 
 # Use this tag to change the font size of Latex formulas included
 # as images in the HTML documentation. The default is 10. Note that
 # when you change the font size after a successful doxygen run you need
 # to manually remove any form_*.png images from the HTML output directory
 # to force them to be regenerated.
 
 FORMULA_FONTSIZE       = 10
 
 # Use the FORMULA_TRANPARENT tag to determine whether or not the images
 # generated for formulas are transparent PNGs. Transparent PNGs are
 # not supported properly for IE 6.0, but are supported on all modern browsers.
 # Note that when changing this option you need to delete any form_*.png files
 # in the HTML output before the changes have effect.
 
 FORMULA_TRANSPARENT    = YES
 
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
 # (see http://www.mathjax.org) which uses client side Javascript for the
 # rendering instead of using prerendered bitmaps. Use this if you do not
 # have LaTeX installed or if you want to formulas look prettier in the HTML
 # output. When enabled you may also need to install MathJax separately and
 # configure the path to it using the MATHJAX_RELPATH option.
 
 USE_MATHJAX            = NO
 
 # When MathJax is enabled you need to specify the location relative to the
 # HTML output directory using the MATHJAX_RELPATH option. The destination
 # directory should contain the MathJax.js script. For instance, if the mathjax
 # directory is located at the same level as the HTML output directory, then
 # MATHJAX_RELPATH should be ../mathjax. The default value points to
 # the MathJax Content Delivery Network so you can quickly see the result without
 # installing MathJax.
 # However, it is strongly recommended to install a local
 # copy of MathJax from http://www.mathjax.org before deployment.
 
 MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
 # names that should be enabled during MathJax rendering.
 
 MATHJAX_EXTENSIONS     =
 
 # When the SEARCHENGINE tag is enabled doxygen will generate a search box
 # for the HTML output. The underlying search engine uses javascript
 # and DHTML and should work on any modern browser. Note that when using
 # HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
 # (GENERATE_DOCSET) there is already a search function so this one should
 # typically be disabled. For large projects the javascript based search engine
 # can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
 
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
 # implemented using a PHP enabled web server instead of at the web client
 # using Javascript. Doxygen will generate the search PHP script and index
 # file to put on the web server. The advantage of the server
 # based approach is that it scales better to large projects and allows
 # full text search. The disadvantages are that it is more difficult to setup
 # and does not have live searching capabilities.
 
 SERVER_BASED_SEARCH    = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
 
 # If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
 # generate Latex output.
 
 GENERATE_LATEX         = NO
 
 # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `latex' will be used as the default path.
 
 LATEX_OUTPUT           = latex
 
 # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
 # invoked. If left blank `latex' will be used as the default command name.
 # Note that when enabling USE_PDFLATEX this option is only used for
 # generating bitmaps for formulas in the HTML output, but not in the
 # Makefile that is written to the output directory.
 
 LATEX_CMD_NAME         = latex
 
 # The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
 # generate index for LaTeX. If left blank `makeindex' will be used as the
 # default command name.
 
 MAKEINDEX_CMD_NAME     = makeindex
 
 # If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
 # LaTeX documents. This may be useful for small projects and may help to
 # save some trees in general.
 
 COMPACT_LATEX          = NO
 
 # The PAPER_TYPE tag can be used to set the paper type that is used
 # by the printer. Possible values are: a4, letter, legal and
 # executive. If left blank a4wide will be used.
 
 PAPER_TYPE             = a4wide
 
 # The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
 # packages that should be included in the LaTeX output.
 
 EXTRA_PACKAGES         = amssymb
 
 # The LATEX_HEADER tag can be used to specify a personal LaTeX header for
 # the generated latex document. The header should contain everything until
 # the first chapter. If it is left blank doxygen will generate a
 # standard header. Notice: only use this tag if you know what you are doing!
 
 LATEX_HEADER           =
 
 # The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
 # the generated latex document. The footer should contain everything after
 # the last chapter. If it is left blank doxygen will generate a
 # standard footer. Notice: only use this tag if you know what you are doing!
 
 LATEX_FOOTER           =
 
 # If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
 # is prepared for conversion to pdf (using ps2pdf). The pdf file will
 # contain links (just like the HTML output) instead of page references
 # This makes the output suitable for online browsing using a pdf viewer.
 
 PDF_HYPERLINKS         = NO
 
 # If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
 # plain latex in the generated Makefile. Set this option to YES to get a
 # higher quality PDF documentation.
 
 USE_PDFLATEX           = NO
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
 # command to the generated LaTeX files. This will instruct LaTeX to keep
 # running if errors occur, instead of asking the user for help.
 # This option is also used when generating formulas in HTML.
 
 LATEX_BATCHMODE        = NO
 
 # If LATEX_HIDE_INDICES is set to YES then doxygen will not
 # include the index chapters (such as File Index, Compound Index, etc.)
 # in the output.
 
 LATEX_HIDE_INDICES     = NO
 
 # If LATEX_SOURCE_CODE is set to YES then doxygen will include
 # source code with syntax highlighting in the LaTeX output.
 # Note that which sources are shown also depends on other settings
 # such as SOURCE_BROWSER.
 
 LATEX_SOURCE_CODE      = NO
 
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
 # http://en.wikipedia.org/wiki/BibTeX for more info.
 
 LATEX_BIB_STYLE        = plain
 
 #---------------------------------------------------------------------------
 # configuration options related to the RTF output
 #---------------------------------------------------------------------------
 
 # If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
 # The RTF output is optimized for Word 97 and may not look very pretty with
 # other RTF readers or editors.
 
 GENERATE_RTF           = NO
 
 # The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `rtf' will be used as the default path.
 
 RTF_OUTPUT             = rtf
 
 # If the COMPACT_RTF tag is set to YES Doxygen generates more compact
 # RTF documents. This may be useful for small projects and may help to
 # save some trees in general.
 
 COMPACT_RTF            = NO
 
 # If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
 # will contain hyperlink fields. The RTF file will
 # contain links (just like the HTML output) instead of page references.
 # This makes the output suitable for online browsing using WORD or other
 # programs which support those fields.
 # Note: wordpad (write) and others do not support links.
 
 RTF_HYPERLINKS         = NO
 
 # Load style sheet definitions from file. Syntax is similar to doxygen's
 # config file, i.e. a series of assignments. You only have to provide
 # replacements, missing definitions are set to their default value.
 
 RTF_STYLESHEET_FILE    =
 
 # Set optional variables used in the generation of an rtf document.
 # Syntax is similar to doxygen's config file.
 
 RTF_EXTENSIONS_FILE    =
 
 #---------------------------------------------------------------------------
 # configuration options related to the man page output
 #---------------------------------------------------------------------------
 
 # If the GENERATE_MAN tag is set to YES (the default) Doxygen will
 # generate man pages
 
 GENERATE_MAN           = NO
 
 # The MAN_OUTPUT tag is used to specify where the man pages will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `man' will be used as the default path.
 
 MAN_OUTPUT             = man
 
 # The MAN_EXTENSION tag determines the extension that is added to
 # the generated man pages (default is the subroutine's section .3)
 
 MAN_EXTENSION          = .3
 
 # If the MAN_LINKS tag is set to YES and Doxygen generates man output,
 # then it will generate one additional man file for each entity
 # documented in the real man page(s). These additional files
 # only source the real man page, but without them the man command
 # would be unable to find the correct page. The default is NO.
 
 MAN_LINKS              = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the XML output
 #---------------------------------------------------------------------------
 
 # If the GENERATE_XML tag is set to YES Doxygen will
 # generate an XML file that captures the structure of
 # the code including all documentation.
 
 GENERATE_XML           = NO
 
 # The XML_OUTPUT tag is used to specify where the XML pages will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `xml' will be used as the default path.
 
 XML_OUTPUT             = xml
 
 # The XML_SCHEMA tag can be used to specify an XML schema,
 # which can be used by a validating XML parser to check the
 # syntax of the XML files.
 
 XML_SCHEMA             =
 
 # The XML_DTD tag can be used to specify an XML DTD,
 # which can be used by a validating XML parser to check the
 # syntax of the XML files.
 
 XML_DTD                =
 
 # If the XML_PROGRAMLISTING tag is set to YES Doxygen will
 # dump the program listings (including syntax highlighting
 # and cross-referencing information) to the XML output. Note that
 # enabling this will significantly increase the size of the XML output.
 
 XML_PROGRAMLISTING     = YES
 
 #---------------------------------------------------------------------------
 # configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
 
 # If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
 # generate an AutoGen Definitions (see autogen.sf.net) file
 # that captures the structure of the code including all
 # documentation. Note that this feature is still experimental
 # and incomplete at the moment.
 
 GENERATE_AUTOGEN_DEF   = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the Perl module output
 #---------------------------------------------------------------------------
 
 # If the GENERATE_PERLMOD tag is set to YES Doxygen will
 # generate a Perl module file that captures the structure of
 # the code including all documentation. Note that this
 # feature is still experimental and incomplete at the
 # moment.
 
 GENERATE_PERLMOD       = NO
 
 # If the PERLMOD_LATEX tag is set to YES Doxygen will generate
 # the necessary Makefile rules, Perl scripts and LaTeX code to be able
 # to generate PDF and DVI output from the Perl module output.
 
 PERLMOD_LATEX          = NO
 
 # If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
 # nicely formatted so it can be parsed by a human reader.
 # This is useful
 # if you want to understand what is going on.
 # On the other hand, if this
 # tag is set to NO the size of the Perl module output will be much smaller
 # and Perl will parse it just the same.
 
 PERLMOD_PRETTY         = YES
 
 # The names of the make variables in the generated doxyrules.make file
 # are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
 # This is useful so different doxyrules.make files included by the same
 # Makefile don't overwrite each other's variables.
 
 PERLMOD_MAKEVAR_PREFIX =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 
 # If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
 # evaluate all C-preprocessor directives found in the sources and include
 # files.
 
 ENABLE_PREPROCESSING   = YES
 
 # If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
 # names in the source code. If set to NO (the default) only conditional
 # compilation will be performed. Macro expansion can be done in a controlled
 # way by setting EXPAND_ONLY_PREDEF to YES.
 
 MACRO_EXPANSION        = YES
 
 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
 # then the macro expansion is limited to the macros specified with the
 # PREDEFINED and EXPAND_AS_DEFINED tags.
 
 EXPAND_ONLY_PREDEF     = YES
 
 # If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
 # pointed to by INCLUDE_PATH will be searched when a #include is found.
 
 SEARCH_INCLUDES        = YES
 
 # The INCLUDE_PATH tag can be used to specify one or more directories that
 # contain include files that are not input files but should be processed by
 # the preprocessor.
 
 INCLUDE_PATH           = @PROJECT_BINARY_DIR@/include/
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
 # patterns (like *.h and *.hpp) to filter out the header-files in the
 # directories. If left blank, the patterns specified with FILE_PATTERNS will
 # be used.
 
 INCLUDE_FILE_PATTERNS  = *.h
 
 # The PREDEFINED tag can be used to specify one or more macro names that
 # are defined before the preprocessor is started (similar to the -D option of
 # gcc). The argument of the tag is a list of macros of the form: name
 # or name=definition (no spaces). If the definition and the = are
 # omitted =1 is assumed. To prevent a macro definition from being
 # undefined via #undef or recursively expanded use the := operator
 # instead of the = operator.
 
 PREDEFINED             = US_PREPEND_NAMESPACE(x)=x \
                          US_BEGIN_NAMESPACE= \
                          US_END_NAMESPACE= \
                          "US_BASECLASS_NAME=@US_BASECLASS_NAME@" \
                          US_EXPORT=
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
 # this tag can be used to specify a list of macro names that should be expanded.
 # The macro definition that is found in the sources will be used.
 # Use the PREDEFINED tag if you want to use a different macro definition that
 # overrules the definition found in the source code.
 
 EXPAND_AS_DEFINED      =
 
 # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
 # doxygen's preprocessor will remove all references to function-like macros
 # that are alone on a line, have an all uppercase name, and do not end with a
 # semicolon, because these will confuse the parser if not removed.
 
 SKIP_FUNCTION_MACROS   = YES
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
 # The TAGFILES option can be used to specify one or more tagfiles. For each
 # tag file the location of the external documentation should be added. The
 # format of a tag file without this location is as follows:
 #
 # TAGFILES = file1 file2 ...
 # Adding location for the tag files is done as follows:
 #
 # TAGFILES = file1=loc1 "file2 = loc2" ...
 # where "loc1" and "loc2" can be relative or absolute paths
 # or URLs. Note that each tag file must have a unique name (where the name does
 # NOT include the path). If a tag file is not located in the directory in which
 # doxygen is run, you must also specify the path to the tagfile here.
 
 TAGFILES               =
 
 # When a file name is specified after GENERATE_TAGFILE, doxygen will create
 # a tag file that is based on the input files it reads.
 
 GENERATE_TAGFILE       =
 
 # If the ALLEXTERNALS tag is set to YES all external classes will be listed
 # in the class index. If set to NO only the inherited external classes
 # will be listed.
 
 ALLEXTERNALS           = NO
 
 # If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
 # in the modules index. If set to NO, only the current project's groups will
 # be listed.
 
 EXTERNAL_GROUPS        = NO
 
 # The PERL_PATH should be the absolute path and name of the perl script
 # interpreter (i.e. the result of `which perl').
 
 PERL_PATH              = /usr/bin/perl
 
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 
 # If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
 # generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
 # or super classes. Setting the tag to NO turns the diagrams off. Note that
 # this option also works with HAVE_DOT disabled, but it is recommended to
 # install and use dot, since it yields more powerful graphs.
 
 CLASS_DIAGRAMS         = YES
 
 # You can define message sequence charts within doxygen comments using the \msc
 # command. Doxygen will then run the mscgen tool (see
 # http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
 # documentation. The MSCGEN_PATH tag allows you to specify the directory where
 # the mscgen tool resides. If left empty the tool is assumed to be found in the
 # default search path.
 
 MSCGEN_PATH            =
 
 # If set to YES, the inheritance and collaboration graphs will hide
 # inheritance and usage relations if the target is undocumented
 # or is not a class.
 
 HIDE_UNDOC_RELATIONS   = YES
 
 # If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
 # available from the path. This tool is part of Graphviz, a graph visualization
 # toolkit from AT&T and Lucent Bell Labs. The other options in this section
 # have no effect if this option is set to NO (the default)
 
 HAVE_DOT               = @US_HAVE_DOT@
 
 # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
 # allowed to run in parallel. When set to 0 (the default) doxygen will
 # base this on the number of processors available in the system. You can set it
 # explicitly to a value larger than 0 to get control over the balance
 # between CPU load and processing speed.
 
 DOT_NUM_THREADS        = @US_DOXYGEN_DOT_NUM_THREADS@
 
 # By default doxygen will use the Helvetica font for all dot files that
 # doxygen generates. When you want a differently looking font you can specify
 # the font name using DOT_FONTNAME. You need to make sure dot is able to find
 # the font, which can be done by putting it in a standard location or by setting
 # the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
 # directory containing the font.
 
 DOT_FONTNAME           = FreeSans.ttf
 
 # The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
 # The default size is 10pt.
 
 DOT_FONTSIZE           = 10
 
 # By default doxygen will tell dot to use the Helvetica font.
 # If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
 # set the path where dot can find it.
 
 DOT_FONTPATH           =
 
 # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
 # will generate a graph for each documented class showing the direct and
 # indirect inheritance relations. Setting this tag to YES will force the
 # CLASS_DIAGRAMS tag to NO.
 
 CLASS_GRAPH            = YES
 
 # If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
 # will generate a graph for each documented class showing the direct and
 # indirect implementation dependencies (inheritance, containment, and
 # class references variables) of the class with other documented classes.
 
 COLLABORATION_GRAPH    = YES
 
 # If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
 # will generate a graph for groups, showing the direct groups dependencies
 
 GROUP_GRAPHS           = YES
 
 # If the UML_LOOK tag is set to YES doxygen will generate inheritance and
 # collaboration diagrams in a style similar to the OMG's Unified Modeling
 # Language.
 
 UML_LOOK               = NO
 
 # If the UML_LOOK tag is enabled, the fields and methods are shown inside
 # the class node. If there are many fields or methods and many nodes the
 # graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
 # threshold limits the number of items for each type to make the size more
 # managable. Set this to 0 for no limit. Note that the threshold may be
 # exceeded by 50% before the limit is enforced.
 
 UML_LIMIT_NUM_FIELDS   = 10
 
 # If set to YES, the inheritance and collaboration graphs will show the
 # relations between templates and their instances.
 
 TEMPLATE_RELATIONS     = YES
 
 # If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
 # tags are set to YES then doxygen will generate a graph for each documented
 # file showing the direct and indirect include dependencies of the file with
 # other documented files.
 
 INCLUDE_GRAPH          = NO
 
 # If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
 # HAVE_DOT tags are set to YES then doxygen will generate a graph for each
 # documented header file showing the documented files that directly or
 # indirectly include this file.
 
 INCLUDED_BY_GRAPH      = NO
 
 # If the CALL_GRAPH and HAVE_DOT options are set to YES then
 # doxygen will generate a call dependency graph for every global function
 # or class method. Note that enabling this option will significantly increase
 # the time of a run. So in most cases it will be better to enable call graphs
 # for selected functions only using the \callgraph command.
 
 CALL_GRAPH             = NO
 
 # If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
 # doxygen will generate a caller dependency graph for every global function
 # or class method. Note that enabling this option will significantly increase
 # the time of a run. So in most cases it will be better to enable caller
 # graphs for selected functions only using the \callergraph command.
 
 CALLER_GRAPH           = NO
 
 # If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
 # will generate a graphical hierarchy of all classes instead of a textual one.
 
 GRAPHICAL_HIERARCHY    = NO
 
 # If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES
 # then doxygen will show the dependencies a directory has on other directories
 # in a graphical way. The dependency relations are determined by the #include
 # relations between the files in the directories.
 
 DIRECTORY_GRAPH        = NO
 
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
 # generated by dot. Possible values are svg, png, jpg, or gif.
 # If left blank png will be used. If you choose svg you need to set
 # HTML_FILE_EXTENSION to xhtml in order to make the SVG files
 # visible in IE 9+ (other browsers do not have this requirement).
 
 DOT_IMAGE_FORMAT       = png
 
 # If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
 # enable generation of interactive SVG images that allow zooming and panning.
 # Note that this requires a modern browser other than Internet Explorer.
 # Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
 # need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
 # visible. Older versions of IE do not have SVG support.
 
 INTERACTIVE_SVG        = NO
 
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found in the path.
 
 DOT_PATH               = @US_DOXYGEN_DOT_PATH@
 
 # The DOTFILE_DIRS tag can be used to specify one or more directories that
 # contain dot files that are included in the documentation (see the
 # \dotfile command).
 
 DOTFILE_DIRS           =
 
 # The MSCFILE_DIRS tag can be used to specify one or more directories that
 # contain msc files that are included in the documentation (see the
 # \mscfile command).
 
 MSCFILE_DIRS           =
 
 # The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
 # nodes that will be shown in the graph. If the number of nodes in a graph
 # becomes larger than this value, doxygen will truncate the graph, which is
 # visualized by representing a node as a red box. Note that doxygen if the
 # number of direct children of the root node in a graph is already larger than
 # DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
 # that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
 
 DOT_GRAPH_MAX_NODES    = 50
 
 # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
 # graphs generated by dot. A depth value of 3 means that only nodes reachable
 # from the root by following a path via at most 3 edges will be shown. Nodes
 # that lay further from the root node will be omitted. Note that setting this
 # option to 1 or 2 may greatly reduce the computation time needed for large
 # code bases. Also note that the size of a graph can be further restricted by
 # DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
 
 MAX_DOT_GRAPH_DEPTH    = 0
 
 # Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
 # background. This is disabled by default, because dot on Windows does not
 # seem to support this out of the box. Warning: Depending on the platform used,
 # enabling this option may lead to badly anti-aliased labels on the edges of
 # a graph (i.e. they become hard to read).
 
 DOT_TRANSPARENT        = NO
 
 # Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
 # files in one run (i.e. multiple -o and -T options on the command line). This
 # makes dot run faster, but since only newer versions of dot (>1.8.10)
 # support this, this feature is disabled by default.
 
 DOT_MULTI_TARGETS      = NO
 
 # If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
 # generate a legend page explaining the meaning of the various boxes and
 # arrows in the dot generated graphs.
 
 GENERATE_LEGEND        = YES
 
 # If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
 # remove the intermediate dot files that are used to generate
 # the various graphs.
 
 DOT_CLEANUP            = YES
diff --git a/Core/Code/CppMicroServices/documentation/doxygen/MicroServices.dox b/Core/Code/CppMicroServices/documentation/doxygen/MicroServices.dox
index 6da53ccf88..5d2fdb9cdd 100644
--- a/Core/Code/CppMicroServices/documentation/doxygen/MicroServices.dox
+++ b/Core/Code/CppMicroServices/documentation/doxygen/MicroServices.dox
@@ -1,69 +1,80 @@
 
 /**
 
 \defgroup MicroServices Micro Services Classes
 
 \brief This category includes classes related to the C++ Micro Services component.
 
 The C++ Micro Services component provides a dynamic service registry based on the service layer
 as specified in the OSGi R4.2 specifications.
 
 */
 
 /**
 
 \defgroup MicroServicesUtils Utility Classes
 
 \brief This category includes utility classes which can be used by others.
 
 */
 
 /**
 
 \page MicroServices_Examples Examples
 
 This is a list of available examples:
 
 - \subpage MicroServices_DictionaryService
 
 */
 
 /**
 
 \page MicroServices_Tutorials Tutorials
 
 This is a list of available tutorials:
 
 - \subpage MicroServices_TheModuleContext
 - \subpage MicroServices_EmulateSingleton
 
 */
 
 /**
 
 \embmainpage{MicroServices_Overview} The C++ Micro Services
 
 The C++ Micro Services component provides a dynamic service registry based on the service layer
 as specified in the OSGi R4.2 specifications. It enables users to realize a service oriented
 approach within their software stack. The advantages include higher reuse of components, looser
 coupling, better organization of responsibilities, cleaner API contracts, etc.
 
-\standalone
-\section MainPage_BI Build Instructions
+\if us_standalone
+\section MicroServices_Overview_BI Build Instructions
 
 How to build the C++ Micro Services library is explained in detail on the \ref BuildInstructions page.
-\endstandalone
+\endif
 
-\section Examples
+<h1>Examples</h1>
+
+\if us_standalone
+Here is a list of \ref MicroServices_Examples "examples":
+\else
+Here is a list of \subpage MicroServices_Examples "examples":
+\endif
 
 - \ref MicroServices_DictionaryService
 
-\section Tutorials
+<h1>Tutorials</h1>
 
-Following is a list of use cases and common patterns
+The following list contains use cases and common patterns in the form of
+\if us_standalone
+\ref MicroServices_Tutorials "tutorials":
+\else
+\subpage MicroServices_Tutorials "tutorials":
+\endif
 
 - \ref MicroServices_TheModuleContext
 - \ref MicroServices_EmulateSingleton
 
 
 */
diff --git a/Core/Code/CppMicroServices/documentation/doxygen/MicroServices_Debugging.dox b/Core/Code/CppMicroServices/documentation/doxygen/MicroServices_Debugging.dox
new file mode 100644
index 0000000000..9e3c9ed92e
--- /dev/null
+++ b/Core/Code/CppMicroServices/documentation/doxygen/MicroServices_Debugging.dox
@@ -0,0 +1,69 @@
+
+/**
+ * \ingroup MicroServicesUtils
+ *
+ * \enum MsgType
+ * This enum describes the messages that can be sent to a message handler (MsgHandler).
+ * You can use the enum to identify and associate the various message types with the
+ * appropriate actions.
+ */
+ 
+/**
+ * \ingroup MicroServicesUtils
+ *
+ * \var MsgType DebugMsg
+ * A debug message.
+ */
+ 
+/**
+ * \ingroup MicroServicesUtils
+ *
+ * \var MsgType InfoMsg
+ * An informational message.
+ */
+ 
+/**
+ * \ingroup MicroServicesUtils
+ *
+ * \var MsgType WarningMsg
+ * A warning message.
+ */
+ 
+/**
+ * \ingroup MicroServicesUtils
+ *
+ * \var MsgType ErrorMsg
+ * An error message.
+ */
+ 
+/**
+ * \ingroup MicroServicesUtils
+ *
+ * \typedef MsgHandler
+ * A message handler callback function.
+ */
+ 
+/**
+ * \ingroup MicroServicesUtils
+ *
+ * \fn MsgHandler installMsgHandler(MsgHandler)
+ * \brief Installs a message handler which has been defined previously.
+ *
+ * Returns a pointer to the previous message handler (which may be 0).
+ *
+ * The message handler is a function that prints out debug messages, warnings,
+ * and fatal error messages. The C++ Micro Services library (debug mode) contains
+ * warning messages that are printed when internal errors (usually invalid function
+ * arguments) occur. The library built in release mode also contains such warnings
+ * unless US_NO_WARNING_OUTPUT and/or US_NO_DEBUG_OUTPUT have been set during
+ * compilation. If you implement your own message handler, you get total control of
+ * these messages.
+ *
+ * The default message handler prints the message to the standard output. If it is
+ * an error message, the application aborts immediately.
+ *
+ * Only one message handler can be defined, since this is usually done on an
+ * application-wide basis to control debug output.
+ *
+ * To restore the message handler, call installMsgHandler(0).
+ */
diff --git a/Core/Code/CppMicroServices/src/CMakeLists.txt b/Core/Code/CppMicroServices/src/CMakeLists.txt
index e74ca24272..b9d2c64ec5 100644
--- a/Core/Code/CppMicroServices/src/CMakeLists.txt
+++ b/Core/Code/CppMicroServices/src/CMakeLists.txt
@@ -1,164 +1,163 @@
 #-----------------------------------------------------------------------------
 # US source files
 #-----------------------------------------------------------------------------
 
 set(_srcs
   util/usAny.cpp
   util/usThreads.cpp
   util/usUtils.cpp
 
   service/usLDAPExpr.cpp
   service/usLDAPFilter.cpp
   service/usServiceException.cpp
   service/usServiceEvent.cpp
   service/usServiceListenerEntry.cpp
   service/usServiceListenerEntry_p.h
   service/usServiceListeners.cpp
   service/usServiceListeners_p.h
   service/usServiceProperties.cpp
   service/usServiceReference.cpp
   service/usServiceReferencePrivate.cpp
   service/usServiceRegistration.cpp
   service/usServiceRegistrationPrivate.cpp
   service/usServiceRegistry.cpp
   service/usServiceRegistry_p.h
 
   module/usCoreModuleContext_p.h
   module/usCoreModuleContext.cpp
   module/usModuleContext.cpp
   module/usModule.cpp
   module/usModuleEvent.cpp
   module/usModuleInfo.cpp
   module/usModulePrivate.cpp
   module/usModuleRegistry.cpp
   module/usModuleUtils.cpp
   module/usModuleVersion.cpp
 )
 
 set(_private_headers
   util/usAtomicInt_p.h
-  util/usExportMacros_p.h
   util/usFunctor_p.h
   util/usStaticInit_p.h
   util/usThreads_p.h
   util/usUtils_p.h
   
   service/usServiceTracker.tpp
   service/usServiceTrackerPrivate.h
   service/usServiceTrackerPrivate.tpp
   service/usTrackedService_p.h
   service/usTrackedServiceListener_p.h
   service/usTrackedService.tpp
   
   module/usModuleAbstractTracked_p.h
   module/usModuleAbstractTracked.tpp
   module/usModuleUtils_p.h
 )
 
 set(_public_headers
   util/usAny.h
   util/usSharedData.h
   
   service/usLDAPFilter.h
   service/usServiceEvent.h
   service/usServiceException.h
   service/usServiceInterface.h
   service/usServiceProperties.h
   service/usServiceReference.h
   service/usServiceRegistration.h
   service/usServiceTracker.h
   service/usServiceTrackerCustomizer.h
   
   module/usGetModuleContext.h
   module/usModule.h
   module/usModuleActivator.h
   module/usModuleContext.h
   module/usModuleEvent.h
   module/usModuleInfo.h
   module/usModuleInitialization.h
   module/usModuleRegistry.h
   module/usModuleVersion.h
 )
 
 if(_us_baseclass_default)
   list(APPEND _public_headers util/usBase.h)
 endif()
 
 if(US_ENABLE_SERVICE_FACTORY_SUPPORT)
   list(APPEND _public_headers service/usServiceFactory.h)
 endif()
 
 if(US_IS_EMBEDDED)
   set(US_SOURCES )
   get_filename_component(_path_prefix "${PROJECT_SOURCE_DIR}" NAME)
   set(_path_prefix "${_path_prefix}/src")
   foreach(_src ${_srcs} ${_public_headers} ${_private_headers})
     list(APPEND US_SOURCES ${_path_prefix}/${_src})
   endforeach()
   set(US_SOURCES ${US_SOURCES} PARENT_SCOPE)
 endif()
 
 #-----------------------------------------------------------------------------
 # Create library (only if not in embedded mode)
 #-----------------------------------------------------------------------------
 
 if(NOT US_IS_EMBEDDED)
   include_directories(${US_INTERNAL_INCLUDE_DIRS})
   if(US_LINK_DIRS)
     link_directories(${US_LINK_DIRS})
   endif()
 
   if(US_BUILD_SHARED_LIBS)
     usFunctionGenerateModuleInit(_srcs NAME ${PROJECT_NAME} VERSION "0.9.0")
   endif()
 
   add_library(${PROJECT_NAME} ${_srcs} ${_public_headers} ${_private_headers})
   set_property(TARGET ${PROJECT_NAME} PROPERTY FRAMEWORK 1)
   if(US_LINK_LIBRARIES)
     target_link_libraries(${PROJECT_NAME} ${US_LINK_LIBRARIES})
   endif()
 endif()
 
 #-----------------------------------------------------------------------------
 # Configure public header wrappers
 #-----------------------------------------------------------------------------
 
 set(US_PUBLIC_HEADERS ${_public_headers})
 if(US_HEADER_PREFIX)
   set(US_PUBLIC_HEADERS )
   foreach(_public_header ${_public_headers})
     get_filename_component(_public_header_basename ${_public_header} NAME_WE)
     set(_us_public_header ${_public_header_basename}.h)
     string(SUBSTRING "${_public_header_basename}" 2 -1 _public_header_basename)
     set(_header_wrapper "${PROJECT_BINARY_DIR}/include/${US_HEADER_PREFIX}${_public_header_basename}.h")
     configure_file(${PROJECT_SOURCE_DIR}/CMake/usPublicHeaderWrapper.h.in ${_header_wrapper} @ONLY)
     list(APPEND US_PUBLIC_HEADERS ${_header_wrapper})
   endforeach()
 endif()
 
 foreach(_header ${_public_headers} ${_private_headers})
   get_filename_component(_header_name "${_header}" NAME)
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${_header} "${PROJECT_BINARY_DIR}/include/${_header_name}")
 endforeach()
 
 if(NOT US_IS_EMBEDDED)
   set_property(TARGET ${PROJECT_NAME} PROPERTY PUBLIC_HEADER ${US_PUBLIC_HEADERS} ${us_config_h_file})
   set_property(TARGET ${PROJECT_NAME} PROPERTY PRIVATE_HEADER ${_private_headers})
 else()
   set(US_PUBLIC_HEADERS ${US_PUBLIC_HEADERS} PARENT_SCOPE)
   set(US_PRIVATE_HEADERS ${US_PRIVATE_HEADERS} PARENT_SCOPE)
 endif()
 
 #-----------------------------------------------------------------------------
 # Install support (only if not in embedded mode)
 #-----------------------------------------------------------------------------
 
 if(NOT US_IS_EMBEDDED)
   install(TARGETS ${PROJECT_NAME} FRAMEWORK DESTINATION .
                                   RUNTIME DESTINATION bin
                                   LIBRARY DESTINATION lib
                                   ARCHIVE DESTINATION lib 
                                   PUBLIC_HEADER DESTINATION include
                                   PRIVATE_HEADER DESTINATION include)
 endif()
 
diff --git a/Core/Code/CppMicroServices/src/module/usGetModuleContext.h b/Core/Code/CppMicroServices/src/module/usGetModuleContext.h
index 85b5a9e5f4..c5928890c5 100644
--- a/Core/Code/CppMicroServices/src/module/usGetModuleContext.h
+++ b/Core/Code/CppMicroServices/src/module/usGetModuleContext.h
@@ -1,50 +1,50 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 
 #ifndef USGETMODULECONTEXT_H
 #define USGETMODULECONTEXT_H
 
-#include <usExportMacros_p.h>
+#include <usConfig.h>
 
 US_BEGIN_NAMESPACE
 
 class ModuleContext;
 
 /**
  * Returns the module context of the calling module.
  *
  * This function allows easy access to the own ModuleContext instance from
  * inside a C++ Micro Services module.
  *
  * \internal
  *
  * Note that the corresponding function definition is provided for each
  * module by the usModuleInit.cpp file. This file is customized via CMake
  * configure_file(...) and automatically compiled into each module.
  * Consequently, the GetModuleContext function is not exported, since each
  * module gets its "own version".
  */
 US_ABI_LOCAL ModuleContext* GetModuleContext();
 
 US_END_NAMESPACE
 
 #endif // USGETMODULECONTEXT_H
diff --git a/Core/Code/CppMicroServices/src/module/usModule.cpp b/Core/Code/CppMicroServices/src/module/usModule.cpp
index 58e307a3b7..12b5593ab9 100644
--- a/Core/Code/CppMicroServices/src/module/usModule.cpp
+++ b/Core/Code/CppMicroServices/src/module/usModule.cpp
@@ -1,230 +1,230 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 
 #include "usModule.h"
 
 #include "usModuleContext.h"
 #include "usModuleActivator.h"
 #include "usModulePrivate.h"
 #include "usCoreModuleContext_p.h"
 
 
 US_BEGIN_NAMESPACE
 
 const std::string& Module::PROP_ID()
 {
   static const std::string s("module.id");
   return s;
 }
 const std::string& Module::PROP_NAME()
 {
   static const std::string s("module.name");
   return s;
 }
 const std::string& Module::PROP_LOCATION()
 {
   static const std::string s("module.location");
   return s;
 }
 const std::string& Module::PROP_MODULE_DEPENDS()
 {
   static const std::string s("module.module_depends");
   return s;
 }
 const std::string& Module::PROP_LIB_DEPENDS()
 {
   static const std::string s("module.lib_depends");
   return s;
 }
 const std::string& Module::PROP_VERSION()
 {
   static const std::string s("module.version");
   return s;
 }
 
 Module::Module()
 : d(0)
 {
 
 }
 
 Module::~Module()
 {
   delete d;
 }
 
 void Module::Init(CoreModuleContext* coreCtx,
                   ModuleInfo* info)
 {
   ModulePrivate* mp = new ModulePrivate(this, coreCtx, info);
   std::swap(mp, d);
   delete mp;
 }
 
 void Module::Uninit()
 {
   if (d->moduleContext)
   {
     delete d->moduleContext;
     d->moduleContext = 0;
   }
   d->moduleActivator = 0;
 }
 
 bool Module::IsLoaded() const
 {
   return d->moduleContext != 0;
 }
 
 void Module::Start()
 {
 
   if (d->moduleContext)
   {
     US_WARN << "Module " << d->info.name << " already started.";
     return;
   }
 
   d->moduleContext = new ModuleContext(this->d);
 
 //  try
 //  {
     d->coreCtx->listeners.ModuleChanged(ModuleEvent(ModuleEvent::LOADING, this));
     // try to get a ModuleActivator instance
     if (d->info.activatorHook)
     {
       try
       {
         d->moduleActivator = d->info.activatorHook();
       }
       catch (...)
       {
         US_ERROR << "Creating the module activator of " << d->info.name << " failed";
         throw;
       }
 
       d->moduleActivator->Load(d->moduleContext);
     }
 
     d->coreCtx->listeners.ModuleChanged(ModuleEvent(ModuleEvent::LOADED, this));
 //  }
 //  catch (...)
 //  {
 //    d->coreCtx->listeners.ModuleChanged(ModuleEvent(ModuleEvent::UNLOADING, this));
 //    d->RemoveModuleResources();
 
 //    delete d->moduleContext;
 //    d->moduleContext = 0;
 
 //    d->coreCtx->listeners.ModuleChanged(ModuleEvent(ModuleEvent::UNLOADED, this));
 //    US_ERROR << "Calling the module activator Load() method of " << d->info.name << " failed!";
 //    throw;
 //  }
 }
 
 void Module::Stop()
 {
   if (d->moduleContext == 0)
   {
     US_WARN << "Module " << d->info.name << " already stopped.";
     return;
   }
 
   try
   {
     d->coreCtx->listeners.ModuleChanged(ModuleEvent(ModuleEvent::UNLOADING, this));
     if (d->moduleActivator)
     {
       d->moduleActivator->Unload(d->moduleContext);
     }
   }
   catch (...)
   {
-    US_ERROR << "Calling the module activator Unload() method of " << d->info.name << " failed!";
+    US_WARN << "Calling the module activator Unload() method of " << d->info.name << " failed!";
 
     try
     {
       d->RemoveModuleResources();
     }
     catch (...) {}
 
     delete d->moduleContext;
     d->moduleContext = 0;
 
     d->coreCtx->listeners.ModuleChanged(ModuleEvent(ModuleEvent::UNLOADED, this));
 
     throw;
   }
 
   d->RemoveModuleResources();
   delete d->moduleContext;
   d->moduleContext = 0;
   d->coreCtx->listeners.ModuleChanged(ModuleEvent(ModuleEvent::UNLOADED, this));
 }
 
 ModuleContext* Module::GetModuleContext() const
 {
   return d->moduleContext;
 }
 
 long Module::GetModuleId() const
 {
   return d->info.id;
 }
 
 std::string Module::GetLocation() const
 {
   return d->info.location;
 }
 
 std::string Module::GetName() const
 {
   return d->info.name;
 }
 
 ModuleVersion Module::GetVersion() const
 {
   return d->version;
 }
 
 std::string Module::GetProperty(const std::string& key) const
 {
   if (d->properties.count(key) == 0) return "";
   return d->properties[key];
 }
 
 US_END_NAMESPACE
 
 US_USE_NAMESPACE
 
 std::ostream& operator<<(std::ostream& os, const Module& module)
 {
   os << "Module[" << "id=" << module.GetModuleId() <<
         ", loc=" << module.GetLocation() <<
         ", name=" << module.GetName() << "]";
   return os;
 }
 
 std::ostream& operator<<(std::ostream& os, Module const * module)
 {
   return operator<<(os, *module);
 }
diff --git a/Core/Code/CppMicroServices/src/module/usModuleActivator.h b/Core/Code/CppMicroServices/src/module/usModuleActivator.h
index b83d4d3059..834505bd7c 100644
--- a/Core/Code/CppMicroServices/src/module/usModuleActivator.h
+++ b/Core/Code/CppMicroServices/src/module/usModuleActivator.h
@@ -1,148 +1,146 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 #ifndef USMODULEACTIVATOR_H_
 #define USMODULEACTIVATOR_H_
 
 #include <usConfig.h>
 
 US_BEGIN_NAMESPACE
 
 class ModuleContext;
 
 /**
  * \ingroup MicroServices
  *
  * Customizes the starting and stopping of a US module.
  * <p>
  * <code>%ModuleActivator</code> is an interface that can be implemented by
  * US modules. The US core can create instances of a
  * module's <code>%ModuleActivator</code> as required. If an instance's
  * <code>moduleActivator::Load</code> method executes successfully, it is
  * guaranteed that the same instance's <code>%ModuleActivator::Unload</code>
  * method will be called when the module is to be unloaded. The US core does
  * not concurrently call a <code>%ModuleActivator</code> object.
  *
  * <p>
  * <code>%ModuleActivator</code> is an abstract class interface whose implementations
  * must be exported via a special macro. Implementations are usually declared
  * and defined directly in .cpp files.
  *
  * <p>
  * \snippet uServices-activator/main.cpp 0
  *
  * <p>
  * The class implementing the <code>%ModuleActivator</code> interface must have a public
  * default constructor so that a <code>%ModuleActivator</code>
  * object can be created by the US core.
  *
  */
 struct ModuleActivator
 {
 
   virtual ~ModuleActivator() {}
 
   /**
    * Called when this module is loaded. This method
    * can be used to register services or to allocate any resources that this
    * module may need globally (during the whole module lifetime).
    *
    * <p>
    * This method must complete and return to its caller in a timely manner.
    *
    * @param context The execution context of the module being loaded.
    * @throws std::exception If this method throws an exception, this
    *         module is marked as stopped and the framework will remove this
    *         module's listeners, unregister all services registered by this
    *         module, and release all services used by this module.
    */
   virtual void Load(ModuleContext* context) = 0;
 
   /**
    * Called when this module is unloaded. In general, this
    * method should undo the work that the <code>ModuleActivator::Load</code>
    * method started. There should be no active threads that were started by
    * this module when this method returns.
    *
    * <p>
    * This method must complete and return to its caller in a timely manner.
    *
    * @param context The execution context of the module being unloaded.
    * @throws std::exception If this method throws an exception, the
    *         module is still marked as unloaded, and the framework will remove
    *         the module's listeners, unregister all services registered by the
    *         module, and release all services used by the module.
    */
   virtual void Unload(ModuleContext* context) = 0;
 
 };
 
 US_END_NAMESPACE
 
 /**
  * \ingroup MicroServices
  *
  * \def US_EXPORT_MODULE_ACTIVATOR(moduleName, type)
  * \brief Export a module activator class.
  *
  * \param _module_libname The physical name of the module, withou prefix or suffix.
  * \param _activator_type The fully-qualified type-name of the module activator class.
  *
  * Call this macro after the definition of your module activator to make it
  * accessible by the CppMicroServices library.
  *
  * Example:
  * \snippet uServices-activator/main.cpp 0
  */
 
 #define US_MODULE_ACTIVATOR_INSTANCE_FUNCTION(type)                                     \
   struct ScopedPointer                                                                  \
   {                                                                                     \
     ScopedPointer(US_PREPEND_NAMESPACE(ModuleActivator)* activator = 0) : m_Activator(activator) {} \
     ~ScopedPointer() { delete m_Activator; }                                            \
     US_PREPEND_NAMESPACE(ModuleActivator)* m_Activator;                                 \
   };                                                                                    \
                                                                                         \
   static ScopedPointer activatorPtr;                                                    \
   if (activatorPtr.m_Activator == 0) activatorPtr.m_Activator = new type;               \
   return activatorPtr.m_Activator;
 
 #ifdef US_BUILD_SHARED_LIBS
 
-  #include <usExportMacros_p.h>
-
   #define US_EXPORT_MODULE_ACTIVATOR(_module_libname, _activator_type)                  \
     extern "C" US_ABI_EXPORT US_PREPEND_NAMESPACE(ModuleActivator)* _us_module_activator_instance_ ## _module_libname () \
     {                                                                                   \
       US_MODULE_ACTIVATOR_INSTANCE_FUNCTION(_activator_type)                            \
     }
 
 #else
 
   #define US_EXPORT_MODULE_ACTIVATOR(_module_libname, _activator_type)                  \
     US_PREPEND_NAMESPACE(ModuleActivator)* _us_module_activator_instance_ ## _module_libname () \
     {                                                                                   \
       US_MODULE_ACTIVATOR_INSTANCE_FUNCTION(_activator_type)                            \
     }
 
 #endif
 
 #endif /* USMODULEACTIVATOR_H_ */
diff --git a/Core/Code/CppMicroServices/src/module/usModuleInfo.h b/Core/Code/CppMicroServices/src/module/usModuleInfo.h
index 3d373651e8..9a117c0c2f 100644
--- a/Core/Code/CppMicroServices/src/module/usModuleInfo.h
+++ b/Core/Code/CppMicroServices/src/module/usModuleInfo.h
@@ -1,68 +1,68 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 
 #ifndef USMODULEINFO_H
 #define USMODULEINFO_H
 
-#include <usExportMacros_p.h>
+#include <usConfig.h>
 
 #include <string>
 
 #ifdef _MSC_VER
 # pragma warning(push)
 # pragma warning(disable: 4251)
 #endif
 
 US_BEGIN_NAMESPACE
 
 struct ModuleActivator;
 
 /**
  * This class is not intended to be used directly. It is exported to support
  * the US module system.
  */
 struct US_EXPORT ModuleInfo
 {
   ModuleInfo(const std::string& name, const std::string& libName, const std::string& moduleDeps,
              const std::string& version);
 
   typedef ModuleActivator*(*ModuleActivatorHook)(void);
 
   std::string name;
   std::string libName;
   std::string moduleDeps;
   std::string version;
 
   std::string location;
 
   long id;
 
   ModuleActivatorHook activatorHook;
 };
 
 US_END_NAMESPACE
 
 #ifdef _MSC_VER
 # pragma warning(pop)
 #endif
 
 #endif // USMODULEINFO_H
diff --git a/Core/Code/CppMicroServices/src/module/usModuleRegistry.h b/Core/Code/CppMicroServices/src/module/usModuleRegistry.h
index d6a0dd3581..8813a39fa5 100644
--- a/Core/Code/CppMicroServices/src/module/usModuleRegistry.h
+++ b/Core/Code/CppMicroServices/src/module/usModuleRegistry.h
@@ -1,121 +1,121 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 #ifndef USMODULEREGISTRY_H
 #define USMODULEREGISTRY_H
 
 #include <vector>
 #include <string>
 
-#include <usExportMacros_p.h>
+#include <usConfig.h>
 
 US_BEGIN_NAMESPACE
 
 class Module;
 struct ModuleInfo;
 struct ModuleActivator;
 
 /**
  * \ingroup MicroServices
  *
  * Here we handle all the modules that are loaded in the framework.
  */
 class US_EXPORT ModuleRegistry {
 
 public:
 
   /**
    * Get the module that has the specified module identifier.
    *
    * @param id The identifier of the module to get.
    * @return Module or null
    *         if the module was not found.
    */
   static Module* GetModule(long id);
 
   /**
    * Get the module that has specified module name.
    *
    * @param name The name of the module to get.
    * @return Module or null.
    */
   static Module* GetModule(const std::string& name);
 
   /**
    * Get all known modules.
    *
    * @return A Module list with modules.
    */
   static void GetModules(std::vector<Module*>& modules);
 
   /**
    * Get all modules currently in module state LOADED.
    *
    * @return A List of Modules.
    */
   static void GetLoadedModules(std::vector<Module*>& modules);
 
 private:
 
   friend class ModuleInitializer;
 
   // disabled
   ModuleRegistry();
 
   static void Register(ModuleInfo* info);
 
   static void UnRegister(const ModuleInfo* info);
 
 };
 
 typedef ModuleActivator* (*ModuleActivatorInstanceFunction)();
 
 void US_EXPORT RegisterStaticModuleActivatorInstanceFunction(ModuleActivatorInstanceFunction func);
 void US_EXPORT UnregisterStaticModuleActivatorInstanceFunction(ModuleActivatorInstanceFunction func);
 
 US_END_NAMESPACE
 
 #define US_MODULE_LOAD(moduleName, context) \
   _us_module_activator_instance_ ## moduleName ()->Load(context);
 
 #define US_MODULE_UNLOAD(moduleName, context) \
   _us_module_activator_instance_ ## moduleName ()->Unload(context);
 
 #define US_MODULE_IMPORT(moduleName)                                                             \
   extern ::US_PREPEND_NAMESPACE(ModuleActivator)* _us_module_activator_instance_##moduleName();  \
   class Static##moduleName##ModuleInstance                                                       \
   {                                                                                              \
   public:                                                                                        \
     Static##moduleName##ModuleInstance()                                                         \
     {                                                                                            \
       RegisterStaticModuleActivatorInstanceFunction(_us_module_activator_instance_##moduleName); \
       _us_module_activator_instance_##moduleName()->Load(::US_PREPEND_NAMESPACE(GetModuleContext)()); \
     }                                                                                            \
     ~Static##moduleName##ModuleInstance()                                                        \
     {                                                                                            \
       UnregisterStaticModuleActivatorInstanceFunction(_us_module_activator_instance_##moduleName); \
       _us_module_activator_instance_##moduleName()->Unload(::US_PREPEND_NAMESPACE(GetModuleContext)()); \
     }                                                                                            \
   };                                                                                             \
   static Static##moduleName##ModuleInstance static##moduleName##Instance;
 
 
 #endif // USMODULEREGISTRY_H
diff --git a/Core/Code/CppMicroServices/src/module/usModuleUtils_p.h b/Core/Code/CppMicroServices/src/module/usModuleUtils_p.h
index bc4943e1e6..ec32d6a1ce 100644
--- a/Core/Code/CppMicroServices/src/module/usModuleUtils_p.h
+++ b/Core/Code/CppMicroServices/src/module/usModuleUtils_p.h
@@ -1,45 +1,45 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 
 #ifndef USMODULEUTILS_H
 #define USMODULEUTILS_H
 
-#include <usExportMacros_p.h>
+#include <usConfig.h>
 
 #include <string>
 
 US_BEGIN_NAMESPACE
 
 /**
  * This class is not intended to be used directly. It is exported to support
  * the US module system.
  */
 struct US_EXPORT ModuleUtils
 {
   static std::string GetLibraryPath(const std::string& libName, void* symbol);
 
   static void* GetSymbol(const std::string& libName, const char* symbol);
 };
 
 US_END_NAMESPACE
 
 #endif // USMODULEUTILS_H
diff --git a/Core/Code/CppMicroServices/src/module/usModuleVersion.h b/Core/Code/CppMicroServices/src/module/usModuleVersion.h
index 06fe5c59a1..cd3091d519 100644
--- a/Core/Code/CppMicroServices/src/module/usModuleVersion.h
+++ b/Core/Code/CppMicroServices/src/module/usModuleVersion.h
@@ -1,263 +1,263 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 #ifndef USMODULEVERSION_H
 #define USMODULEVERSION_H
 
-#include <usExportMacros_p.h>
+#include <usConfig.h>
 
 #include <string>
 
 #ifdef _MSC_VER
 # pragma warning(push)
 # pragma warning(disable: 4251)
 #endif
 
 US_BEGIN_NAMESPACE
 
 /**
  * \ingroup MicroServices
  *
  * Version identifier for US modules.
  *
  * <p>
  * Version identifiers have four components.
  * <ol>
  * <li>Major version. A non-negative integer.</li>
  * <li>Minor version. A non-negative integer.</li>
  * <li>Micro version. A non-negative integer.</li>
  * <li>Qualifier. A text string. See <code>ModuleVersion(const std::string&)</code> for the
  * format of the qualifier string.</li>
  * </ol>
  *
  * <p>
  * <code>ModuleVersion</code> objects are immutable.
  */
 class US_EXPORT ModuleVersion {
 
 private:
 
   friend class ModulePrivate;
 
   unsigned int majorVersion;
   unsigned int minorVersion;
   unsigned int microVersion;
   std::string      qualifier;
 
   static const char SEPARATOR; //  = "."
 
   bool undefined;
 
 
   /**
    * Called by the ModuleVersion constructors to validate the version components.
    *
    * @return <code>true</code> if the validation was successfull, <code>false</code> otherwise.
    */
   void Validate();
 
   ModuleVersion& operator=(const ModuleVersion& v);
 
   explicit ModuleVersion(bool undefined = false);
 
 public:
 
   /**
    * The empty version "0.0.0".
    */
   static ModuleVersion EmptyVersion();
 
   /**
    * Creates an undefined version identifier, representing either
    * infinity or minus infinity.
    */
   static ModuleVersion UndefinedVersion();
 
   /**
    * Creates a version identifier from the specified numerical components.
    *
    * <p>
    * The qualifier is set to the empty string.
    *
    * @param majorVersion Major component of the version identifier.
    * @param minorVersion Minor component of the version identifier.
    * @param microVersion Micro component of the version identifier.
    *
    */
   ModuleVersion(unsigned int majorVersion, unsigned int minorVersion, unsigned int microVersion);
 
   /**
    * Creates a version identifier from the specified components.
    *
    * @param majorVersion Major component of the version identifier.
    * @param minorVersion Minor component of the version identifier.
    * @param microVersion Micro component of the version identifier.
    * @param qualifier Qualifier component of the version identifier.
    */
   ModuleVersion(unsigned int majorVersion, unsigned int minorVersion, unsigned int microVersion, const std::string& qualifier);
 
   /**
    * Created a version identifier from the specified string.
    *
    * <p>
    * Here is the grammar for version strings.
    *
    * <pre>
    * version ::= majorVersion('.'minorVersion('.'microVersion('.'qualifier)?)?)?
    * majorVersion ::= digit+
    * minorVersion ::= digit+
    * microVersion ::= digit+
    * qualifier ::= (alpha|digit|'_'|'-')+
    * digit ::= [0..9]
    * alpha ::= [a..zA..Z]
    * </pre>
    *
    * There must be no whitespace in version.
    *
    * @param version string representation of the version identifier.
    */
   ModuleVersion(const std::string& version);
 
   /**
    * Create a version identifier from another.
    *
    * @param version Another version identifier
    */
   ModuleVersion(const ModuleVersion& version);
 
 
   /**
    * Parses a version identifier from the specified string.
    *
    * <p>
    * See <code>ModuleVersion(const std::string&)</code> for the format of the version string.
    *
    * @param version string representation of the version identifier. Leading
    *        and trailing whitespace will be ignored.
    * @return A <code>ModuleVersion</code> object representing the version
    *         identifier. If <code>version</code> is the empty string
    *         then <code>EmptyVersion</code> will be
    *         returned.
    */
   static ModuleVersion ParseVersion(const std::string& version);
 
   /**
    * Returns the undefined state of this version identifier.
    *
    * @return <code>true</code> if this version identifier is undefined,
    *         <code>false</code> otherwise.
    */
   bool IsUndefined() const;
 
   /**
    * Returns the majorVersion component of this version identifier.
    *
    * @return The majorVersion component.
    */
   unsigned int GetMajor() const;
 
   /**
    * Returns the minorVersion component of this version identifier.
    *
    * @return The minorVersion component.
    */
   unsigned int GetMinor() const;
 
   /**
    * Returns the microVersion component of this version identifier.
    *
    * @return The microVersion component.
    */
   unsigned int GetMicro() const;
 
   /**
    * Returns the qualifier component of this version identifier.
    *
    * @return The qualifier component.
    */
   std::string GetQualifier() const;
 
   /**
    * Returns the string representation of this version identifier.
    *
    * <p>
    * The format of the version string will be <code>majorVersion.minorVersion.microVersion</code>
    * if qualifier is the empty string or
    * <code>majorVersion.minorVersion.microVersion.qualifier</code> otherwise.
    *
    * @return The string representation of this version identifier.
    */
   std::string ToString() const;
 
   /**
    * Compares this <code>ModuleVersion</code> object to another object.
    *
    * <p>
    * A version is considered to be <b>equal to </b> another version if the
    * majorVersion, minorVersion and microVersion components are equal and the qualifier component
    * is equal.
    *
    * @param object The <code>ModuleVersion</code> object to be compared.
    * @return <code>true</code> if <code>object</code> is a
    *         <code>ModuleVersion</code> and is equal to this object;
    *         <code>false</code> otherwise.
    */
   bool operator==(const ModuleVersion& object) const;
 
   /**
    * Compares this <code>ModuleVersion</code> object to another object.
    *
    * <p>
    * A version is considered to be <b>less than </b> another version if its
    * majorVersion component is less than the other version's majorVersion component, or the
    * majorVersion components are equal and its minorVersion component is less than the other
    * version's minorVersion component, or the majorVersion and minorVersion components are equal
    * and its microVersion component is less than the other version's microVersion component,
    * or the majorVersion, minorVersion and microVersion components are equal and it's qualifier
    * component is less than the other version's qualifier component (using
    * <code>std::string::operator<()</code>).
    *
    * <p>
    * A version is considered to be <b>equal to</b> another version if the
    * majorVersion, minorVersion and microVersion components are equal and the qualifier component
    * is equal.
    *
    * @param object The <code>ModuleVersion</code> object to be compared.
    * @return A negative integer, zero, or a positive integer if this object is
    *         less than, equal to, or greater than the specified
    *         <code>ModuleVersion</code> object.
    */
   int Compare(const ModuleVersion& object) const;
 
 };
 
 US_END_NAMESPACE
 
 #ifdef _MSC_VER
 # pragma warning(pop)
 #endif
 
 /**
  * \ingroup MicroServices
  */
 US_EXPORT std::ostream& operator<<(std::ostream& os, const US_PREPEND_NAMESPACE(ModuleVersion)& v);
 
 #endif // USMODULEVERSION_H
diff --git a/Core/Code/CppMicroServices/src/service/usServiceException.h b/Core/Code/CppMicroServices/src/service/usServiceException.h
index 4f455913dd..210697801b 100644
--- a/Core/Code/CppMicroServices/src/service/usServiceException.h
+++ b/Core/Code/CppMicroServices/src/service/usServiceException.h
@@ -1,126 +1,126 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 
 #ifndef USSERVICEEXCEPTION_H
 #define USSERVICEEXCEPTION_H
 
 #include <stdexcept>
 
-#include <usExportMacros_p.h>
+#include <usConfig.h>
 
 #ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4275)
 #endif
 
 US_BEGIN_NAMESPACE
 
 /**
  * \ingroup MicroServices
  *
  * A service exception used to indicate that a service problem occurred.
  *
  * <p>
  * A <code>ServiceException</code> object is created by the framework or
  * to denote an exception condition in the service. An enum
  * type is used to identify the exception type for future extendability.
  *
  * <p>
  * This exception conforms to the general purpose exception chaining mechanism.
  */
 class US_EXPORT ServiceException : public std::runtime_error
 {
 public:
 
   enum Type {
     /**
      * No exception type is unspecified.
      */
     UNSPECIFIED = 0,
     /**
      * The service has been unregistered.
      */
     UNREGISTERED = 1,
     /**
      * The service factory produced an invalid service object.
      */
     FACTORY_ERROR = 2,
     /**
      * The service factory threw an exception.
      */
     FACTORY_EXCEPTION = 3,
     /**
      * An error occurred invoking a remote service.
      */
     REMOTE = 5,
     /**
      * The service factory resulted in a recursive call to itself for the
      * requesting module.
      */
     FACTORY_RECURSION = 6
   };
 
   /**
    * Creates a <code>ServiceException</code> with the specified message,
    * type and exception cause.
    *
    * @param msg The associated message.
    * @param type The type for this exception.
    */
   ServiceException(const std::string& msg, const Type& type = UNSPECIFIED);
 
   ServiceException(const ServiceException& o);
   ServiceException& operator=(const ServiceException& o);
 
   ~ServiceException() throw() { }
 
   /**
    * Returns the type for this exception or <code>UNSPECIFIED</code> if the
    * type was unspecified or unknown.
    *
    * @return The type of this exception.
    */
   Type GetType() const;
 
 private:
 
   /**
    * Type of service exception.
    */
   Type type;
 
 };
 
 US_END_NAMESPACE
 
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 
 /**
  * \ingroup MicroServices
  * @{
  */
 US_EXPORT std::ostream& operator<<(std::ostream& os, const US_PREPEND_NAMESPACE(ServiceException)& exc);
 /** @}*/
 
 #endif // USSERVICEEXCEPTION_H
diff --git a/Core/Code/CppMicroServices/src/service/usServiceListeners.cpp b/Core/Code/CppMicroServices/src/service/usServiceListeners.cpp
index 12220f4c6b..76fc5c663f 100644
--- a/Core/Code/CppMicroServices/src/service/usServiceListeners.cpp
+++ b/Core/Code/CppMicroServices/src/service/usServiceListeners.cpp
@@ -1,289 +1,289 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 #include "usUtils_p.h"
 
 #include "usServiceListeners_p.h"
 #include "usServiceReferencePrivate.h"
 
 #include "usModule.h"
 
 //#include <usLogMacros.h>
 
 US_BEGIN_NAMESPACE
 
 const int ServiceListeners::OBJECTCLASS_IX = 0;
 const int ServiceListeners::SERVICE_ID_IX = 1;
 
 ServiceListeners::ServiceListeners()
 {
   hashedServiceKeys.push_back(ServiceConstants::OBJECTCLASS());
   hashedServiceKeys.push_back(ServiceConstants::SERVICE_ID());
 }
 
 void ServiceListeners::AddServiceListener(ModuleContext* mc, const ServiceListenerEntry::ServiceListener& listener,
                         const std::string& filter)
 {
   MutexLocker lock(mutex);
 
   ServiceListenerEntry sle(mc->GetModule(), listener, filter);
   if (serviceSet.find(sle) != serviceSet.end())
   {
     RemoveServiceListener_unlocked(sle);
   }
   serviceSet.insert(sle);
   CheckSimple(sle);
 }
 
 void ServiceListeners::RemoveServiceListener(ModuleContext* mc, const ServiceListenerEntry::ServiceListener& listener)
 {
   ServiceListenerEntry entryToRemove(mc->GetModule(), listener);
 
   MutexLocker lock(mutex);
   RemoveServiceListener_unlocked(entryToRemove);
 }
 
 void ServiceListeners::RemoveServiceListener_unlocked(const ServiceListenerEntry& entryToRemove)
 {
   for (ServiceListenerEntries::iterator it = serviceSet.begin();
        it != serviceSet.end(); ++it)
   {
     if (it->operator ==(entryToRemove))
     {
       it->SetRemoved(true);
       RemoveFromCache(*it);
       serviceSet.erase(it);
       break;
     }
   }
 }
 
 void ServiceListeners::AddModuleListener(ModuleContext* mc, const ModuleListener& listener)
 {
   MutexLocker lock(moduleListenerMapMutex);
   std::list<ModuleListener>& listeners = moduleListenerMap[mc];
   if (std::find_if(listeners.begin(), listeners.end(), std::bind1st(ModuleListenerCompare(), listener)) == listeners.end())
   {
     listeners.push_back(listener);
   }
 }
 
 void ServiceListeners::RemoveModuleListener(ModuleContext* mc, const ModuleListener& listener)
 {
   MutexLocker lock(moduleListenerMapMutex);
   moduleListenerMap[mc].remove_if(std::bind1st(ModuleListenerCompare(), listener));
 }
 
 void ServiceListeners::ModuleChanged(const ModuleEvent& evt)
 {
   MutexLocker lock(moduleListenerMapMutex);
   for(ModuleListenerMap::iterator i = moduleListenerMap.begin();
       i != moduleListenerMap.end(); ++i)
   {
     for(std::list<ModuleListener>::iterator j = i->second.begin();
         j != i->second.end(); ++j)
     {
       (*j)(evt);
     }
   }
 }
 
 void ServiceListeners::RemoveAllListeners(ModuleContext* mc)
 {
   {
     MutexLocker lock(mutex);
     for (ServiceListenerEntries::iterator it = serviceSet.begin();
          it != serviceSet.end(); )
     {
 
       if (it->GetModule() == mc->GetModule())
       {
         RemoveFromCache(*it);
         serviceSet.erase(it++);
       }
       else
       {
         ++it;
       }
     }
   }
 
   {
     MutexLocker lock(moduleListenerMapMutex);
     moduleListenerMap.erase(mc);
   }
 }
 
 void ServiceListeners::ServiceChanged(const ServiceListenerEntries& receivers,
                                       const ServiceEvent& evt)
 {
   ServiceListenerEntries matchBefore;
   ServiceChanged(receivers, evt, matchBefore);
 }
 
 void ServiceListeners::ServiceChanged(const ServiceListenerEntries& receivers,
                                       const ServiceEvent& evt,
                                       ServiceListenerEntries& matchBefore)
 {
   ServiceReference sr = evt.GetServiceReference();
   int n = 0;
 
   for (ServiceListenerEntries::const_iterator l = receivers.begin();
        l != receivers.end(); ++l)
   {
     if (!matchBefore.empty())
     {
       matchBefore.erase(*l);
     }
 
     if (!l->IsRemoved())
     {
       try
       {
         ++n;
         l->CallDelegate(evt);
       }
       catch (...)
       {
-        US_ERROR << "Service listener"
+        US_WARN << "Service listener"
             #ifdef US_MODULE_SUPPORT_ENABLED
-                 << " in " << l->GetModule()->GetName()
+                << " in " << l->GetModule()->GetName()
             #endif
-                 << " threw an exception!";
+                << " threw an exception!";
       }
     }
   }
 
   //US_DEBUG << "Notified " << n << " listeners";
 }
 
 void ServiceListeners::GetMatchingServiceListeners(const ServiceReference& sr, ServiceListenerEntries& set,
                                                    bool lockProps)
 {
   MutexLocker lock(mutex);
 
   // Check complicated or empty listener filters
   int n = 0;
   for (std::list<ServiceListenerEntry>::const_iterator sse = complicatedListeners.begin();
        sse != complicatedListeners.end(); ++sse)
   {
     ++n;
     if (sse->GetLDAPExpr().IsNull() ||
         sse->GetLDAPExpr().Evaluate(sr.d->GetProperties(), false))
     {
       set.insert(*sse);
     }
   }
 
   //US_DEBUG << "Added " << set.size() << " out of " << n
   //         << " listeners with complicated filters";
 
   // Check the cache
   const std::list<std::string> c(any_cast<std::list<std::string> >
                                  (sr.d->GetProperty(ServiceConstants::OBJECTCLASS(), lockProps)));
   for (std::list<std::string>::const_iterator objClass = c.begin();
        objClass != c.end(); ++objClass)
   {
     AddToSet(set, OBJECTCLASS_IX, *objClass);
   }
 
   long service_id = any_cast<long>(sr.d->GetProperty(ServiceConstants::SERVICE_ID(), lockProps));
   std::stringstream ss;
   ss << service_id;
   AddToSet(set, SERVICE_ID_IX, ss.str());
 }
 
 void ServiceListeners::RemoveFromCache(const ServiceListenerEntry& sle)
 {
   if (!sle.GetLocalCache().empty())
   {
     for (std::size_t i = 0; i < hashedServiceKeys.size(); ++i)
     {
       CacheType& keymap = cache[i];
       std::vector<std::string>& l = sle.GetLocalCache()[i];
       for (std::vector<std::string>::const_iterator it = l.begin();
            it != l.end(); ++it)
       {
         std::list<ServiceListenerEntry>& sles = keymap[*it];
         sles.remove(sle);
         if (sles.empty())
         {
           keymap.erase(*it);
         }
       }
     }
   }
   else
   {
     complicatedListeners.remove(sle);
   }
 }
 
  void ServiceListeners::CheckSimple(const ServiceListenerEntry& sle) {
    if (sle.GetLDAPExpr().IsNull())
    {
      complicatedListeners.push_back(sle);
    }
    else
    {
      LDAPExpr::LocalCache local_cache;
      if (sle.GetLDAPExpr().IsSimple(hashedServiceKeys, local_cache, false))
      {
        sle.GetLocalCache() = local_cache;
        for (std::size_t i = 0; i < hashedServiceKeys.size(); ++i)
        {
          for (std::vector<std::string>::const_iterator it = local_cache[i].begin();
               it != local_cache[i].end(); ++it)
          {
            std::list<ServiceListenerEntry>& sles = cache[i][*it];
            sles.push_back(sle);
          }
        }
      }
      else
      {
        //US_DEBUG << "Too complicated filter: " << sle.GetFilter();
        complicatedListeners.push_back(sle);
      }
    }
  }
 
 void ServiceListeners::AddToSet(ServiceListenerEntries& set,
                                 int cache_ix, const std::string& val)
 {
   std::list<ServiceListenerEntry>& l = cache[cache_ix][val];
   if (!l.empty())
   {
     //US_DEBUG << hashedServiceKeys[cache_ix] << " matches " << l.size();
 
     for (std::list<ServiceListenerEntry>::const_iterator entry = l.begin();
          entry != l.end(); ++entry)
     {
       set.insert(*entry);
     }
   }
   else
   {
     //US_DEBUG << hashedServiceKeys[cache_ix] << " matches none";
   }
 }
 
 US_END_NAMESPACE
diff --git a/Core/Code/CppMicroServices/src/service/usServiceProperties.h b/Core/Code/CppMicroServices/src/service/usServiceProperties.h
index 3d8d773259..4cebbd8086 100644
--- a/Core/Code/CppMicroServices/src/service/usServiceProperties.h
+++ b/Core/Code/CppMicroServices/src/service/usServiceProperties.h
@@ -1,200 +1,199 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 
 #ifndef US_SERVICE_PROPERTIES_H
 #define US_SERVICE_PROPERTIES_H
 
 
 #include <usConfig.h>
 
 #include <cctype>
 
-#include <usExportMacros_p.h>
 #include "usAny.h"
 
 /// \cond
 US_BEGIN_NAMESPACE
 
 struct ci_char_traits : public std::char_traits<char>
     // just inherit all the other functions
     //  that we don't need to override
 {
     
   static bool eq(char c1, char c2)
   {
     return std::toupper(c1) == std::toupper(c2);
   }
 
   static bool ne(char c1, char c2)
   {
     return std::toupper(c1) != std::toupper(c2);
   }
 
   static bool lt(char c1, char c2)
   {
     return std::toupper(c1) < std::toupper(c2);
   }
 
   static bool gt(char c1, char c2)
   {
     return std::toupper(c1) > std::toupper(c2);
   }
 
   static int compare(const char* s1, const char* s2, std::size_t n)
   {
     while (n-- > 0)
     {
       if (lt(*s1, *s2)) return -1;
       if (gt(*s1, *s2)) return 1;
       ++s1; ++s2;
     }
     return 0;
   }
 
   static const char* find(const char* s, int n, char a)
   {
     while (n-- > 0 && std::toupper(*s) != std::toupper(a))
     {
       ++s;
     }
     return s;
   }
 
 };
 
 class ci_string : public std::basic_string<char, ci_char_traits>
 {
 private:
 
   typedef std::basic_string<char, ci_char_traits> Super;
 
 public:
 
   inline ci_string() : Super() {}
   inline ci_string(const ci_string& cistr) : Super(cistr) {}
   inline ci_string(const ci_string& cistr, size_t pos, size_t n) : Super(cistr, pos, n) {}
   inline ci_string(const char* s, size_t n) : Super(s, n) {}
   inline ci_string(const char* s) : Super(s) {}
   inline ci_string(size_t n, char c) : Super(n, c) {}
 
   inline ci_string(const std::string& str) : Super(str.begin(), str.end()) {}
 
   template<class InputIterator> ci_string(InputIterator b, InputIterator e)
     : Super(b, e)
   {}
 
   inline operator std::string () const
   {
     return std::string(begin(), end());
   }
 };
 
 US_END_NAMESPACE
 
 US_HASH_FUNCTION_NAMESPACE_BEGIN
 US_HASH_FUNCTION_BEGIN(US_PREPEND_NAMESPACE(ci_string))
 
   std::string ls(arg);
   std::transform(ls.begin(), ls.end(), ls.begin(), ::tolower);
 
   using namespace US_HASH_FUNCTION_NAMESPACE;
   return US_HASH_FUNCTION(std::string, ls);
 
 US_HASH_FUNCTION_END
 US_HASH_FUNCTION_NAMESPACE_END
 
 /// \endcond
 
 US_BEGIN_NAMESPACE
 
 /**
  * \ingroup MicroServices
  *
  * A hash table based map class with case-insensitive keys. This class
  * uses ci_string as key type and Any as values. Due
  * to the conversion capabilities of ci_string, std::string objects
  * can be used transparantly to insert or retrieve key-value pairs.
  *
  * <p>
  * Note that the case of the keys will be preserved.
  */
 typedef US_UNORDERED_MAP_TYPE<ci_string, Any> ServiceProperties;
 
 /**
  * \ingroup MicroServices
  */
 namespace ServiceConstants {
 
 /**
  * Service property identifying all of the class names under which a service
  * was registered in the framework. The value of this property must be of
  * type <code>std::list&lt;std::string&gt;</code>.
  *
  * <p>
  * This property is set by the framework when a service is registered.
  */
 US_EXPORT const std::string& OBJECTCLASS(); // = "objectclass"
 
 /**
  * Service property identifying a service's registration number. The value
  * of this property must be of type <code>long int</code>.
  *
  * <p>
  * The value of this property is assigned by the framework when a service is
  * registered. The framework assigns a unique value that is larger than all
  * previously assigned values since the framework was started. These values
  * are NOT persistent across restarts of the framework.
  */
 US_EXPORT const std::string& SERVICE_ID(); // = "service.id"
 
 /**
  * Service property identifying a service's ranking number.
  *
  * <p>
  * This property may be supplied in the
  * <code>ServiceProperties</code> object passed to the
  * <code>ModuleContext::RegisterService</code> method. The value of this
  * property must be of type <code>int</code>.
  *
  * <p>
  * The service ranking is used by the framework to determine the <i>natural
  * order</i> of services, see ServiceReference::operator<(const ServiceReference&),
  * and the <i>default</i> service to be returned from a call to the
  * {@link ModuleContext::GetServiceReference} method.
  *
  * <p>
  * The default ranking is zero (0). A service with a ranking of
  * <code>std::numeric_limits<int>::max()</code> is very likely to be returned as the
  * default service, whereas a service with a ranking of
  * <code>std::numeric_limits<int>::min()</code> is very unlikely to be returned.
  *
  * <p>
  * If the supplied property value is not of type <code>int</code>, it is
  * deemed to have a ranking value of zero.
  */
 US_EXPORT const std::string& SERVICE_RANKING(); // = "service.ranking"
 
 }
 
 US_END_NAMESPACE
 
 #endif // US_SERVICE_PROPERTIES_H
diff --git a/Core/Code/CppMicroServices/src/service/usServiceReference.h b/Core/Code/CppMicroServices/src/service/usServiceReference.h
index 456191c375..95a402d440 100644
--- a/Core/Code/CppMicroServices/src/service/usServiceReference.h
+++ b/Core/Code/CppMicroServices/src/service/usServiceReference.h
@@ -1,226 +1,225 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 #ifndef USSERVICEREFERENCE_H
 #define USSERVICEREFERENCE_H
 
-#include <usExportMacros_p.h>
 #include <usAny.h>
 
 #ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4396)
 #endif
 
 US_BEGIN_NAMESPACE
 
 class Module;
 class ServiceRegistrationPrivate;
 class ServiceReferencePrivate;
 
 /**
  * \ingroup MicroServices
  *
  * A reference to a service.
  *
  * <p>
  * The framework returns <code>ServiceReference</code> objects from the
  * <code>ModuleContext::GetServiceReference</code> and
  * <code>ModuleContext::GetServiceReferences</code> methods.
  * <p>
  * A <code>ServiceReference</code> object may be shared between modules and
  * can be used to examine the properties of the service and to get the service
  * object.
  * <p>
  * Every service registered in the framework has a unique
  * <code>ServiceRegistration</code> object and may have multiple, distinct
  * <code>ServiceReference</code> objects referring to it.
  * <code>ServiceReference</code> objects associated with a
  * <code>ServiceRegistration</code> are considered equal
  * (more specifically, their <code>operator==()</code>
  * method will return <code>true</code> when compared).
  * <p>
  * If the same service object is registered multiple times,
  * <code>ServiceReference</code> objects associated with different
  * <code>ServiceRegistration</code> objects are not equal.
  *
  * @see ModuleContext::GetServiceReference
  * @see ModuleContext::GetServiceReferences
  * @see ModuleContext::GetService
  * @remarks This class is thread safe.
  */
 class US_EXPORT ServiceReference {
 
 public:
 
   /**
    * Creates an invalid ServiceReference object. You can use
    * this object in boolean expressions and it will evaluate to
    * <code>false</code>.
    */
   ServiceReference();
 
   ServiceReference(const ServiceReference& ref);
 
   /**
    * Converts this ServiceReference instance into a boolean
    * expression. If this instance was default constructed or
    * the service it references has been unregistered, the conversion
    * returns <code>false</code>, otherwise it returns <code>true</code>.
    */
   operator bool() const;
 
   /**
    * Releases any resources held or locked by this
    * <code>ServiceReference</code> and renders it invalid.
    */
   ServiceReference& operator=(int null);
 
   ~ServiceReference();
 
   /**
    * Returns the property value to which the specified property key is mapped
    * in the properties <code>ServiceProperties</code> object of the service
    * referenced by this <code>ServiceReference</code> object.
    *
    * <p>
    * Property keys are case-insensitive.
    *
    * <p>
    * This method continues to return property values after the service has
    * been unregistered. This is so references to unregistered services can
    * still be interrogated.
    *
    * @param key The property key.
    * @return The property value to which the key is mapped; an invalid Any
    *         if there is no property named after the key.
    */
   Any GetProperty(const std::string& key) const;
 
   /**
    * Returns a list of the keys in the <code>ServiceProperties</code>
    * object of the service referenced by this <code>ServiceReference</code>
    * object.
    *
    * <p>
    * This method will continue to return the keys after the service has been
    * unregistered. This is so references to unregistered services can
    * still be interrogated.
    *
    * @param keys A vector being filled with the property keys.
    */
   void GetPropertyKeys(std::vector<std::string>& keys) const;
 
   /**
    * Returns the module that registered the service referenced by this
    * <code>ServiceReference</code> object.
    *
    * <p>
    * This method must return <code>0</code> when the service has been
    * unregistered. This can be used to determine if the service has been
    * unregistered.
    *
    * @return The module that registered the service referenced by this
    *         <code>ServiceReference</code> object; <code>0</code> if that
    *         service has already been unregistered.
    * @see ModuleContext::RegisterService(const std::vector<std::string>&, US_BASECLASS_NAME*, const ServiceProperties&)
    */
   Module* GetModule() const;
 
   /**
    * Returns the modules that are using the service referenced by this
    * <code>ServiceReference</code> object. Specifically, this method returns
    * the modules whose usage count for that service is greater than zero.
    *
    * @param modules A list of modules whose usage count for the service referenced
    *         by this <code>ServiceReference</code> object is greater than
    *         zero.
    */
   void GetUsingModules(std::vector<Module*>& modules) const;
 
   /**
    * Compares this <code>ServiceReference</code> with the specified
    * <code>ServiceReference</code> for order.
    *
    * <p>
    * If this <code>ServiceReference</code> and the specified
    * <code>ServiceReference</code> have the same \link ServiceConstants::SERVICE_ID()
    * service id\endlink they are equal. This <code>ServiceReference</code> is less
    * than the specified <code>ServiceReference</code> if it has a lower
    * {@link ServiceConstants::SERVICE_RANKING service ranking} and greater if it has a
    * higher service ranking. Otherwise, if this <code>ServiceReference</code>
    * and the specified <code>ServiceReference</code> have the same
    * {@link ServiceConstants::SERVICE_RANKING service ranking}, this
    * <code>ServiceReference</code> is less than the specified
    * <code>ServiceReference</code> if it has a higher
    * {@link ServiceConstants::SERVICE_ID service id} and greater if it has a lower
    * service id.
    *
    * @param reference The <code>ServiceReference</code> to be compared.
    * @return Returns a false or true if this
    *         <code>ServiceReference</code> is less than or greater
    *         than the specified <code>ServiceReference</code>.
    */
   bool operator<(const ServiceReference& reference) const;
 
   bool operator==(const ServiceReference& reference) const;
 
   ServiceReference& operator=(const ServiceReference& reference);
 
 
 private:
 
   friend class ModulePrivate;
   friend class ModuleContext;
   friend class ServiceFilter;
   friend class ServiceRegistrationPrivate;
   friend class ServiceListeners;
   friend class LDAPFilter;
 
   template<class S, class T> friend class ServiceTracker;
   template<class S, class T> friend class ServiceTrackerPrivate;
   template<class S, class R, class T> friend class ModuleAbstractTracked;
 
   US_HASH_FUNCTION_FRIEND(ServiceReference);
 
   std::size_t Hash() const;
   
   ServiceReference(ServiceRegistrationPrivate* reg);
 
   ServiceReferencePrivate* d;
 
 };
 
 US_END_NAMESPACE
 
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 
 US_EXPORT std::ostream& operator<<(std::ostream& os, const US_PREPEND_NAMESPACE(ServiceReference)& serviceRef);
 
 US_HASH_FUNCTION_NAMESPACE_BEGIN
 US_HASH_FUNCTION_BEGIN(US_PREPEND_NAMESPACE(ServiceReference))
   return arg.Hash();
 US_HASH_FUNCTION_END
 US_HASH_FUNCTION_NAMESPACE_END
 
 #endif // USSERVICEREFERENCE_H
diff --git a/Core/Code/CppMicroServices/src/service/usServiceRegistry.cpp b/Core/Code/CppMicroServices/src/service/usServiceRegistry.cpp
index 3525088959..6ae3263cbe 100644
--- a/Core/Code/CppMicroServices/src/service/usServiceRegistry.cpp
+++ b/Core/Code/CppMicroServices/src/service/usServiceRegistry.cpp
@@ -1,335 +1,335 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 #include <usConfig.h>
 
 #include <iterator>
 #include <stdexcept>
 
 #ifdef US_ENABLE_SERVICE_FACTORY_SUPPORT
 #include US_BASECLASS_HEADER
 #endif
 
 #include "usServiceRegistry_p.h"
 #include "usServiceFactory.h"
 #include "usServiceRegistry_p.h"
 #include "usServiceRegistrationPrivate.h"
 #include "usModulePrivate.h"
 #include "usCoreModuleContext_p.h"
 
 
 US_BEGIN_NAMESPACE
 
 typedef MutexLock<ServiceRegistry::MutexType> MutexLocker;
 
 
 struct ServiceRegistrationComparator
 {
   bool operator()(const ServiceRegistration& a, const ServiceRegistration& b) const
   {
     return a < b;
   }
 };
 
 ServiceProperties ServiceRegistry::CreateServiceProperties(const ServiceProperties& in,
                                                            const std::list<std::string>& classes,
                                                            long sid)
 {
   static long nextServiceID = 1;
   ServiceProperties props(in);
 
   if (!classes.empty())
   {
     props.insert(std::make_pair(ServiceConstants::OBJECTCLASS(), classes));
   }
 
   props.insert(std::make_pair(ServiceConstants::SERVICE_ID(), sid != -1 ? sid : nextServiceID++));
 
   return props;
 }
 
 ServiceRegistry::ServiceRegistry(CoreModuleContext* coreCtx)
   : core(coreCtx)
 {
 
 }
 
 ServiceRegistry::~ServiceRegistry()
 {
   Clear();
 }
 
 void ServiceRegistry::Clear()
 {
   services.clear();
   serviceRegistrations.clear();
   classServices.clear();
   core = 0;
 }
 
 ServiceRegistration ServiceRegistry::RegisterService(ModulePrivate* module,
                                                      const std::list<std::string>& classes,
                                                      US_BASECLASS_NAME* service,
                                                      const ServiceProperties& properties)
 {
   if (service == 0)
   {
     throw std::invalid_argument("Can't register 0 as a service");
   }
 
   // Check if service implements claimed classes and that they exist.
   for (std::list<std::string>::const_iterator i = classes.begin();
        i != classes.end(); ++i)
   {
     if (i->empty())
     {
       throw std::invalid_argument("Can't register as null class");
     }
 
     #ifdef US_ENABLE_SERVICE_FACTORY_SUPPORT
     if (!(dynamic_cast<ServiceFactory*>(service)))
     #endif
     {
       if (!CheckServiceClass(service, *i))
       {
         std::string msg;
         std::stringstream ss(msg);
         ss << "Service class " << us_service_impl_name(service) << " is not an instance of "
                << (*i) << ". Maybe you forgot to export the RTTI information for the interface.";
         throw std::invalid_argument(msg);
       }
     }
   }
 
   ServiceRegistration res(module, service,
                           CreateServiceProperties(properties, classes));
   {
     MutexLocker lock(mutex);
     services.insert(std::make_pair(res, classes));
     serviceRegistrations.push_back(res);
     for (std::list<std::string>::const_iterator i = classes.begin();
          i != classes.end(); ++i)
     {
       std::list<ServiceRegistration>& s = classServices[*i];
       std::list<ServiceRegistration>::iterator ip =
           std::lower_bound(s.begin(), s.end(), res, ServiceRegistrationComparator());
       s.insert(ip, res);
     }
   }
 
   ServiceReference r = res.GetReference();
   ServiceListeners::ServiceListenerEntries listeners;
   module->coreCtx->listeners.GetMatchingServiceListeners(r, listeners);
   module->coreCtx->listeners.ServiceChanged(listeners,
                                             ServiceEvent(ServiceEvent::REGISTERED, r));
   return res;
 }
 
 void ServiceRegistry::UpdateServiceRegistrationOrder(const ServiceRegistration& sr,
                                                      const std::list<std::string>& classes)
 {
   MutexLocker lock(mutex);
   for (std::list<std::string>::const_iterator i = classes.begin();
        i != classes.end(); ++i)
   {
     std::list<ServiceRegistration>& s = classServices[*i];
     std::remove(s.begin(), s.end(), sr);
     s.insert(std::lower_bound(s.begin(), s.end(), sr, ServiceRegistrationComparator()), sr);
   }
 }
 
 bool ServiceRegistry::CheckServiceClass(US_BASECLASS_NAME* , const std::string& ) const
 {
   //return service->inherits(cls.toAscii());
   // No possibility to check inheritance based on string literals.
   return true;
 }
 
 void ServiceRegistry::Get(const std::string& clazz,
                           std::list<ServiceRegistration>& serviceRegs) const
 {
   MutexLocker lock(mutex);
   MapClassServices::const_iterator i = classServices.find(clazz);
   if (i != classServices.end())
   {
     serviceRegs = i->second;
   }
 }
 
 ServiceReference ServiceRegistry::Get(ModulePrivate* module, const std::string& clazz) const
 {
   MutexLocker lock(mutex);
   try
   {
     std::list<ServiceReference> srs;
     Get_unlocked(clazz, "", module, srs);
-    US_INFO << "get service ref " << clazz << " for module "
+    US_DEBUG << "get service ref " << clazz << " for module "
              << module->info.name << " = " << srs.size() << " refs";
 
     if (!srs.empty())
     {
       return srs.front();
     }
   }
   catch (const std::invalid_argument& )
   { }
 
   return ServiceReference();
 }
 
 void ServiceRegistry::Get(const std::string& clazz, const std::string& filter,
                           ModulePrivate* module, std::list<ServiceReference>& res) const
 {
   MutexLocker lock(mutex);
   Get_unlocked(clazz, filter, module, res);
 }
 
 void ServiceRegistry::Get_unlocked(const std::string& clazz, const std::string& filter,
                           ModulePrivate* /*module*/, std::list<ServiceReference>& res) const
 {
   std::list<ServiceRegistration>::const_iterator s;
   std::list<ServiceRegistration>::const_iterator send;
   std::list<ServiceRegistration> v;
   LDAPExpr ldap;
   if (clazz.empty())
   {
     if (!filter.empty())
     {
       ldap = LDAPExpr(filter);
       LDAPExpr::ObjectClassSet matched;
       if (ldap.GetMatchedObjectClasses(matched))
       {
         v.clear();
         for(LDAPExpr::ObjectClassSet::const_iterator className = matched.begin();
             className != matched.end(); ++className)
         {
           MapClassServices::const_iterator i = classServices.find(*className);
           if (i != classServices.end())
           {
             std::copy(i->second.begin(), i->second.end(), std::back_inserter(v));
           }
         }
         if (!v.empty())
         {
           s = v.begin();
           send = v.end();
         }
         else
         {
           return;
         }
       }
       else
       {
         s = serviceRegistrations.begin();
         send = serviceRegistrations.end();
       }
     }
     else
     {
       s = serviceRegistrations.begin();
       send = serviceRegistrations.end();
     }
   }
   else
   {
     MapClassServices::const_iterator it = classServices.find(clazz);
     if (it != classServices.end())
     {
       s = it->second.begin();
       send = it->second.end();
     }
     else
     {
       return;
     }
     if (!filter.empty())
     {
       ldap = LDAPExpr(filter);
     }
   }
 
   for (; s != send; ++s)
   {
     ServiceReference sri = s->GetReference();
 
     if (filter.empty() || ldap.Evaluate(s->d->properties, false))
     {
       res.push_back(sri);
     }
   }
 }
 
 void ServiceRegistry::RemoveServiceRegistration(const ServiceRegistration& sr)
 {
   MutexLocker lock(mutex);
 
   const std::list<std::string>& classes = ref_any_cast<std::list<std::string> >(
         sr.d->properties[ServiceConstants::OBJECTCLASS()]);
   services.erase(sr);
   serviceRegistrations.remove(sr);
   for (std::list<std::string>::const_iterator i = classes.begin();
        i != classes.end(); ++i)
   {
     std::list<ServiceRegistration>& s = classServices[*i];
     if (s.size() > 1)
     {
       std::remove(s.begin(), s.end(), sr);
     }
     else
     {
       classServices.erase(*i);
     }
   }
 }
 
 void ServiceRegistry::GetRegisteredByModule(ModulePrivate* p,
                                             std::list<ServiceRegistration>& res) const
 {
   MutexLocker lock(mutex);
 
   for (std::list<ServiceRegistration>::const_iterator i = serviceRegistrations.begin();
        i != serviceRegistrations.end(); ++i)
   {
     if (i->d->module == p)
     {
       res.push_back(*i);
     }
   }
 }
 
 void ServiceRegistry::GetUsedByModule(Module* p,
                                       std::list<ServiceRegistration>& res) const
 {
   MutexLocker lock(mutex);
 
   for (std::list<ServiceRegistration>::const_iterator i = serviceRegistrations.begin();
        i != serviceRegistrations.end(); ++i)
   {
     if (i->d->IsUsedByModule(p))
     {
       res.push_back(*i);
     }
   }
 }
 
 US_END_NAMESPACE
 
diff --git a/Core/Code/CppMicroServices/src/util/usAny.h b/Core/Code/CppMicroServices/src/util/usAny.h
index 867c6523cd..82d691e099 100644
--- a/Core/Code/CppMicroServices/src/util/usAny.h
+++ b/Core/Code/CppMicroServices/src/util/usAny.h
@@ -1,400 +1,400 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
 
 Copyright Kevlin Henney, 2000, 2001, 2002. All rights reserved.
 Extracted from Boost 1.46.1 and adapted for CppMicroServices.
 
 Permission is hereby granted, free of charge, to any person or organization
 obtaining a copy of the software and accompanying documentation covered by
 this license (the "Software") to use, reproduce, display, distribute,
 execute, and transmit the Software, and to prepare derivative works of the
 Software, and to permit third-parties to whom the Software is furnished to
 do so, all subject to the following:
 
 The copyright notices in the Software and this entire statement, including
 the above license grant, this restriction and the following disclaimer,
 must be included in all copies of the Software, in whole or in part, and
 all derivative works of the Software, unless such copies or derivative
 works are solely in the form of machine-executable object code generated by
 a source language processor.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
 SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
 FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 
 =========================================================================*/
 
 #ifndef US_ANY_H
 #define US_ANY_H
 
 #include <algorithm>
 #include <typeinfo>
 #include <sstream>
 #include <vector>
 #include <list>
 
-#include <usExportMacros_p.h>
+#include <usConfig.h>
 
 US_BEGIN_NAMESPACE
 
 template<class T>
 std::string any_value_to_string(const T& val);
 
 US_EXPORT std::string any_value_to_string(const std::vector<std::string>& val);
 US_EXPORT std::string any_value_to_string(const std::list<std::string>& val);
 
 /**
  * \ingroup MicroServicesUtils
  *
  * An Any class represents a general type and is capable of storing any type, supporting type-safe extraction
  * of the internally stored data.
  *
  * Code taken from the Boost 1.46.1 library. Original copyright by Kevlin Henney. Modified for US.
  */
 class Any
 {
 public:
 
   /**
    * Creates an empty any type.
    */
   Any(): _content(0)
   { }
 
   /**
    * Creates an Any which stores the init parameter inside.
    *
    * \param value The content of the Any
    *
    * Example:
    * \code
    * Any a(13);
    * Any a(string("12345"));
    * \endcode
    */
   template <typename ValueType>
   Any(const ValueType& value)
     : _content(new Holder<ValueType>(value))
   { }
 
   /**
    * Copy constructor, works with empty Anys and initialized Any values.
    *
    * \param other The Any to copy
    */
   Any(const Any& other)
     : _content(other._content ? other._content->Clone() : 0)
   { }
 
   ~Any()
   {
     delete _content;
   }
 
   /**
    * Swaps the content of the two Anys.
    *
    * \param rhs The Any to swap this Any with.
    */
   Any& Swap(Any& rhs)
   {
     std::swap(_content, rhs._content);
     return *this;
   }
 
   /**
    * Assignment operator for all types != Any.
    *
    * \param rhs The value which should be assigned to this Any.
    *
    * Example:
    * \code
    * Any a = 13;
    * Any a = string("12345");
    * \endcode
    */
   template <typename ValueType>
   Any& operator = (const ValueType& rhs)
   {
     Any(rhs).Swap(*this);
     return *this;
   }
 
   /**
    * Assignment operator for Any.
    *
    * \param rhs The Any which should be assigned to this Any.
    */
   Any& operator = (const Any& rhs)
   {
     Any(rhs).Swap(*this);
     return *this;
   }
 
   /**
    * returns true if the Any is empty
    */
   bool Empty() const
   {
     return !_content;
   }
 
   /**
    * Returns a string representation for the content.
    *
    * Custom types should either provide a <code>std::ostream& operator<<(std::ostream& os, const CustomType& ct)</code>
    * function or specialize the any_value_to_string template function for meaningful output.
    */
   std::string ToString() const
   {
     return _content->ToString();
   }
 
   /**
    * Returns the type information of the stored content.
    * If the Any is empty typeid(void) is returned.
    * It is suggested to always query an Any for its type info before trying to extract
    * data via an any_cast/ref_any_cast.
    */
   const std::type_info& Type() const
   {
     return _content ? _content->Type() : typeid(void);
   }
 
 private:
 
   class Placeholder
   {
   public:
     virtual ~Placeholder()
     { }
 
     virtual std::string ToString() const = 0;
 
     virtual const std::type_info& Type() const = 0;
     virtual Placeholder* Clone() const = 0;
   };
 
   template <typename ValueType>
   class Holder: public Placeholder
   {
   public:
     Holder(const ValueType& value)
       : _held(value)
     { }
 
     virtual std::string ToString() const
     {
       return any_value_to_string(_held);
     }
 
     virtual const std::type_info& Type() const
     {
       return typeid(ValueType);
     }
 
     virtual Placeholder* Clone() const
     {
       return new Holder(_held);
     }
 
     ValueType _held;
 
   private: // intentionally left unimplemented
     Holder& operator=(const Holder &);
   };
 
 private:
     template <typename ValueType>
     friend ValueType* any_cast(Any*);
 
     template <typename ValueType>
     friend ValueType* unsafe_any_cast(Any*);
 
     Placeholder* _content;
 };
 
 class BadAnyCastException : public std::bad_cast
 {
 public:
 
   BadAnyCastException(const std::string& msg = "")
     : std::bad_cast(), _msg(msg)
   {}
 
   ~BadAnyCastException() throw() {}
 
   virtual const char * what() const throw()
   {
     if (_msg.empty())
       return "US_PREPEND_NAMESPACE(BadAnyCastException): "
              "failed conversion using US_PREPEND_NAMESPACE(any_cast)";
     else
       return _msg.c_str();
   }
 
 private:
 
   std::string _msg;
 };
 
 /**
  * any_cast operator used to extract the ValueType from an Any*. Will return a pointer
  * to the stored value.
  *
  * Example Usage:
  * \code
  * MyType* pTmp = any_cast<MyType*>(pAny)
  * \endcode
  * Will return NULL if the cast fails, i.e. types don't match.
  */
 template <typename ValueType>
 ValueType* any_cast(Any* operand)
 {
   return operand && operand->Type() == typeid(ValueType)
       ? &static_cast<Any::Holder<ValueType>*>(operand->_content)->_held
       : 0;
 }
 
 /**
  * any_cast operator used to extract a const ValueType pointer from an const Any*. Will return a const pointer
  * to the stored value.
  *
  * Example Usage:
  * \code
  * const MyType* pTmp = any_cast<MyType*>(pAny)
  * \endcode
  * Will return NULL if the cast fails, i.e. types don't match.
  */
 template <typename ValueType>
 const ValueType* any_cast(const Any* operand)
 {
   return any_cast<ValueType>(const_cast<Any*>(operand));
 }
 
 /**
  * any_cast operator used to extract a copy of the ValueType from an const Any&.
  *
  * Example Usage:
  * \code
  * MyType tmp = any_cast<MyType>(anAny)
  * \endcode
  * Will throw a BadCastException if the cast fails.
  * Dont use an any_cast in combination with references, i.e. MyType& tmp = ... or const MyType& = ...
  * Some compilers will accept this code although a copy is returned. Use the ref_any_cast in
  * these cases.
  */
 template <typename ValueType>
 ValueType any_cast(const Any& operand)
 {
   ValueType* result = any_cast<ValueType>(const_cast<Any*>(&operand));
   if (!result) throw BadAnyCastException("Failed to convert between const Any types");
   return *result;
 }
 
 /**
  * any_cast operator used to extract a copy of the ValueType from an Any&.
  *
  * Example Usage:
  * \code
  * MyType tmp = any_cast<MyType>(anAny)
  * \endcode
  * Will throw a BadCastException if the cast fails.
  * Dont use an any_cast in combination with references, i.e. MyType& tmp = ... or const MyType& tmp = ...
  * Some compilers will accept this code although a copy is returned. Use the ref_any_cast in
  * these cases.
  */
 template <typename ValueType>
 ValueType any_cast(Any& operand)
 {
   ValueType* result = any_cast<ValueType>(&operand);
   if (!result) throw BadAnyCastException("Failed to convert between Any types");
   return *result;
 }
 
 /**
  * ref_any_cast operator used to return a const reference to the internal data.
  *
  * Example Usage:
  * \code
  * const MyType& tmp = ref_any_cast<MyType>(anAny);
  * \endcode
  */
 template <typename ValueType>
 const ValueType& ref_any_cast(const Any & operand)
 {
   ValueType* result = any_cast<ValueType>(const_cast<Any*>(&operand));
   if (!result) throw BadAnyCastException("RefAnyCast: Failed to convert between const Any types");
   return *result;
 }
 
 /**
  * ref_any_cast operator used to return a reference to the internal data.
  *
  * Example Usage:
  * \code
  * MyType& tmp = ref_any_cast<MyType>(anAny);
  * \endcode
  */
 template <typename ValueType>
 ValueType& ref_any_cast(Any& operand)
 {
   ValueType* result = any_cast<ValueType>(&operand);
   if (!result) throw BadAnyCastException("RefAnyCast: Failed to convert between Any types");
   return *result;
 }
 
 /**
  * \internal
  *
  * The "unsafe" versions of any_cast are not part of the
  * public interface and may be removed at any time. They are
  * required where we know what type is stored in the any and can't
  * use typeid() comparison, e.g., when our types may travel across
  * different shared libraries.
  */
 template <typename ValueType>
 ValueType* unsafe_any_cast(Any* operand)
 {
   return &static_cast<Any::Holder<ValueType>*>(operand->_content)->_held;
 }
 
 /**
  * \internal
  *
  * The "unsafe" versions of any_cast are not part of the
  * public interface and may be removed at any time. They are
  * required where we know what type is stored in the any and can't
  * use typeid() comparison, e.g., when our types may travel across
  * different shared libraries.
  */
 template <typename ValueType>
 const ValueType* unsafe_any_cast(const Any* operand)
 {
   return any_cast<ValueType>(const_cast<Any*>(operand));
 }
 
 US_EXPORT std::string any_value_to_string(const std::vector<Any>& val);
 
 template<class T>
 std::string any_value_to_string(const T& val)
 {
   std::stringstream ss;
   ss << val;
   return ss.str();
 }
 
 US_END_NAMESPACE
 
 inline std::ostream& operator<< (std::ostream& os, const US_PREPEND_NAMESPACE(Any)& any)
 {
   return os << any.ToString();
 }
 
 #endif // US_ANY_H
diff --git a/Core/Code/CppMicroServices/src/util/usExportMacros_p.h b/Core/Code/CppMicroServices/src/util/usExportMacros_p.h
deleted file mode 100644
index f9a7f7adce..0000000000
--- a/Core/Code/CppMicroServices/src/util/usExportMacros_p.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*=============================================================================
-
-  Library: CppMicroServices
-
-  Copyright (c) German Cancer Research Center,
-    Division of Medical and Biological Informatics
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-=============================================================================*/
-
-
-#ifndef USEXPORTMACROS_H
-#define USEXPORTMACROS_H
-
-#include <usConfig.h>
-
-/**
-  * Macros for import/export declarations
-  */
-#if defined(WIN32)
-  #define US_ABI_EXPORT __declspec(dllexport)
-  #define US_ABI_IMPORT __declspec(dllimport)
-  #define US_ABI_LOCAL
-#else
-  #if __GNUC__ >= 4
-    #define US_ABI_EXPORT __attribute__ ((visibility ("default")))
-    #define US_ABI_IMPORT __attribute__ ((visibility ("default")))
-    #define US_ABI_LOCAL  __attribute__ ((visibility ("hidden")))
-  #else
-    #define US_ABI_EXPORT
-    #define US_ABI_IMPORT
-    #define US_ABI_LOCAL
-  #endif
-#endif
-
-#ifdef US_BUILD_SHARED_LIBS
-  // We are building a shared lib
-  #ifdef CppMicroServices_EXPORTS
-    #define US_EXPORT US_ABI_EXPORT
-  #else
-    #define US_EXPORT US_ABI_IMPORT
-  #endif
-#else
-  // We are building a static lib
-  #if __GNUC__ >= 4
-    // Don't hide RTTI symbols of definitions in the C++ Micro Services
-    // headers that are included in DSOs with hidden visibility
-    #define US_EXPORT US_ABI_EXPORT
-  #else
-    #define US_EXPORT
-  #endif
-#endif
-
-#endif // USEXPORTMACROS_H
diff --git a/Core/Code/CppMicroServices/src/util/usSharedData.h b/Core/Code/CppMicroServices/src/util/usSharedData.h
index 31e90a595e..f3a6dfc82f 100644
--- a/Core/Code/CppMicroServices/src/util/usSharedData.h
+++ b/Core/Code/CppMicroServices/src/util/usSharedData.h
@@ -1,276 +1,274 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 
 Modified version of qshareddata.h from Qt 4.7.3 for CppMicroServices.
 Original copyright (c) Nokia Corporation. Usage covered by the
 GNU Lesser General Public License version 2.1
 (http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html) and the Nokia Qt
 LGPL Exception version 1.1 (file LGPL_EXCEPTION.txt in Qt 4.7.3 package).
 
 =========================================================================*/
 
 #ifndef USSHAREDDATA_H
 #define USSHAREDDATA_H
 
 #include "usAtomicInt_p.h"
 
 #include <algorithm>
 #include <utility>
 
-#include <usExportMacros_p.h>
-
 US_BEGIN_NAMESPACE
 
 /**
  * \ingroup MicroServicesUtils
  */
 class SharedData
 {
 public:
   mutable AtomicInt ref;
 
   inline SharedData() : ref(0) { }
   inline SharedData(const SharedData&) : ref(0) { }
 
 private:
   // using the assignment operator would lead to corruption in the ref-counting
   SharedData& operator=(const SharedData&);
 };
 
 /**
  * \ingroup MicroServicesUtils
  */
 template <class T>
 class SharedDataPointer
 {
 public:
   typedef T Type;
   typedef T* pointer;
 
   inline void Detach() { if (d && d->ref != 1) Detach_helper(); }
   inline T& operator*() { Detach(); return *d; }
   inline const T& operator*() const { return *d; }
   inline T* operator->() { Detach(); return d; }
   inline const T* operator->() const { return d; }
   inline operator T*() { Detach(); return d; }
   inline operator const T*() const { return d; }
   inline T* Data() { Detach(); return d; }
   inline const T* Data() const { return d; }
   inline const T* ConstData() const { return d; }
 
   inline bool operator==(const SharedDataPointer<T>& other) const { return d == other.d; }
   inline bool operator!=(const SharedDataPointer<T>& other) const { return d != other.d; }
 
   inline SharedDataPointer() : d(0) { }
   inline ~SharedDataPointer() { if (d && !d->ref.Deref()) delete d; }
 
   explicit SharedDataPointer(T* data);
   inline SharedDataPointer(const SharedDataPointer<T>& o) : d(o.d) { if (d) d->ref.Ref(); }
 
   inline SharedDataPointer<T> & operator=(const SharedDataPointer<T>& o)
   {
     if (o.d != d)
     {
       if (o.d)
         o.d->ref.Ref();
       T *old = d;
       d = o.d;
       if (old && !old->ref.Deref())
         delete old;
     }
     return *this;
   }
 
   inline SharedDataPointer &operator=(T *o)
   {
     if (o != d)
     {
       if (o)
         o->ref.Ref();
       T *old = d;
       d = o;
       if (old && !old->ref.Deref())
         delete old;
     }
     return *this;
   }
 
   inline bool operator!() const { return !d; }
 
   inline void Swap(SharedDataPointer& other)
   {
     using std::swap;
     swap(d, other.d);
   }
 
 protected:
   T* Clone();
 
 private:
   void Detach_helper();
 
   T *d;
 };
 
 /**
  * \ingroup MicroServicesUtils
  */
 template <class T> class ExplicitlySharedDataPointer
 {
 public:
   typedef T Type;
   typedef T* pointer;
 
   inline T& operator*() const { return *d; }
   inline T* operator->() { return d; }
   inline T* operator->() const { return d; }
   inline T* Data() const { return d; }
   inline const T* ConstData() const { return d; }
 
   inline void Detach() { if (d && d->ref != 1) Detach_helper(); }
 
   inline void Reset()
   {
     if(d && !d->ref.Deref())
       delete d;
 
     d = 0;
   }
 
   inline operator bool () const { return d != 0; }
 
   inline bool operator==(const ExplicitlySharedDataPointer<T>& other) const { return d == other.d; }
   inline bool operator!=(const ExplicitlySharedDataPointer<T>& other) const { return d != other.d; }
   inline bool operator==(const T* ptr) const { return d == ptr; }
   inline bool operator!=(const T* ptr) const { return d != ptr; }
 
   inline ExplicitlySharedDataPointer() { d = 0; }
   inline ~ExplicitlySharedDataPointer() { if (d && !d->ref.Deref()) delete d; }
 
   explicit ExplicitlySharedDataPointer(T* data);
   inline ExplicitlySharedDataPointer(const ExplicitlySharedDataPointer<T> &o)
     : d(o.d) { if (d) d->ref.Ref(); }
 
   template<class X>
   inline ExplicitlySharedDataPointer(const ExplicitlySharedDataPointer<X>& o)
     : d(static_cast<T*>(o.Data()))
   {
     if(d)
       d->ref.Ref();
   }
 
   inline ExplicitlySharedDataPointer<T>& operator=(const ExplicitlySharedDataPointer<T>& o)
   {
     if (o.d != d)
     {
       if (o.d)
         o.d->ref.Ref();
       T *old = d;
       d = o.d;
       if (old && !old->ref.Deref())
         delete old;
     }
     return *this;
   }
 
   inline ExplicitlySharedDataPointer& operator=(T* o)
   {
     if (o != d)
     {
       if (o)
         o->ref.Ref();
       T *old = d;
       d = o;
       if (old && !old->ref.Deref())
         delete old;
     }
     return *this;
   }
 
   inline bool operator!() const { return !d; }
 
   inline void Swap(ExplicitlySharedDataPointer& other)
   {
     using std::swap;
     swap(d, other.d);
   }
 
 protected:
   T* Clone();
 
 private:
   void Detach_helper();
 
   T *d;
 };
 
 
 template <class T>
 SharedDataPointer<T>::SharedDataPointer(T* adata) : d(adata)
 { if (d) d->ref.Ref(); }
 
 template <class T>
 T* SharedDataPointer<T>::Clone()
 {
   return new T(*d);
 }
 
 template <class T>
 void SharedDataPointer<T>::Detach_helper()
 {
   T *x = Clone();
   x->ref.Ref();
   if (!d->ref.Deref())
     delete d;
   d = x;
 }
 
 template <class T>
 T* ExplicitlySharedDataPointer<T>::Clone()
 {
   return new T(*d);
 }
 
 template <class T>
 void ExplicitlySharedDataPointer<T>::Detach_helper()
 {
   T *x = Clone();
     x->ref.Ref();
   if (!d->ref.Deref())
     delete d;
   d = x;
 }
 
 template <class T>
 ExplicitlySharedDataPointer<T>::ExplicitlySharedDataPointer(T* adata)
   : d(adata)
 { if (d) d->ref.Ref(); }
 
 template <class T>
 void swap(US_PREPEND_NAMESPACE(SharedDataPointer<T)>& p1, US_PREPEND_NAMESPACE(SharedDataPointer<T)>& p2)
 { p1.Swap(p2); }
 
 template <class T>
 void swap(US_PREPEND_NAMESPACE(ExplicitlySharedDataPointer<T)>& p1, US_PREPEND_NAMESPACE(ExplicitlySharedDataPointer<T)>& p2)
 { p1.Swap(p2); }
 
 US_END_NAMESPACE
 
 #endif // USSHAREDDATA_H
diff --git a/Core/Code/CppMicroServices/src/util/usThreads_p.h b/Core/Code/CppMicroServices/src/util/usThreads_p.h
index 0e3cbf2403..8c77a24781 100644
--- a/Core/Code/CppMicroServices/src/util/usThreads_p.h
+++ b/Core/Code/CppMicroServices/src/util/usThreads_p.h
@@ -1,431 +1,430 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 
 #ifndef USTHREADINGMODEL_H
 #define USTHREADINGMODEL_H
 
 #include <usConfig.h>
-#include "usExportMacros_p.h"
 
 #ifdef US_ENABLE_THREADING_SUPPORT
 
   // Atomic compiler intrinsics
 
   #if defined(US_PLATFORM_APPLE)
     // OSAtomic.h optimizations only used in 10.5 and later
     #include <AvailabilityMacros.h>
     #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
       #include <libkern/OSAtomic.h>
       #define US_ATOMIC_OPTIMIZATION_APPLE
     #endif
 
   #elif defined(__GLIBCPP__) || defined(__GLIBCXX__)
 
     #if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2))
       # include <ext/atomicity.h>
     #else
       # include <bits/atomicity.h>
     #endif
     #define US_ATOMIC_OPTIMIZATION_GNUC
 
   #endif
 
   // Mutex support
 
   #ifdef US_PLATFORM_WINDOWS
     #ifndef WIN32_LEAN_AND_MEAN
       #define WIN32_LEAN_AND_MEAN
     #endif
     #ifndef NOMINMAX
       #define NOMINMAX
     #endif
     #include <windows.h>
 
     #define US_THREADS_MUTEX(x)           HANDLE (x);
     #define US_THREADS_MUTEX_INIT(x)
     #define US_THREADS_MUTEX_CTOR(x)      : x(::CreateMutex(NULL, FALSE, NULL))
     #define US_THREADS_MUTEX_DELETE(x)    ::CloseHandle (x)
     #define US_THREADS_MUTEX_LOCK(x)      ::WaitForSingleObject (x, INFINITE)
     #define US_THREADS_MUTEX_UNLOCK(x)    ::ReleaseMutex (x)
     #define US_THREADS_LONG               LONG
 
     #define US_ATOMIC_OPTIMIZATION
     #define US_ATOMIC_INCREMENT(x)        IntType n = InterlockedIncrement(x)
     #define US_ATOMIC_DECREMENT(x)        IntType n = InterlockedDecrement(x)
     #define US_ATOMIC_ASSIGN(l, r)        InterlockedExchange(l, r)
 
   #elif defined(US_PLATFORM_POSIX)
 
     #include <pthread.h>
 
     #define US_THREADS_MUTEX(x)           pthread_mutex_t (x);
     #define US_THREADS_MUTEX_INIT(x)      ::pthread_mutex_init(&x, 0)
     #define US_THREADS_MUTEX_CTOR(x)      : x()
     #define US_THREADS_MUTEX_DELETE(x)    ::pthread_mutex_destroy (&x)
     #define US_THREADS_MUTEX_LOCK(x)      ::pthread_mutex_lock (&x)
     #define US_THREADS_MUTEX_UNLOCK(x)    ::pthread_mutex_unlock (&x)
 
     #define US_ATOMIC_OPTIMIZATION
     #if defined(US_ATOMIC_OPTIMIZATION_APPLE)
       #if defined (__LP64__) && __LP64__
         #define US_THREADS_LONG           volatile int64_t
         #define US_ATOMIC_INCREMENT(x)    IntType n = OSAtomicIncrement64Barrier(x)
         #define US_ATOMIC_DECREMENT(x)    IntType n = OSAtomicDecrement64Barrier(x)
         #define US_ATOMIC_ASSIGN(l, v)    OSAtomicCompareAndSwap64Barrier(*l, v, l)
       #else
         #define US_THREADS_LONG           volatile int32_t
         #define US_ATOMIC_INCREMENT(x)    IntType n = OSAtomicIncrement32Barrier(x)
         #define US_ATOMIC_DECREMENT(x)    IntType n = OSAtomicDecrement32Barrier(x)
         #define US_ATOMIC_ASSIGN(l, v)    OSAtomicCompareAndSwap32Barrier(*l, v, l)
       #endif
     #elif defined(US_ATOMIC_OPTIMIZATION_GNUC)
       #define US_THREADS_LONG             _Atomic_word
       #define US_ATOMIC_INCREMENT(x)      IntType n = __sync_add_and_fetch(x, 1)
       #define US_ATOMIC_DECREMENT(x)      IntType n = __sync_add_and_fetch(x, -1)
       #define US_ATOMIC_ASSIGN(l, v)      __sync_val_compare_and_swap(l, *l, v)
     #else
       #define US_THREADS_LONG             long
       #undef US_ATOMIC_OPTIMIZATION
       #define US_ATOMIC_INCREMENT(x)      m_AtomicMtx.Lock();  \
                                           IntType n = ++(*x);  \
                                           m_AtomicMtx.Unlock()
       #define US_ATOMIC_DECREMENT(x)      m_AtomicMtx.Lock();  \
                                           IntType n = --(*x);  \
                                           m_AtomicMtx.Unlock()
       #define US_ATOMIC_ASSIGN(l, v)      m_AtomicMtx.Lock();  \
                                           *l = v;              \
                                           m_AtomicMtx.Unlock()
     #endif
 
   #endif
 
 #else
 
   // single threaded
   #define US_THREADS_MUTEX(x)
   #define US_THREADS_MUTEX_INIT(x)
   #define US_THREADS_MUTEX_CTOR(x)
   #define US_THREADS_MUTEX_DELETE(x)
   #define US_THREADS_MUTEX_LOCK(x)
   #define US_THREADS_MUTEX_UNLOCK(x)
   #define US_THREADS_LONG
 
 #endif
 
 #ifndef US_DEFAULT_MUTEX
   #define US_DEFAULT_MUTEX US_PREPEND_NAMESPACE(Mutex)
 #endif
 
 
 US_BEGIN_NAMESPACE
 
 class Mutex
 {
 public:
 
   Mutex() US_THREADS_MUTEX_CTOR(m_Mtx)
   {
     US_THREADS_MUTEX_INIT(m_Mtx);
   }
 
   ~Mutex()
   {
     US_THREADS_MUTEX_DELETE(m_Mtx);
   }
 
   void Lock()
   {
     US_THREADS_MUTEX_LOCK(m_Mtx);
   }
   void Unlock()
   {
     US_THREADS_MUTEX_UNLOCK(m_Mtx);
   }
 
 private:
 
   friend class WaitCondition;
 
   // Copy-constructor not implemented.
   Mutex(const Mutex &);
   // Copy-assignement operator not implemented.
   Mutex & operator = (const Mutex &);
 
   US_THREADS_MUTEX(m_Mtx)
 };
 
 template<class MutexPolicy = US_DEFAULT_MUTEX>
 class MutexLock
 {
 public:
   typedef MutexPolicy MutexType;
 
   MutexLock(MutexType& mtx) : m_Mtx(&mtx) { m_Mtx->Lock(); }
   ~MutexLock() { m_Mtx->Unlock(); }
 
 private:
   MutexType* m_Mtx;
 
   // purposely not implemented
   MutexLock(const MutexLock&);
   MutexLock& operator=(const MutexLock&);
 };
 
 typedef MutexLock<> DefaultMutexLock;
 
 
 /**
  * \brief A thread synchronization object used to suspend execution until some
  * condition on shared data is met.
  *
  * A thread calls Wait() to suspend its execution until the condition is
  * met. Each call to Notify() from an executing thread will then cause a single
  * waiting thread to be released.  A call to Notify() means, "signal
  * that the condition is true."  NotifyAll() releases all threads waiting on
  * the condition variable.
  *
  * The WaitCondition implementation is consistent with the standard
  * definition and use of condition variables in pthreads and other common
  * thread libraries.
  *
  * IMPORTANT: A condition variable always requires an associated mutex
  * object. The mutex object is used to avoid a dangerous race condition when
  * Wait() and Notify() are called simultaneously from two different
  * threads.
  *
  * On systems using pthreads, this implementation abstracts the
  * standard calls to the pthread condition variable.  On Win32
  * systems, there is no system provided condition variable.  This
  * class implements a condition variable using a critical section, a
  * semphore, an event and a number of counters.  The implementation is
  * almost an extract translation of the implementation presented by
  * Douglas C Schmidt and Irfan Pyarali in "Strategies for Implementing
  * POSIX Condition Variables on Win32". This article can be found at
  * http://www.cs.wustl.edu/~schmidt/win32-cv-1.html
  *
  */
 class US_EXPORT WaitCondition
 {
 public:
 
   typedef US_DEFAULT_MUTEX MutexType;
 
   WaitCondition();
   ~WaitCondition();
 
   /** Suspend execution of this thread until the condition is signaled. The
    *  argument is a SimpleMutex object that must be locked prior to calling
    *  this method.  */
   bool Wait(MutexType& mutex, unsigned long time = 0);
 
   bool Wait(MutexType* mutex, unsigned long time = 0);
 
   /** Notify that the condition is true and release one waiting thread */
   void Notify();
 
   /** Notify that the condition is true and release all waiting threads */
   void NotifyAll();
 
 private:
 
   // purposely not implemented
   WaitCondition(const WaitCondition& other);
   const WaitCondition& operator=(const WaitCondition&);
 
 #ifdef US_ENABLE_THREADING_SUPPORT
   #ifdef US_PLATFORM_POSIX
   pthread_cond_t m_WaitCondition;
   #else
 
   int m_NumberOfWaiters;                   // number of waiting threads
   CRITICAL_SECTION m_NumberOfWaitersLock;  // Serialize access to
   // m_NumberOfWaiters
 
   HANDLE m_Semaphore;                      // Semaphore to queue threads
   HANDLE m_WaitersAreDone;                 // Auto-reset event used by the
                                            // broadcast/signal thread to
                                            // wait for all the waiting
                                            // threads to wake up and
                                            // release the semaphore
 
   std::size_t m_WasNotifyAll;              // Keeps track of whether we
                                            // were broadcasting or signaling
   #endif
 
 #endif
 };
 
 US_END_NAMESPACE
 
 #ifdef US_ENABLE_THREADING_SUPPORT
 
 US_BEGIN_NAMESPACE
 
 template<class Host, class MutexPolicy = US_DEFAULT_MUTEX>
 class MultiThreaded
 {
   mutable MutexPolicy m_Mtx;
   WaitCondition m_Cond;
 
   #if !defined(US_ATOMIC_OPTIMIZATION)
   mutable MutexPolicy m_AtomicMtx;
   #endif
 
 public:
 
   MultiThreaded() : m_Mtx(), m_Cond() {}
   MultiThreaded(const MultiThreaded&) : m_Mtx(), m_Cond() {}
   virtual ~MultiThreaded() {}
 
   class Lock;
   friend class Lock;
 
   class Lock
   {
   public:
 
     // Lock object
     explicit Lock(const MultiThreaded& host) : m_Host(host)
     {
       m_Host.m_Mtx.Lock();
     }
 
     // Lock object
     explicit Lock(const MultiThreaded* host) : m_Host(*host)
     {
       m_Host.m_Mtx.Lock();
     }
 
     // Unlock object
     ~Lock()
     {
       m_Host.m_Mtx.Unlock();
     }
 
   private:
 
     // private by design
     Lock();
     Lock(const Lock&);
     Lock& operator=(const Lock&);
     const MultiThreaded& m_Host;
 
   };
 
   typedef volatile Host VolatileType;
   typedef US_THREADS_LONG IntType;
 
   bool Wait(unsigned long timeoutMillis = 0)
   {
     return m_Cond.Wait(m_Mtx, timeoutMillis);
   }
 
   void Notify()
   {
     m_Cond.Notify();
   }
 
   void NotifyAll()
   {
     m_Cond.NotifyAll();
   }
 
   IntType AtomicIncrement(volatile IntType& lval) const
   {
     US_ATOMIC_INCREMENT(&lval);
     return n;
   }
 
   IntType AtomicDecrement(volatile IntType& lval) const
   {
     US_ATOMIC_DECREMENT(&lval);
     return n;
   }
 
   void AtomicAssign(volatile IntType& lval, const IntType val) const
   {
     US_ATOMIC_ASSIGN(&lval, val);
   }
 
 };
 
 US_END_NAMESPACE
 
 #endif
 
 
 US_BEGIN_NAMESPACE
 
 template<class Host, class MutexPolicy = US_DEFAULT_MUTEX>
 class SingleThreaded
 {
 public:
 
   virtual ~SingleThreaded() {}
 
   // Dummy Lock class
   struct Lock
   {
     Lock() {}
     explicit Lock(const SingleThreaded&) {}
     explicit Lock(const SingleThreaded*) {}
   };
 
   typedef Host VolatileType;
   typedef int IntType;
 
   bool Wait(unsigned long = 0)
   { return false; }
 
   void Notify() {}
 
   void NotifyAll() {}
 
   static IntType AtomicAdd(volatile IntType& lval, const IntType val)
   { return lval += val; }
 
   static IntType AtomicSubtract(volatile IntType& lval, const IntType val)
   { return lval -= val; }
 
   static IntType AtomicMultiply(volatile IntType& lval, const IntType val)
   { return lval *= val; }
 
   static IntType AtomicDivide(volatile IntType& lval, const IntType val)
   { return lval /= val; }
 
   static IntType AtomicIncrement(volatile IntType& lval)
   { return ++lval; }
 
   static IntType AtomicDecrement(volatile IntType& lval)
   { return --lval; }
 
   static void AtomicAssign(volatile IntType & lval, const IntType val)
   { lval = val; }
 
   static void AtomicAssign(IntType & lval, volatile IntType & val)
   { lval = val; }
 
 };
 
 US_END_NAMESPACE
 
 #endif // USTHREADINGMODEL_H
diff --git a/Core/Code/CppMicroServices/src/util/usUtils.cpp b/Core/Code/CppMicroServices/src/util/usUtils.cpp
index c1d364c4ae..ffd8b2e38d 100644
--- a/Core/Code/CppMicroServices/src/util/usUtils.cpp
+++ b/Core/Code/CppMicroServices/src/util/usUtils.cpp
@@ -1,63 +1,108 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 #include "usUtils_p.h"
 
+#include <cstdio>
+
 #ifdef US_PLATFORM_POSIX
-#include <errno.h>
-#include <string.h>
+  #include <errno.h>
+  #include <string.h>
 #else
-#ifndef WIN32_LEAN_AND_MEAN
-  #define WIN32_LEAN_AND_MEAN
-#endif
-#include <windows.h>
+  #ifndef WIN32_LEAN_AND_MEAN
+    #define WIN32_LEAN_AND_MEAN
+  #endif
+  #include <windows.h>
+  #include <crtdbg.h>
 #endif
 
 US_BEGIN_NAMESPACE
 
 std::string GetLastErrorStr()
 {
 #ifdef US_PLATFORM_POSIX
   return std::string(strerror(errno));
 #else
   // Retrieve the system error message for the last-error code
   LPVOID lpMsgBuf;
   DWORD dw = GetLastError();
 
   FormatMessage(
     FORMAT_MESSAGE_ALLOCATE_BUFFER |
     FORMAT_MESSAGE_FROM_SYSTEM |
     FORMAT_MESSAGE_IGNORE_INSERTS,
     NULL,
     dw,
     MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
     (LPTSTR) &lpMsgBuf,
     0, NULL );
 
   std::string errMsg((LPCTSTR)lpMsgBuf);
 
   LocalFree(lpMsgBuf);
 
   return errMsg;
 #endif
 }
 
+static MsgHandler handler = 0;
+
+MsgHandler installMsgHandler(MsgHandler h)
+{
+  MsgHandler old = handler;
+  handler = h;
+  return old;
+}
+
+void message_output(MsgType msgType, const char *buf)
+{
+  if (handler)
+  {
+    (*handler)(msgType, buf);
+  }
+  else
+  {
+    fprintf(stderr, "%s\n", buf);
+    fflush(stderr);
+  }
+
+  if (msgType == ErrorMsg)
+  {
+  #if defined(_MSC_VER) && !defined(NDEBUG) && defined(_CRT_ERROR)
+    // get the current report mode
+    int reportMode = _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_WNDW);
+    _CrtSetReportMode(_CRT_ERROR, reportMode);
+    int ret = _CrtDbgReport(_CRT_ERROR, __FILE__, __LINE__, CppMicroServices_VERSION_STR, buf);
+    if (ret == 0  && reportMode & _CRTDBG_MODE_WNDW)
+      return; // ignore
+    else if (ret == 1)
+      _CrtDbgBreak();
+  #endif
+
+  #ifdef US_PLATFORM_POSIX
+    abort(); // trap; generates core dump
+  #else
+    exit(1); // goodbye cruel world
+  #endif
+  }
+}
+
 US_END_NAMESPACE
diff --git a/Core/Code/CppMicroServices/src/util/usUtils_p.h b/Core/Code/CppMicroServices/src/util/usUtils_p.h
index a78d6a566c..1e5b5d2065 100644
--- a/Core/Code/CppMicroServices/src/util/usUtils_p.h
+++ b/Core/Code/CppMicroServices/src/util/usUtils_p.h
@@ -1,179 +1,207 @@
 /*=============================================================================
 
   Library: CppMicroServices
 
   Copyright (c) German Cancer Research Center,
     Division of Medical and Biological Informatics
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 
 =============================================================================*/
 
 
 #ifndef USUTILS_H
 #define USUTILS_H
 
 #include <usConfig.h>
 
 #include <iostream>
 #include <sstream>
 #include <algorithm>
 
-#include <usExportMacros_p.h>
-
 
 //-------------------------------------------------------------------
 // Logging
 //-------------------------------------------------------------------
 
 US_BEGIN_NAMESPACE
 
+US_EXPORT void message_output(MsgType, const char* buf);
+
 struct LogMsg {
 
-  LogMsg() : enabled(true), buffer() {}
-  ~LogMsg() { std::cout << buffer.str() << std::endl; }
+  LogMsg(int t) : type(static_cast<MsgType>(t)), enabled(true), buffer() {}
+  ~LogMsg() { if(enabled) message_output(type, buffer.str().c_str()); }
 
   template<typename T>
   LogMsg& operator<<(T t)
   {
-    if (enabled)
-    {
-      buffer << t;
-    }
+    if (enabled) buffer << t;
     return *this;
   }
 
   LogMsg& operator()(bool flag)
   {
     this->enabled = flag;
     return *this;
   }
 
 private:
 
+  MsgType type;
   bool enabled;
   std::stringstream buffer;
 };
 
+struct NoLogMsg {
+
+  template<typename T>
+  NoLogMsg& operator<<(T)
+  {
+    return *this;
+  }
+
+  NoLogMsg& operator()(bool)
+  {
+    return *this;
+  }
+
+};
+
 US_END_NAMESPACE
 
-#define US_DEBUG US_PREPEND_NAMESPACE(LogMsg)()
-#define US_INFO US_PREPEND_NAMESPACE(LogMsg)()
-#define US_ERROR US_PREPEND_NAMESPACE(LogMsg)()
-#define US_WARN US_PREPEND_NAMESPACE(LogMsg)()
+#if !defined(US_NO_DEBUG_OUTPUT)
+  #define US_DEBUG US_PREPEND_NAMESPACE(LogMsg)(0)
+#else
+  #define US_DEBUG US_PREPEND_NAMESPACE(NoLogMsg)()
+#endif
+
+#if !defined(US_NO_INFO_OUTPUT)
+  #define US_INFO US_PREPEND_NAMESPACE(LogMsg)(1)
+#else
+  #define US_INFO US_PREPEND_NAMESPACE(NoLogMsg)()
+#endif
+
+#if !defined(US_NO_WARNING_OUTPUT)
+  #define US_WARN US_PREPEND_NAMESPACE(LogMsg)(2)
+#else
+  #define US_WARN US_PREPEND_NAMESPACE(LogMsg)()
+#endif
+
+#define US_ERROR US_PREPEND_NAMESPACE(LogMsg)(3)
 
 //-------------------------------------------------------------------
 // Error handling
 //-------------------------------------------------------------------
 
 US_BEGIN_NAMESPACE
 
 US_EXPORT std::string GetLastErrorStr();
 
 US_END_NAMESPACE
 
 
 //-------------------------------------------------------------------
 // Functors
 //-------------------------------------------------------------------
 
 #include <usServiceEvent.h>
 #include <usModuleEvent.h>
 
 #if defined(US_USE_CXX11) || defined(__GNUC__)
 
   #ifdef US_USE_CXX11
     #include <functional>
     #define US_MODULE_LISTENER_FUNCTOR std::function<void(const US_PREPEND_NAMESPACE(ModuleEvent)&)>
     #define US_SERVICE_LISTENER_FUNCTOR std::function<void(const US_PREPEND_NAMESPACE(ServiceEvent)&)>
   #else
     #include <tr1/functional>
     #define US_MODULE_LISTENER_FUNCTOR std::tr1::function<void(const US_PREPEND_NAMESPACE(ModuleEvent)&)>
     #define US_SERVICE_LISTENER_FUNCTOR std::tr1::function<void(const US_PREPEND_NAMESPACE(ServiceEvent)&)>
   #endif
 
   US_BEGIN_NAMESPACE
     template<class X>
     US_MODULE_LISTENER_FUNCTOR ModuleListenerMemberFunctor(X* x, void (X::*memFn)(const US_PREPEND_NAMESPACE(ModuleEvent)))
     { return std::bind1st(std::mem_fun(memFn), x); }
   US_END_NAMESPACE
 
   US_BEGIN_NAMESPACE
     struct ModuleListenerCompare : std::binary_function<US_MODULE_LISTENER_FUNCTOR, US_MODULE_LISTENER_FUNCTOR, bool>
     {
       bool operator()(const US_MODULE_LISTENER_FUNCTOR& f1,
                       const US_MODULE_LISTENER_FUNCTOR& f2) const
       {
         return f1.target<void(const US_PREPEND_NAMESPACE(ModuleEvent)&)>() == f2.target<void(const US_PREPEND_NAMESPACE(ModuleEvent)&)>();
       }
     };
   US_END_NAMESPACE
 
   US_BEGIN_NAMESPACE
     template<class X>
     US_SERVICE_LISTENER_FUNCTOR ServiceListenerMemberFunctor(X* x, void (X::*memFn)(const US_PREPEND_NAMESPACE(ServiceEvent)))
     { return std::bind1st(std::mem_fun(memFn), x); }
   US_END_NAMESPACE
 
   US_BEGIN_NAMESPACE
     struct ServiceListenerCompare : std::binary_function<US_SERVICE_LISTENER_FUNCTOR, US_SERVICE_LISTENER_FUNCTOR, bool>
     {
       bool operator()(const US_SERVICE_LISTENER_FUNCTOR& f1,
                       const US_SERVICE_LISTENER_FUNCTOR& f2) const
       {
         return f1.target<void(const US_PREPEND_NAMESPACE(ServiceEvent)&)>() == f2.target<void(const US_PREPEND_NAMESPACE(ServiceEvent)&)>();
       }
     };
   US_END_NAMESPACE
 
 #else
 
-  #include <usFunctor.h>
+  #include <usFunctor_p.h>
 
   #define US_MODULE_LISTENER_FUNCTOR US_PREPEND_NAMESPACE(Functor)<const US_PREPEND_NAMESPACE(ModuleEvent)&>
 
   US_BEGIN_NAMESPACE
     template<class X, typename MemFn>
     US_MODULE_LISTENER_FUNCTOR ModuleListenerMemberFunctor(X* x, MemFn memFn)
     { return Functor<const ModuleEvent&>(x, memFn); }
   US_END_NAMESPACE
 
   US_BEGIN_NAMESPACE
     struct ModuleListenerCompare : std::binary_function<US_MODULE_LISTENER_FUNCTOR, US_MODULE_LISTENER_FUNCTOR, bool>
     {
       bool operator()(const US_MODULE_LISTENER_FUNCTOR& f1,
                       const US_MODULE_LISTENER_FUNCTOR& f2) const
       { return f1 == f2; }
     };
   US_END_NAMESPACE
 
   #define US_SERVICE_LISTENER_FUNCTOR US_PREPEND_NAMESPACE(Functor)<const US_PREPEND_NAMESPACE(ServiceEvent)&>
 
   US_BEGIN_NAMESPACE
     template<class X, typename MemFn>
     US_SERVICE_LISTENER_FUNCTOR ServiceListenerMemberFunctor(X* x, MemFn memFn)
     { return Functor<const ServiceEvent&>(x, memFn); }
   US_END_NAMESPACE
 
   US_BEGIN_NAMESPACE
     struct ServiceListenerCompare : std::binary_function<US_SERVICE_LISTENER_FUNCTOR, US_SERVICE_LISTENER_FUNCTOR, bool>
     {
       bool operator()(const US_SERVICE_LISTENER_FUNCTOR& f1,
                       const US_SERVICE_LISTENER_FUNCTOR& f2) const
       { return f1 == f2; }
     };
   US_END_NAMESPACE
 
 #endif
 
 #endif // USUTILS_H
diff --git a/Core/Code/CppMicroServices/test/CMakeLists.txt b/Core/Code/CppMicroServices/test/CMakeLists.txt
index 96e62a8e6a..27d10d085e 100644
--- a/Core/Code/CppMicroServices/test/CMakeLists.txt
+++ b/Core/Code/CppMicroServices/test/CMakeLists.txt
@@ -1,80 +1,81 @@
 
 #-----------------------------------------------------------------------------
 # Configure files, include dirs, etc.
 #-----------------------------------------------------------------------------
 
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/usTestingConfig.h.in" "${PROJECT_BINARY_DIR}/include/usTestingConfig.h")
 
 include_directories(${US_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR})
 if(NOT US_ENABLE_SERVICE_FACTORY_SUPPORT)
   include_directories(${US_BASECLASS_INCLUDE_DIRS})
 endif()
 
 link_directories(${US_LINK_DIRS})
 if(NOT US_ENABLE_SERVICE_FACTORY_SUPPORT)
   link_directories(${US_BASECLASS_LIBRARY_DIRS})
 endif()
 
 #-----------------------------------------------------------------------------
 # Create test modules
 #-----------------------------------------------------------------------------
 
 include(usFunctionCreateTestModule)
 
 set(_us_test_module_libs "" CACHE INTERNAL "" FORCE)
 add_subdirectory(modules)
 
 #-----------------------------------------------------------------------------
 # Add unit tests
 #-----------------------------------------------------------------------------
 
 set(_tests
+  usDebugOutputTest
   usLDAPFilterTest
   usModuleTest
   usServiceListenerTest
   usServiceTrackerTest
 )
 
 set(_test_driver ${PROJECT_NAME}TestDriver)
 create_test_sourcelist(_srcs ${_test_driver}.cpp ${_tests})
 
 # Generate a custom "module init" file for the test driver executable
 set(MODULE_DEPENDS_STR )
 foreach(_dep ${US_LINK_LIBRARIES})
   set(MODULE_DEPENDS_STR "${MODULE_DEPENDS_STR} ${_dep}")
 endforeach()
 
 usFunctionGenerateModuleInit(_srcs
                              NAME ${_test_driver}
                              DEPENDS "${MODULE_DEPENDS_STR}"
                              VERSION "0.1.0"
                              EXECUTABLE
                             )
 
 add_executable(${_test_driver} ${_srcs} usTestManager.cpp)
 if(NOT US_BUILD_SHARED_LIBS)
   target_link_libraries(${_test_driver} ${_us_test_module_libs})
 endif()
 target_link_libraries(${_test_driver} ${US_LINK_LIBRARIES})
 
 if(NOT US_ENABLE_SERVICE_FACTORY_SUPPORT)
   target_link_libraries(${_test_driver} ${US_BASECLASS_LIBRARIES})
 endif()
 
 # Register tests
 foreach(_test ${_tests})
   add_test(NAME ${_test} COMMAND ${_test_driver} ${_test})
 endforeach()
 if(US_TEST_LABELS)
   set_tests_properties(${_tests} PROPERTIES LABELS "${US_TEST_LABELS}")
 endif()
 
 #-----------------------------------------------------------------------------
 # Add dependencies for shared libraries
 #-----------------------------------------------------------------------------
 
 if(US_BUILD_SHARED_LIBS)
   foreach(_test_module ${_us_test_module_libs})
     add_dependencies(${_test_driver} ${_test_module})
   endforeach()
 endif()
diff --git a/Core/Code/CppMicroServices/test/usDebugOutputTest.cpp b/Core/Code/CppMicroServices/test/usDebugOutputTest.cpp
new file mode 100644
index 0000000000..c93de8c554
--- /dev/null
+++ b/Core/Code/CppMicroServices/test/usDebugOutputTest.cpp
@@ -0,0 +1,100 @@
+/*=============================================================================
+
+  Library: CppMicroServices
+
+  Copyright (c) German Cancer Research Center,
+    Division of Medical and Biological Informatics
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+=============================================================================*/
+
+#include <usUtils_p.h>
+
+#include "usTestingMacros.h"
+
+US_USE_NAMESPACE
+
+static int lastMsgType = -1;
+static std::string lastMsg;
+
+void handleMessages(MsgType type, const char* msg)
+{
+  lastMsgType = type;
+  lastMsg.assign(msg);
+}
+
+void resetLastMsg()
+{
+  lastMsgType = -1;
+  lastMsg.clear();
+}
+
+int usDebugOutputTest(int /*argc*/, char* /*argv*/[])
+{
+  US_TEST_BEGIN("DebugOutputTest");
+
+  // Use the default message handler
+  {
+    US_DEBUG << "Msg";
+    US_DEBUG(false) << "Msg";
+    US_INFO << "Msg";
+    US_INFO(false) << "Msg";
+    US_WARN << "Msg";
+    US_WARN(false) << "Msg";
+  }
+  US_TEST_CONDITION(lastMsg.empty(), "Testing default message handler");
+
+  resetLastMsg();
+
+  installMsgHandler(handleMessages);
+  {
+    US_DEBUG << "Msg";
+  }
+#ifdef NDEBUG
+  US_TEST_CONDITION(lastMsgType == -1 && lastMsg.empty(), "Testing suppressed debug message")
+#else
+  US_TEST_CONDITION(lastMsgType == 0 && lastMsg == "Msg", "Testing debug message")
+#endif
+  resetLastMsg();
+
+  {
+    US_DEBUG(false) << "No msg";
+  }
+  US_TEST_CONDITION(lastMsgType == -1 && lastMsg.empty(), "Testing disabled debug message")
+  resetLastMsg();
+
+  {
+    US_INFO << "Info msg";
+  }
+  US_TEST_CONDITION(lastMsgType == 1 && lastMsg == "Info msg", "Testing informational message")
+  resetLastMsg();
+
+  {
+    US_WARN << "Warn msg";
+  }
+  US_TEST_CONDITION(lastMsgType == 2 && lastMsg == "Warn msg", "Testing warning message")
+  resetLastMsg();
+
+  // We cannot test US_ERROR since it will call abort().
+
+  installMsgHandler(0);
+
+  {
+    US_INFO << "Info msg";
+  }
+  US_TEST_CONDITION(lastMsgType == -1 && lastMsg.empty(), "Testing message handler reset")
+
+  US_TEST_END()
+}
+
diff --git a/Core/Code/CppMicroServices/usConfig.h.in b/Core/Code/CppMicroServices/usConfig.h.in
index bb51f969e7..5107bb38bd 100644
--- a/Core/Code/CppMicroServices/usConfig.h.in
+++ b/Core/Code/CppMicroServices/usConfig.h.in
@@ -1,162 +1,224 @@
 /*
   USCONFIG.h
   this file is generated. Do not change!
 */
 
 #ifndef USCONFIG_H
 #define USCONFIG_H
 
 #cmakedefine US_BUILD_SHARED_LIBS
 #cmakedefine CppMicroServices_EXPORTS
 #cmakedefine US_ENABLE_THREADING_SUPPORT
 #cmakedefine US_ENABLE_SERVICE_FACTORY_SUPPORT
 #cmakedefine US_USE_CXX11
 
+///-------------------------------------------------------------------
+// Version information
+//-------------------------------------------------------------------
+
+#define CppMicroServices_VERSION_MAJOR @CppMicroServices_VERSION_MAJOR@
+#define CppMicroServices_VERSION_MINOR @CppMicroServices_VERSION_MINOR@
+#define CppMicroServices_VERSION_PATH @CppMicroServices_VERSION_PATCH@
+#define CppMicroServices_VERSION_VERSION @CppMicroServices_VERSION@
+#define CppMicroServices_VERSION_VERSION_STR "@CppMicroServices_VERSION@"
+
+///-------------------------------------------------------------------
+// Macros for import/export declarations
+//-------------------------------------------------------------------
+
+#if defined(WIN32)
+  #define US_ABI_EXPORT __declspec(dllexport)
+  #define US_ABI_IMPORT __declspec(dllimport)
+  #define US_ABI_LOCAL
+#else
+  #if __GNUC__ >= 4
+    #define US_ABI_EXPORT __attribute__ ((visibility ("default")))
+    #define US_ABI_IMPORT __attribute__ ((visibility ("default")))
+    #define US_ABI_LOCAL  __attribute__ ((visibility ("hidden")))
+  #else
+    #define US_ABI_EXPORT
+    #define US_ABI_IMPORT
+    #define US_ABI_LOCAL
+  #endif
+#endif
+
+#ifdef US_BUILD_SHARED_LIBS
+  // We are building a shared lib
+  #ifdef CppMicroServices_EXPORTS
+    #define US_EXPORT US_ABI_EXPORT
+  #else
+    #define US_EXPORT US_ABI_IMPORT
+  #endif
+#else
+  // We are building a static lib
+  #if __GNUC__ >= 4
+    // Don't hide RTTI symbols of definitions in the C++ Micro Services
+    // headers that are included in DSOs with hidden visibility
+    #define US_EXPORT US_ABI_EXPORT
+  #else
+    #define US_EXPORT
+  #endif
+#endif
+
 //-------------------------------------------------------------------
 // Namespace customization
 //-------------------------------------------------------------------
 
 #define US_NAMESPACE @US_NAMESPACE@
 
 #ifndef US_NAMESPACE /* user namespace */
 
   # define US_PREPEND_NAMESPACE(name) ::name
   # define US_USE_NAMESPACE
   # define US_BEGIN_NAMESPACE
   # define US_END_NAMESPACE
   # define US_FORWARD_DECLARE_CLASS(name) class name;
   # define US_FORWARD_DECLARE_STRUCT(name) struct name;
 
 #else /* user namespace */
 
   # define US_PREPEND_NAMESPACE(name) ::US_NAMESPACE::name
   # define US_USE_NAMESPACE using namespace ::US_NAMESPACE;
   # define US_BEGIN_NAMESPACE namespace US_NAMESPACE {
   # define US_END_NAMESPACE }
   # define US_FORWARD_DECLARE_CLASS(name) \
     US_BEGIN_NAMESPACE class name; US_END_NAMESPACE
 
   # define US_FORWARD_DECLARE_STRUCT(name) \
     US_BEGIN_NAMESPACE struct name; US_END_NAMESPACE
 
   namespace US_NAMESPACE {}
 
 #endif /* user namespace */
 
 #define US_BASECLASS_NAME @US_BASECLASS_NAME@
 #define US_BASECLASS_HEADER <@US_BASECLASS_HEADER@>
 
 // base class forward declaration
 @US_BASECLASS_FORWARD_DECLARATION@
 
 //-------------------------------------------------------------------
 // Platform defines
 //-------------------------------------------------------------------
 
 #if defined(__APPLE__)
   #define US_PLATFORM_APPLE
 #endif
 
 #if defined(_WIN32) || defined(_WIN64)
   #define US_PLATFORM_WINDOWS
 #else
   #define US_PLATFORM_POSIX
 #endif
 
 //-------------------------------------------------------------------
 // Compiler defines
 //-------------------------------------------------------------------
 
 #if defined(_MSC_VER) && !defined(_SCL_SECURE_NO_WARNINGS)
   #define _SCL_SECURE_NO_WARNINGS
 #endif
 
+//-------------------------------------------------------------------
+// Debuging & Logging
+//-------------------------------------------------------------------
+
+#if defined(NDEBUG) && !defined(US_NO_DEBUG_OUTPUT)
+  #define US_NO_DEBUG_OUTPUT
+#endif
+
+US_BEGIN_NAMESPACE
+  enum MsgType { DebugMsg = 0, InfoMsg = 1, WarningMsg = 2, ErrorMsg = 3 };
+  typedef void (*MsgHandler)(MsgType, const char *);
+  US_EXPORT MsgHandler installMsgHandler(MsgHandler);
+US_END_NAMESPACE
+
 //-------------------------------------------------------------------
 // Hash Container
 //-------------------------------------------------------------------
 
 #ifdef US_USE_CXX11
 
   #include <unordered_map>
   #include <unordered_set>
 
   #define US_HASH_FUNCTION_BEGIN(type) \
   template<> \
   struct hash<type> : std::unary_function<type, std::size_t> { \
   std::size_t operator()(const type& arg) const {
 
   #define US_HASH_FUNCTION_END } };
 
   #define US_HASH_FUNCTION(type, arg) hash<type>()(arg)
   
   #ifdef US_PLATFORM_WINDOWS
     #define US_HASH_FUNCTION_FRIEND(type) friend class ::std::hash<type>
   #else
     #define US_HASH_FUNCTION_FRIEND(type) friend struct ::std::hash<type>
   #endif
 
   #define US_UNORDERED_MAP_TYPE ::std::unordered_map
   #define US_UNORDERED_SET_TYPE ::std::unordered_set
 
   #define US_HASH_FUNCTION_NAMESPACE ::std
   #define US_HASH_FUNCTION_NAMESPACE_BEGIN namespace std {
   #define US_HASH_FUNCTION_NAMESPACE_END }
 
 #elif defined(__GNUC__)
 
   #include <tr1/unordered_map>
   #include <tr1/unordered_set>
   
   #define US_HASH_FUNCTION_BEGIN(type) \
   template<> \
   struct hash<type> : std::unary_function<type, std::size_t> { \
   std::size_t operator()(const type& arg) const { 
   
   #define US_HASH_FUNCTION_END } };
   
   #define US_HASH_FUNCTION(type, arg) hash<type>()(arg)
   #define US_HASH_FUNCTION_FRIEND(type) friend struct ::std::tr1::hash<type>
 
   #define US_UNORDERED_MAP_TYPE ::std::tr1::unordered_map
   #define US_UNORDERED_SET_TYPE ::std::tr1::unordered_set
 
   #define US_HASH_FUNCTION_NAMESPACE ::std::tr1
   #define US_HASH_FUNCTION_NAMESPACE_BEGIN namespace std { namespace tr1 {
   #define US_HASH_FUNCTION_NAMESPACE_END }}
 
 #elif _MSC_VER <= 1500 // Visual Studio 2008 and lower
 
   #include <hash_map>
   #include <hash_set>
   
   #define US_HASH_FUNCTION_BEGIN(type) \
   template<> \
   inline std::size_t hash_value<type>(const type& arg) { 
   
   #define US_HASH_FUNCTION_END }
   
   #define US_HASH_FUNCTION(type, arg) hash_value(arg)
   #define US_HASH_FUNCTION_FRIEND(type) friend std::size_t stdext::hash_value<type>(const type&)
 
   #define US_UNORDERED_MAP_TYPE ::stdext::hash_map
   #define US_UNORDERED_SET_TYPE ::stdext::hash_set
 
   #define US_HASH_FUNCTION_NAMESPACE ::stdext
   #define US_HASH_FUNCTION_NAMESPACE_BEGIN namespace stdext {
   #define US_HASH_FUNCTION_NAMESPACE_END }
 
 #endif
 
 
 //-------------------------------------------------------------------
 // Threading Configuration
 //-------------------------------------------------------------------
 
 #ifdef US_ENABLE_THREADING_SUPPORT
   #define US_DEFAULT_THREADING US_PREPEND_NAMESPACE(MultiThreaded)
 #else
   #define US_DEFAULT_THREADING US_PREPEND_NAMESPACE(SingleThreaded)
 #endif
 
 
 #endif // USCONFIG_H
diff --git a/Documentation/Doxygen/Modules/ModuleMicroServices.dox b/Documentation/Doxygen/Modules/ModuleMicroServices.dox
index 9307cb0c75..e3e6869d38 100644
--- a/Documentation/Doxygen/Modules/ModuleMicroServices.dox
+++ b/Documentation/Doxygen/Modules/ModuleMicroServices.dox
@@ -1,23 +1,30 @@
 
 /**
 
 \addtogroup MicroServices
 \ingroup Core
 
 */
 
 /**
 
+\addtogroup MicroServicesUtils
+\ingroup Core
+
+*/
+
+/**
+
 \defgroup MicroServices_Interfaces Micro Services Interfaces
 \ingroup Core
 
 \brief Classes (interfaces) in this category are explicitely designed for usage with the MITK Micro Services.
 
 All classes in this category are structs with no non-static members and only pure virtual functions
 (except for an inlined virtual destructor). Such a class will be called a \e interface.
 
 These interfaces are meant to be implemented by MITK module developers to enhance or overwrite certain
 aspects of the MITK toolkit. All implementations must be registered in the implementing module's
 \e activator (see mitk::ModuleActivator) using the module's mitk::ModuleContext instance.
 */
 
diff --git a/Documentation/doxygen.conf.in b/Documentation/doxygen.conf.in
index 6c7dbfa00d..94de70e947 100644
--- a/Documentation/doxygen.conf.in
+++ b/Documentation/doxygen.conf.in
@@ -1,1900 +1,1903 @@
-# Doxyfile 1.8.0
+# Doxyfile 1.8.1
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
 #
 # All text after a hash (#) is considered a comment and will be ignored.
 # The format is:
 #       TAG = value [value, ...]
 # For lists items can also be appended using:
 #       TAG += value [value, ...]
 # Values that contain spaces should be placed between quotes (" ").
 
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
 
 # This tag specifies the encoding used for all characters in the config file
 # that follow. The default is UTF-8 which is also the encoding used for all
 # text before the first occurrence of this tag. Doxygen uses libiconv (or the
 # iconv built into libc) for the transcoding. See
 # http://www.gnu.org/software/libiconv for the list of possible encodings.
 
 DOXYFILE_ENCODING      = UTF-8
 
 # The PROJECT_NAME tag is a single word (or sequence of words) that should
 # identify the project. Note that if you do not use Doxywizard you need
 # to put quotes around the project name if it contains spaces.
 
 PROJECT_NAME           = MITK
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number.
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
 PROJECT_NUMBER         = @MITK_VERSION_STRING@
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer
 # a quick idea about the purpose of the project. Keep the description short.
 
 PROJECT_BRIEF          = "Medical Imaging Interaction Toolkit"
 
 # With the PROJECT_LOGO tag one can specify an logo or icon that is
 # included in the documentation. The maximum height of the logo should not
 # exceed 55 pixels and the maximum width should not exceed 200 pixels.
 # Doxygen will copy the logo to the output directory.
 
 PROJECT_LOGO           =
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
 # If a relative path is entered, it will be relative to the location
 # where doxygen was started. If left blank the current directory will be used.
 
 OUTPUT_DIRECTORY       = @MITK_DOXYGEN_OUTPUT_DIR@
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
 # 4096 sub-directories (in 2 levels) under the output directory of each output
 # format and will distribute the generated files over these directories.
 # Enabling this option can be useful when feeding doxygen a huge amount of
 # source files, where putting all generated files in the same directory would
 # otherwise cause performance problems for the file system.
 
 CREATE_SUBDIRS         = NO
 
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all
 # documentation generated by doxygen is written. Doxygen will use this
 # information to generate all constant output in the proper language.
 # The default language is English, other supported languages are:
 # Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
 # Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
 # Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
 # messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
 # Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
 # Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
 
 OUTPUT_LANGUAGE        = English
 
 # If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
 # include brief member descriptions after the members that are listed in
 # the file and class documentation (similar to JavaDoc).
 # Set to NO to disable this.
 
 BRIEF_MEMBER_DESC      = YES
 
 # If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
 # the brief description of a member or function before the detailed description.
 # Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
 # brief descriptions will be completely suppressed.
 
 REPEAT_BRIEF           = YES
 
 # This tag implements a quasi-intelligent brief description abbreviator
 # that is used to form the text in various listings. Each string
 # in this list, if found as the leading text of the brief description, will be
 # stripped from the text and the result after processing the whole list, is
 # used as the annotated text. Otherwise, the brief description is used as-is.
 # If left blank, the following values are used ("$name" is automatically
 # replaced with the name of the entity): "The $name class" "The $name widget"
 # "The $name file" "is" "provides" "specifies" "contains"
 # "represents" "a" "an" "the"
 
 ABBREVIATE_BRIEF       =
 
 # If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
 # Doxygen will generate a detailed section even if there is only a brief
 # description.
 
 ALWAYS_DETAILED_SEC    = NO
 
 # If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
 # inherited members of a class in the documentation of that class as if those
 # members were ordinary class members. Constructors, destructors and assignment
 # operators of the base classes will not be shown.
 
 INLINE_INHERITED_MEMB  = NO
 
 # If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
 # path before files name in the file list and in the header files. If set
 # to NO the shortest path that makes the file name unique will be used.
 
 FULL_PATH_NAMES        = NO
 
 # If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
 # can be used to strip a user-defined part of the path. Stripping is
 # only done if one of the specified strings matches the left-hand part of
 # the path. The tag can be used to show relative paths in the file list.
 # If left blank the directory from which doxygen is run is used as the
 # path to strip.
 
 STRIP_FROM_PATH        =
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
 # the path mentioned in the documentation of a class, which tells
 # the reader which header file to include in order to use a class.
 # If left blank only the name of the header file containing the class
 # definition is used. Otherwise one should specify the include paths that
 # are normally passed to the compiler using the -I flag.
 
 STRIP_FROM_INC_PATH    =
 
 # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
 # (but less readable) file names. This can be useful if your file system
 # doesn't support long names like on DOS, Mac, or CD-ROM.
 
 SHORT_NAMES            = NO
 
 # If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
 # will interpret the first line (until the first dot) of a JavaDoc-style
 # comment as the brief description. If set to NO, the JavaDoc
 # comments will behave just like regular Qt-style comments
 # (thus requiring an explicit @brief command for a brief description.)
 
 JAVADOC_AUTOBRIEF      = NO
 
 # If the QT_AUTOBRIEF tag is set to YES then Doxygen will
 # interpret the first line (until the first dot) of a Qt-style
 # comment as the brief description. If set to NO, the comments
 # will behave just like regular Qt-style comments (thus requiring
 # an explicit \brief command for a brief description.)
 
 QT_AUTOBRIEF           = NO
 
 # The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
 # treat a multi-line C++ special comment block (i.e. a block of //! or ///
 # comments) as a brief description. This used to be the default behaviour.
 # The new default is to treat a multi-line C++ comment block as a detailed
 # description. Set this tag to YES if you prefer the old behaviour instead.
 
 MULTILINE_CPP_IS_BRIEF = NO
 
 # If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
 # member inherits the documentation from any documented member that it
 # re-implements.
 
 INHERIT_DOCS           = YES
 
 # If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
 # a new page for each member. If set to NO, the documentation of a member will
 # be part of the file/class/namespace that contains it.
 
 SEPARATE_MEMBER_PAGES  = NO
 
 # The TAB_SIZE tag can be used to set the number of spaces in a tab.
 # Doxygen uses this value to replace tabs by spaces in code fragments.
 
 TAB_SIZE               = 8
 
 # This tag can be used to specify a number of aliases that acts
 # as commands in the documentation. An alias has the form "name=value".
 # For example adding "sideeffect=\par Side Effects:\n" will allow you to
 # put the command \sideeffect (or @sideeffect) in the documentation, which
 # will result in a user-defined paragraph with heading "Side Effects:".
 # You can put \n's in the value part of an alias to insert newlines.
 
 ALIASES                = "FIXME=\par Fix Me's:\n" \
                          "BlueBerry=\if BLUEBERRY" \
                          "endBlueBerry=\endif" \
                          "bundlemainpage{1}=\page \1" \
                          "embmainpage{1}=\page \1"
 
 # This tag can be used to specify a number of word-keyword mappings (TCL only).
 # A mapping has the form "name=value". For example adding
 # "class=itcl::class" will allow you to use the command class in the
 # itcl::class meaning.
 
 TCL_SUBST              =
 
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
 # sources only. Doxygen will then generate output that is more tailored for C.
 # For instance, some of the names that are used will be different. The list
 # of all members will be omitted, etc.
 
 OPTIMIZE_OUTPUT_FOR_C  = NO
 
 # Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
 # sources only. Doxygen will then generate output that is more tailored for
 # Java. For instance, namespaces will be presented as packages, qualified
 # scopes will look different, etc.
 
 OPTIMIZE_OUTPUT_JAVA   = NO
 
 # Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
 # sources only. Doxygen will then generate output that is more tailored for
 # Fortran.
 
 OPTIMIZE_FOR_FORTRAN   = NO
 
 # Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
 # sources. Doxygen will then generate output that is tailored for
 # VHDL.
 
 OPTIMIZE_OUTPUT_VHDL   = NO
 
 # Doxygen selects the parser to use depending on the extension of the files it
 # parses. With this tag you can assign which parser to use for a given extension.
 # Doxygen has a built-in mapping, but you can override or extend it using this
 # tag. The format is ext=language, where ext is a file extension, and language
 # is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C,
 # C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make
 # doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
 # (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions
 # you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
 
 EXTENSION_MAPPING      =
 
 # If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
 # comments according to the Markdown format, which allows for more readable
 # documentation. See http://daringfireball.net/projects/markdown/ for details.
 # The output of markdown processing is further processed by doxygen, so you
 # can mix doxygen, HTML, and XML commands with Markdown formatting.
 # Disable only in case of backward compatibilities issues.
 
 MARKDOWN_SUPPORT       = YES
 
 # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
 # to include (a tag file for) the STL sources as input, then you should
 # set this tag to YES in order to let doxygen match functions declarations and
 # definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
 # func(std::string) {}). This also makes the inheritance and collaboration
 # diagrams that involve STL classes more complete and accurate.
 
 BUILTIN_STL_SUPPORT    = YES
 
 # If you use Microsoft's C++/CLI language, you should set this option to YES to
 # enable parsing support.
 
 CPP_CLI_SUPPORT        = NO
 
 # Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
 # Doxygen will parse them like normal C++ but will assume all classes use public
 # instead of private inheritance when no explicit protection keyword is present.
 
 SIP_SUPPORT            = NO
 
 # For Microsoft's IDL there are propget and propput attributes to indicate getter
 # and setter methods for a property. Setting this option to YES (the default)
 # will make doxygen replace the get and set methods by a property in the
 # documentation. This will only work if the methods are indeed getting or
 # setting a simple type. If this is not the case, or you want to show the
 # methods anyway, you should set this option to NO.
 
 IDL_PROPERTY_SUPPORT   = YES
 
 # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
 # tag is set to YES, then doxygen will reuse the documentation of the first
 # member in the group (if any) for the other members of the group. By default
 # all members of a group must be documented explicitly.
 
 DISTRIBUTE_GROUP_DOC   = NO
 
 # Set the SUBGROUPING tag to YES (the default) to allow class member groups of
 # the same type (for instance a group of public functions) to be put as a
 # subgroup of that type (e.g. under the Public Functions section). Set it to
 # NO to prevent subgrouping. Alternatively, this can be done per class using
 # the \nosubgrouping command.
 
 SUBGROUPING            = YES
 
 # When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
 # unions are shown inside the group in which they are included (e.g. using
 # @ingroup) instead of on a separate page (for HTML and Man pages) or
 # section (for LaTeX and RTF).
 
 INLINE_GROUPED_CLASSES = NO
 
 # When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
 # unions with only public data fields will be shown inline in the documentation
 # of the scope in which they are defined (i.e. file, namespace, or group
 # documentation), provided this scope is documented. If set to NO (the default),
 # structs, classes, and unions are shown on a separate page (for HTML and Man
 # pages) or section (for LaTeX and RTF).
 
 INLINE_SIMPLE_STRUCTS  = NO
 
 # When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
 # is documented as struct, union, or enum with the name of the typedef. So
 # typedef struct TypeS {} TypeT, will appear in the documentation as a struct
 # with name TypeT. When disabled the typedef will appear as a member of a file,
 # namespace, or class. And the struct will be named TypeS. This can typically
 # be useful for C code in case the coding convention dictates that all compound
 # types are typedef'ed and only the typedef is referenced, never the tag name.
 
 TYPEDEF_HIDES_STRUCT   = NO
 
 # The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
 # determine which symbols to keep in memory and which to flush to disk.
 # When the cache is full, less often used symbols will be written to disk.
 # For small to medium size projects (<1000 input files) the default value is
 # probably good enough. For larger projects a too small cache size can cause
 # doxygen to be busy swapping symbols to and from disk most of the time
 # causing a significant performance penalty.
 # If the system has enough physical memory increasing the cache will improve the
 # performance by keeping more symbols in memory. Note that the value works on
 # a logarithmic scale so increasing the size by one will roughly double the
 # memory usage. The cache size is given by this formula:
 # 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
 # corresponding to a cache size of 2^16 = 65536 symbols.
 
 SYMBOL_CACHE_SIZE      = 0
 
 # Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be
 # set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given
 # their name and scope. Since this can be an expensive process and often the
 # same symbol appear multiple times in the code, doxygen keeps a cache of
 # pre-resolved symbols. If the cache is too small doxygen will become slower.
 # If the cache is too large, memory is wasted. The cache size is given by this
 # formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0,
 # corresponding to a cache size of 2^16 = 65536 symbols.
 
 LOOKUP_CACHE_SIZE      = 0
 
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
 
 # If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
 # documentation are documented, even if no documentation was available.
 # Private class members and static file members will be hidden unless
 # the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
 
 EXTRACT_ALL            = YES
 
 # If the EXTRACT_PRIVATE tag is set to YES all private members of a class
 # will be included in the documentation.
 
 EXTRACT_PRIVATE        = NO
 
-# If the EXTRACT_PACKAGE tag is set to YES all members with package or
-# internal scope will be included in the documentation.
+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal scope will be included in the documentation.
 
 EXTRACT_PACKAGE        = NO
 
 # If the EXTRACT_STATIC tag is set to YES all static members of a file
 # will be included in the documentation.
 
 EXTRACT_STATIC         = YES
 
 # If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
 # defined locally in source files will be included in the documentation.
 # If set to NO only classes defined in header files are included.
 
 EXTRACT_LOCAL_CLASSES  = @MITK_DOXYGEN_INTERNAL_DOCS@
 
 # This flag is only useful for Objective-C code. When set to YES local
 # methods, which are defined in the implementation section but not in
 # the interface are included in the documentation.
 # If set to NO (the default) only methods in the interface are included.
 
 EXTRACT_LOCAL_METHODS  = NO
 
 # If this flag is set to YES, the members of anonymous namespaces will be
 # extracted and appear in the documentation as a namespace called
 # 'anonymous_namespace{file}', where file will be replaced with the base
 # name of the file that contains the anonymous namespace. By default
 # anonymous namespaces are hidden.
 
 EXTRACT_ANON_NSPACES   = NO
 
 # If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
 # undocumented members of documented classes, files or namespaces.
 # If set to NO (the default) these members will be included in the
 # various overviews, but no documentation section is generated.
 # This option has no effect if EXTRACT_ALL is enabled.
 
 HIDE_UNDOC_MEMBERS     = NO
 
 # If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
 # undocumented classes that are normally visible in the class hierarchy.
 # If set to NO (the default) these classes will be included in the various
 # overviews. This option has no effect if EXTRACT_ALL is enabled.
 
 HIDE_UNDOC_CLASSES     = NO
 
 # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
 # friend (class|struct|union) declarations.
 # If set to NO (the default) these declarations will be included in the
 # documentation.
 
 HIDE_FRIEND_COMPOUNDS  = @MITK_DOXYGEN_HIDE_FRIEND_COMPOUNDS@
 
 # If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
 # documentation blocks found inside the body of a function.
 # If set to NO (the default) these blocks will be appended to the
 # function's detailed documentation block.
 
 HIDE_IN_BODY_DOCS      = NO
 
 # The INTERNAL_DOCS tag determines if documentation
 # that is typed after a \internal command is included. If the tag is set
 # to NO (the default) then the documentation will be excluded.
 # Set it to YES to include the internal documentation.
 
 INTERNAL_DOCS          = @MITK_DOXYGEN_INTERNAL_DOCS@
 
 # If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
 # file names in lower-case letters. If set to YES upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
 # and Mac users are advised to set this option to NO.
 
 CASE_SENSE_NAMES       = YES
 
 # If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
 # will show members with their full class and namespace scopes in the
 # documentation. If set to YES the scope will be hidden.
 
 HIDE_SCOPE_NAMES       = NO
 
 # If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
 # will put a list of the files that are included by a file in the documentation
 # of that file.
 
 SHOW_INCLUDE_FILES     = YES
 
 # If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
 # will list include files with double quotes in the documentation
 # rather than with sharp brackets.
 
 FORCE_LOCAL_INCLUDES   = NO
 
 # If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
 # is inserted in the documentation for inline members.
 
 INLINE_INFO            = YES
 
 # If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
 # will sort the (detailed) documentation of file and class members
 # alphabetically by member name. If set to NO the members will appear in
 # declaration order.
 
 SORT_MEMBER_DOCS       = YES
 
 # If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
 # brief documentation of file, namespace and class members alphabetically
 # by member name. If set to NO (the default) the members will appear in
 # declaration order.
 
 SORT_BRIEF_DOCS        = NO
 
 # If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
 # will sort the (brief and detailed) documentation of class members so that
 # constructors and destructors are listed first. If set to NO (the default)
 # the constructors will appear in the respective orders defined by
 # SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
 # This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
 # and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
 
 SORT_MEMBERS_CTORS_1ST = NO
 
 # If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
 # hierarchy of group names into alphabetical order. If set to NO (the default)
 # the group names will appear in their defined order.
 
 SORT_GROUP_NAMES       = NO
 
 # If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
 # sorted by fully-qualified names, including namespaces. If set to
 # NO (the default), the class list will be sorted only by class name,
 # not including the namespace part.
 # Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
 # Note: This option applies only to the class list, not to the
 # alphabetical list.
 
 SORT_BY_SCOPE_NAME     = YES
 
 # If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
 # do proper type resolution of all parameters of a function it will reject a
 # match between the prototype and the implementation of a member function even
 # if there is only one candidate or it is obvious which candidate to choose
 # by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
 # will still accept a match between prototype and implementation in such cases.
 
 STRICT_PROTO_MATCHING  = NO
 
 # The GENERATE_TODOLIST tag can be used to enable (YES) or
 # disable (NO) the todo list. This list is created by putting \todo
 # commands in the documentation.
 
 GENERATE_TODOLIST      = @MITK_DOXYGEN_GENERATE_TODOLIST@
 
 # The GENERATE_TESTLIST tag can be used to enable (YES) or
 # disable (NO) the test list. This list is created by putting \test
 # commands in the documentation.
 
 GENERATE_TESTLIST      = YES
 
 # The GENERATE_BUGLIST tag can be used to enable (YES) or
 # disable (NO) the bug list. This list is created by putting \bug
 # commands in the documentation.
 
 GENERATE_BUGLIST       = @MITK_DOXYGEN_GENERATE_BUGLIST@
 
 # The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
 # disable (NO) the deprecated list. This list is created by putting
 # \deprecated commands in the documentation.
 
 GENERATE_DEPRECATEDLIST= @MITK_DOXYGEN_GENERATE_DEPRECATEDLIST@
 
 # The ENABLED_SECTIONS tag can be used to enable conditional
 # documentation sections, marked by \if sectionname ... \endif.
 
 ENABLED_SECTIONS       = @MITK_DOXYGEN_ENABLED_SECTIONS@
 
 # The MAX_INITIALIZER_LINES tag determines the maximum number of lines
 # the initial value of a variable or macro consists of for it to appear in
 # the documentation. If the initializer consists of more lines than specified
 # here it will be hidden. Use a value of 0 to hide initializers completely.
 # The appearance of the initializer of individual variables and macros in the
 # documentation can be controlled using \showinitializer or \hideinitializer
 # command in the documentation regardless of this setting.
 
 MAX_INITIALIZER_LINES  = 0
 
 # Set the SHOW_USED_FILES tag to NO to disable the list of files generated
 # at the bottom of the documentation of classes and structs. If set to YES the
 # list will mention the files that were used to generate the documentation.
 
 SHOW_USED_FILES        = YES
 
-# If the sources in your project are distributed over multiple directories
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES       = NO
-
 # Set the SHOW_FILES tag to NO to disable the generation of the Files page.
 # This will remove the Files entry from the Quick Index and from the
 # Folder Tree View (if specified). The default is YES.
 
 SHOW_FILES             = YES
 
 # Set the SHOW_NAMESPACES tag to NO to disable the generation of the
 # Namespaces page.
 # This will remove the Namespaces entry from the Quick Index
 # and from the Folder Tree View (if specified). The default is YES.
 
 SHOW_NAMESPACES        = YES
 
 # The FILE_VERSION_FILTER tag can be used to specify a program or script that
 # doxygen should invoke to get the current version for each file (typically from
 # the version control system). Doxygen will invoke the program by executing (via
 # popen()) the command <command> <input-file>, where <command> is the value of
 # the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
 # provided by doxygen. Whatever the program writes to standard output
 # is used as the file version. See the manual for examples.
 
 FILE_VERSION_FILTER    =
 
 # The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
 # by doxygen. The layout file controls the global structure of the generated
 # output files in an output format independent way. The create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option.
 # You can optionally specify a file name after the option, if omitted
 # DoxygenLayout.xml will be used as the name of the layout file.
 
 LAYOUT_FILE            =
 
 # The CITE_BIB_FILES tag can be used to specify one or more bib files
 # containing the references data. This must be a list of .bib files. The
 # .bib extension is automatically appended if omitted. Using this command
 # requires the bibtex tool to be installed. See also
 # http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
 # of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
 # feature you need bibtex and perl available in the search path.
 
 CITE_BIB_FILES         =
 
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
 
 # The QUIET tag can be used to turn on/off the messages that are generated
 # by doxygen. Possible values are YES and NO. If left blank NO is used.
 
 QUIET                  = NO
 
 # The WARNINGS tag can be used to turn on/off the warning messages that are
 # generated by doxygen. Possible values are YES and NO. If left blank
 # NO is used.
 
 WARNINGS               = YES
 
 # If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
 # for undocumented members. If EXTRACT_ALL is set to YES then this flag will
 # automatically be disabled.
 
 WARN_IF_UNDOCUMENTED   = YES
 
 # If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
 # potential errors in the documentation, such as not documenting some
 # parameters in a documented function, or documenting parameters that
 # don't exist or using markup commands wrongly.
 
 WARN_IF_DOC_ERROR      = YES
 
 # The WARN_NO_PARAMDOC option can be enabled to get warnings for
 # functions that are documented, but have no documentation for their parameters
 # or return value. If set to NO (the default) doxygen will only warn about
 # wrong or incomplete parameter documentation, but not about the absence of
 # documentation.
 
 WARN_NO_PARAMDOC       = NO
 
 # The WARN_FORMAT tag determines the format of the warning messages that
 # doxygen can produce. The string should contain the $file, $line, and $text
 # tags, which will be replaced by the file and line number from which the
 # warning originated and the warning text. Optionally the format may contain
 # $version, which will be replaced by the version of the file (if it could
 # be obtained via FILE_VERSION_FILTER)
 
 WARN_FORMAT            = "$file:$line: $text"
 
 # The WARN_LOGFILE tag can be used to specify a file to which warning
 # and error messages should be written. If left blank the output is written
 # to stderr.
 
 WARN_LOGFILE           =
 
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
 
 # The INPUT tag can be used to specify the files and/or directories that contain
 # documented source files. You may enter file names like "myfile.cpp" or
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
 INPUT                  = @MITK_SOURCE_DIR@ \
                          @MITK_BINARY_DIR@ \
                          @MITK_DOXYGEN_ADDITIONAL_INPUT_DIRS@
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
 # also the default input encoding. Doxygen uses libiconv (or the iconv built
 # into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
 # the list of possible encodings.
 
 INPUT_ENCODING         = UTF-8
 
 # If the value of the INPUT tag contains directories, you can use the
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
 # and *.h) to filter out the source-files in the directories. If left
 # blank the following patterns are tested:
 # *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
 # *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
 # *.f90 *.f *.for *.vhd *.vhdl
 
 FILE_PATTERNS          = *.h \
                          *.cpp \
                          *.dox \
-                         *.md  \
+                         *.md \
                          *.txx \
                          *.tpp \
                          *.cxx \
                          *.cmake
 
 # The RECURSIVE tag can be used to turn specify whether or not subdirectories
 # should be searched for input files as well. Possible values are YES and NO.
 # If left blank NO is used.
 
 RECURSIVE              = YES
 
 # The EXCLUDE tag can be used to specify files and/or directories that should be
 # excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
 EXCLUDE                = @MITK_SOURCE_DIR@/Utilities/ann/ \
                          @MITK_SOURCE_DIR@/Utilities/glew/ \
                          @MITK_SOURCE_DIR@/Utilities/ipFunc/ \
                          @MITK_SOURCE_DIR@/Utilities/ipSegmentation/ \
                          @MITK_SOURCE_DIR@/Utilities/KWStyle/ \
                          @MITK_SOURCE_DIR@/Utilities/pic2vtk/ \
                          @MITK_SOURCE_DIR@/Utilities/Poco/ \
                          @MITK_SOURCE_DIR@/Utilities/qtsingleapplication/ \
                          @MITK_SOURCE_DIR@/Utilities/qwt/ \
                          @MITK_SOURCE_DIR@/Utilities/qxt/ \
                          @MITK_SOURCE_DIR@/Utilities/tinyxml/ \
                          @MITK_SOURCE_DIR@/Utilities/vecmath/ \
                          @MITK_SOURCE_DIR@/Applications/PluginGenerator/ \
                          @MITK_SOURCE_DIR@/BlueBerry/ \
+                         @MITK_SOURCE_DIR@/Core/Code/CppMicroServices/README.md \
+                         @MITK_SOURCE_DIR@/Core/Code/CppMicroServices/documentation/snippets/ \
+                         @MITK_SOURCE_DIR@/Core/Code/CppMicroServices/documentation/doxygen/standalone/ \
+                         @MITK_SOURCE_DIR@/Core/Code/CppMicroServices/test/ \
                          @MITK_SOURCE_DIR@/Deprecated/ \
                          @MITK_SOURCE_DIR@/Build/ \
                          @MITK_SOURCE_DIR@/CMake/PackageDepends \
                          @MITK_SOURCE_DIR@/CMake/QBundleTemplate \
                          @MITK_SOURCE_DIR@/CMakeExternals \
                          @MITK_SOURCE_DIR@/Modules/QmitkExt/vtkQtChartHeaders/ \
                          @MITK_BINARY_DIR@/PT/ \
                          @MITK_BINARY_DIR@/GP/ \
+                         @MITK_BINARY_DIR@/Core/Code/CppMicroServices/ \
                          @MITK_DOXYGEN_ADDITIONAL_EXCLUDE_DIRS@
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
 # from the input.
 
 EXCLUDE_SYMLINKS       = NO
 
 # If the value of the INPUT tag contains directories, you can use the
 # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
 # certain files from those directories. Note that the wildcards are matched
 # against the file with absolute path, so to exclude all test directories
 # for example use the pattern */test/*
 
 EXCLUDE_PATTERNS       = moc_* \
                          Register* \
                          */files.cmake \
                          */.git/* \
+                         *_p.h \
+                         *Private.* \
                          */Snippets/* \
                          */snippets/* \
                          */testing/* \
                          */Testing/* \
                          @MITK_BINARY_DIR@/*.cmake \
                          @MITK_DOXYGEN_EXCLUDE_PATTERNS@
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
 # output. The symbol name can be a fully qualified name, a word, or if the
 # wildcard * is used, a substring. Examples: ANamespace, AClass,
 # AClass::ANamespace, ANamespace::*Test
 
 EXCLUDE_SYMBOLS        =
 
 # The EXAMPLE_PATH tag can be used to specify one or more files or
 # directories that contain example code fragments that are included (see
 # the \include command).
 
 EXAMPLE_PATH           = @MITK_SOURCE_DIR@/Examples/ \
                          @MITK_SOURCE_DIR@/Examples/Tutorial/ \
                          @MITK_SOURCE_DIR@/Examples/QtFreeRender/ \
                          @MITK_SOURCE_DIR@/Core/Code/ \
+                         @MITK_SOURCE_DIR@/Core/Code/CppMicroServices/Documentation/Snippets/ \
                          @MITK_DOXYGEN_OUTPUT_DIR@/html/extension-points/html/ \
                          @MITK_SOURCE_DIR@/Documentation/Snippets/
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
 # and *.h) to filter out the source-files in the directories. If left
 # blank all files are included.
 
 EXAMPLE_PATTERNS       =
 
 # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
 # searched for input files to be used with the \include or \dontinclude
 # commands irrespective of the value of the RECURSIVE tag.
 # Possible values are YES and NO. If left blank NO is used.
 
 EXAMPLE_RECURSIVE      = YES
 
 # The IMAGE_PATH tag can be used to specify one or more files or
 # directories that contain image that are included in the documentation (see
 # the \image command).
 
 IMAGE_PATH             = @MITK_SOURCE_DIR@/Documentation/Doxygen/ \
                          @MITK_SOURCE_DIR@/Documentation/Doxygen/Modules/ \
                          @MITK_SOURCE_DIR@/Documentation/Doxygen/Tutorial/ \
                          @MITK_SOURCE_DIR@
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
 # by executing (via popen()) the command <filter> <input-file>, where <filter>
 # is the value of the INPUT_FILTER tag, and <input-file> is the name of an
 # input file. Doxygen will then use the output that the filter program writes
 # to standard output.
 # If FILTER_PATTERNS is specified, this tag will be
 # ignored.
 
 INPUT_FILTER           =
 
 # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
 # basis.
 # Doxygen will compare the file name with each pattern and apply the
 # filter if there is a match.
 # The filters are a list of the form:
 # pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
 # info on how filters are used. If FILTER_PATTERNS is empty or if
 # non of the patterns match the file name, INPUT_FILTER is applied.
 
 FILTER_PATTERNS        = *.cmake=@CMakeDoxygenFilter_EXECUTABLE@
 
 # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
 # INPUT_FILTER) will be used to filter the input files when producing source
 # files to browse (i.e. when SOURCE_BROWSER is set to YES).
 
 FILTER_SOURCE_FILES    = NO
 
 # The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
 # pattern. A pattern will override the setting for FILTER_PATTERN (if any)
 # and it is also possible to disable source filtering for a specific pattern
 # using *.ext= (so without naming a filter). This option only has effect when
 # FILTER_SOURCE_FILES is enabled.
 
 FILTER_SOURCE_PATTERNS =
 
 #---------------------------------------------------------------------------
 # configuration options related to source browsing
 #---------------------------------------------------------------------------
 
 # If the SOURCE_BROWSER tag is set to YES then a list of source files will
 # be generated. Documented entities will be cross-referenced with these sources.
 # Note: To get rid of all source code in the generated output, make sure also
 # VERBATIM_HEADERS is set to NO.
 
 SOURCE_BROWSER         = YES
 
 # Setting the INLINE_SOURCES tag to YES will include the body
 # of functions and classes directly in the documentation.
 
 INLINE_SOURCES         = NO
 
 # Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
 # doxygen to hide any special comment blocks from generated source code
 # fragments. Normal C and C++ comments will always remain visible.
 
 STRIP_CODE_COMMENTS    = YES
 
 # If the REFERENCED_BY_RELATION tag is set to YES
 # then for each documented function all documented
 # functions referencing it will be listed.
 
 REFERENCED_BY_RELATION = YES
 
 # If the REFERENCES_RELATION tag is set to YES
 # then for each documented function all documented entities
 # called/used by that function will be listed.
 
 REFERENCES_RELATION    = YES
 
 # If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
 # and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
 # functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
 # link to the source code.
 # Otherwise they will link to the documentation.
 
 REFERENCES_LINK_SOURCE = YES
 
 # If the USE_HTAGS tag is set to YES then the references to source code
 # will point to the HTML generated by the htags(1) tool instead of doxygen
 # built-in source browser. The htags tool is part of GNU's global source
 # tagging system (see http://www.gnu.org/software/global/global.html). You
 # will need version 4.8.6 or higher.
 
 USE_HTAGS              = NO
 
 # If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
 # will generate a verbatim copy of the header file for each class for
 # which an include is specified. Set to NO to disable this.
 
 VERBATIM_HEADERS       = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
 
 # If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
 # of all compounds will be generated. Enable this if the project
 # contains a lot of classes, structs, unions or interfaces.
 
 ALPHABETICAL_INDEX     = YES
 
 # If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
 # the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
 # in which this list will be split (can be a number in the range [1..20])
 
 COLS_IN_ALPHA_INDEX    = 3
 
 # In case all classes in a project start with a common prefix, all
 # classes will be put under the same header in the alphabetical index.
 # The IGNORE_PREFIX tag can be used to specify one or more prefixes that
 # should be ignored while generating the index headers.
 
 IGNORE_PREFIX          =
 
 #---------------------------------------------------------------------------
 # configuration options related to the HTML output
 #---------------------------------------------------------------------------
 
 # If the GENERATE_HTML tag is set to YES (the default) Doxygen will
 # generate HTML output.
 
 GENERATE_HTML          = YES
 
 # The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `html' will be used as the default path.
 
 HTML_OUTPUT            = html
 
 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for
 # each generated HTML page (for example: .htm,.php,.asp). If it is left blank
 # doxygen will generate files with .html extension.
 
 HTML_FILE_EXTENSION    = .html
 
 # The HTML_HEADER tag can be used to specify a personal HTML header for
 # each generated HTML page. If it is left blank doxygen will generate a
 # standard header. Note that when using a custom header you are responsible
 #  for the proper inclusion of any scripts and style sheets that doxygen
 # needs, which is dependent on the configuration options used.
 # It is advised to generate a default header using "doxygen -w html
 # header.html footer.html stylesheet.css YourConfigFile" and then modify
 # that header. Note that the header is subject to change so you typically
 # have to redo this when upgrading to a newer version of doxygen or when
 # changing the value of configuration settings such as GENERATE_TREEVIEW!
 
 HTML_HEADER            =
 
 # The HTML_FOOTER tag can be used to specify a personal HTML footer for
 # each generated HTML page. If it is left blank doxygen will generate a
 # standard footer.
 
 HTML_FOOTER            =
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading
 # style sheet that is used by each HTML page. It can be used to
 # fine-tune the look of the HTML output. If the tag is left blank doxygen
 # will generate a default style sheet. Note that doxygen will try to copy
 # the style sheet file to the HTML output directory, so don't put your own
 # style sheet in the HTML output directory as well, or it will be erased!
 
 HTML_STYLESHEET        = @MITK_DOXYGEN_STYLESHEET@
 
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note
 # that these files will be copied to the base HTML output directory. Use the
 # $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
 # files. In the HTML_STYLESHEET file, use the file name only. Also note that
 # the files will be copied as-is; there are no commands or markers available.
 
 HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
 # Doxygen will adjust the colors in the style sheet and background images
 # according to this color. Hue is specified as an angle on a colorwheel,
 # see http://en.wikipedia.org/wiki/Hue for more information.
 # For instance the value 0 represents red, 60 is yellow, 120 is green,
 # 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
 # The allowed range is 0 to 359.
 
 HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
 # the colors in the HTML output. For a value of 0 the output will use
 # grayscales only. A value of 255 will produce the most vivid colors.
 
 HTML_COLORSTYLE_SAT    = 100
 
 # The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
 # the luminance component of the colors in the HTML output. Values below
 # 100 gradually make the output lighter, whereas values above 100 make
 # the output darker. The value divided by 100 is the actual gamma applied,
 # so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
 # and 100 does not change the gamma.
 
 HTML_COLORSTYLE_GAMMA  = 80
 
 # If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
 # page will contain the date and time when the page was generated. Setting
 # this to NO can help when comparing the output of multiple runs.
 
 HTML_TIMESTAMP         = YES
 
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS     = YES
-
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
 # documentation will contain sections that can be hidden and shown after the
-# page has loaded. For this to work a browser that supports
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
-# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+# page has loaded.
 
 HTML_DYNAMIC_SECTIONS  = @MITK_DOXYGEN_HTML_DYNAMIC_SECTIONS@
 
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of
+# entries shown in the various tree structured indices initially; the user
+# can expand and collapse entries dynamically later on. Doxygen will expand
+# the tree to such a level that at most the specified number of entries are
+# visible (unless a fully collapsed tree already exceeds this amount).
+# So setting the number of entries 1 will produce a full collapsed tree by
+# default. 0 is a special value representing an infinite number of entries
+# and will result in a full expanded tree by default.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
 # If the GENERATE_DOCSET tag is set to YES, additional index files
 # will be generated that can be used as input for Apple's Xcode 3
 # integrated development environment, introduced with OSX 10.5 (Leopard).
 # To create a documentation set, doxygen will generate a Makefile in the
 # HTML output directory. Running make will produce the docset in that
 # directory and running "make install" will install the docset in
 # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
 # it at startup.
 # See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
 # for more information.
 
 GENERATE_DOCSET        = NO
 
 # When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
 # feed. A documentation feed provides an umbrella under which multiple
 # documentation sets from a single provider (such as a company or product suite)
 # can be grouped.
 
 DOCSET_FEEDNAME        = "Doxygen generated docs"
 
 # When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
 # should uniquely identify the documentation set bundle. This should be a
 # reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
 # will append .docset to the name.
 
 DOCSET_BUNDLE_ID       = org.doxygen.Project
 
 # When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify
 # the documentation publisher. This should be a reverse domain-name style
 # string, e.g. com.mycompany.MyDocSet.documentation.
 
 DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
 
 # The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
 
 DOCSET_PUBLISHER_NAME  = Publisher
 
 # If the GENERATE_HTMLHELP tag is set to YES, additional index files
 # will be generated that can be used as input for tools like the
 # Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
 # of the generated HTML documentation.
 
 GENERATE_HTMLHELP      = NO
 
 # If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
 # be used to specify the file name of the resulting .chm file. You
 # can add a path in front of the file if the result should not be
 # written to the html output directory.
 
 CHM_FILE               =
 
 # If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
 # be used to specify the location (absolute path including file name) of
 # the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
 # the HTML help compiler on the generated index.hhp.
 
 HHC_LOCATION           =
 
 # If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
 # controls if a separate .chi index file is generated (YES) or that
 # it should be included in the master .chm file (NO).
 
 GENERATE_CHI           = NO
 
 # If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
 # is used to encode HtmlHelp index (hhk), content (hhc) and project file
 # content.
 
 CHM_INDEX_ENCODING     =
 
 # If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
 # controls whether a binary table of contents is generated (YES) or a
 # normal table of contents (NO) in the .chm file.
 
 BINARY_TOC             = NO
 
 # The TOC_EXPAND flag can be set to YES to add extra items for group members
 # to the contents of the HTML help documentation and to the tree view.
 
 TOC_EXPAND             = NO
 
 # If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
 # QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
 # that can be used as input for Qt's qhelpgenerator to generate a
 # Qt Compressed Help (.qch) of the generated HTML documentation.
 
 GENERATE_QHP           = @MITK_DOXYGEN_GENERATE_QHP@
 
 # If the QHG_LOCATION tag is specified, the QCH_FILE tag can
 # be used to specify the file name of the resulting .qch file.
 # The path specified is relative to the HTML output folder.
 
 QCH_FILE               = @MITK_DOXYGEN_QCH_FILE@
 
 # The QHP_NAMESPACE tag specifies the namespace to use when generating
 # Qt Help Project output. For more information please see
 # http://doc.trolltech.com/qthelpproject.html#namespace
 
 QHP_NAMESPACE          = "org.mitk"
 
 # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
 # Qt Help Project output. For more information please see
 # http://doc.trolltech.com/qthelpproject.html#virtual-folders
 
 QHP_VIRTUAL_FOLDER     = MITK
 
 # If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
 # add. For more information please see
 # http://doc.trolltech.com/qthelpproject.html#custom-filters
 
 QHP_CUST_FILTER_NAME   =
 
 # The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
 # custom filter to add. For more information please see
 # <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
 # Qt Help Project / Custom Filters</a>.
 
 QHP_CUST_FILTER_ATTRS  =
 
 # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
 # project's
 # filter section matches.
 # <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
 # Qt Help Project / Filter Attributes</a>.
 
 QHP_SECT_FILTER_ATTRS  =
 
 # If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
 # be used to specify the location of Qt's qhelpgenerator.
 # If non-empty doxygen will try to run qhelpgenerator on the generated
 # .qhp file.
 
 QHG_LOCATION           = @QT_HELPGENERATOR_EXECUTABLE@
 
 # If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
 #  will be generated, which together with the HTML files, form an Eclipse help
 # plugin. To install this plugin and make it available under the help contents
 # menu in Eclipse, the contents of the directory containing the HTML and XML
 # files needs to be copied into the plugins directory of eclipse. The name of
 # the directory within the plugins directory should be the same as
 # the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
 # the help appears.
 
 GENERATE_ECLIPSEHELP   = NO
 
 # A unique identifier for the eclipse help plugin. When installing the plugin
 # the directory name containing the HTML and XML files should also have
 # this name.
 
 ECLIPSE_DOC_ID         = org.doxygen.Project
 
 # The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
 # at top of each HTML page. The value NO (the default) enables the index and
 # the value YES disables it. Since the tabs have the same information as the
 # navigation tree you can set this option to NO if you already set
 # GENERATE_TREEVIEW to YES.
 
 DISABLE_INDEX          = NO
 
 # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
 # structure should be generated to display hierarchical information.
 # If the tag value is set to YES, a side panel will be generated
 # containing a tree-like index structure (just like the one that
 # is generated for HTML Help). For this to work a browser that supports
 # JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
 # Windows users are probably better off using the HTML help feature.
 # Since the tree basically has the same information as the tab index you
 # could consider to set DISABLE_INDEX to NO when enabling this option.
 
 GENERATE_TREEVIEW      = YES
 
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
 # (range [0,1..20]) that doxygen will group on one line in the generated HTML
 # documentation. Note that a value of 0 will completely suppress the enum
 # values from appearing in the overview section.
 
 ENUM_VALUES_PER_LINE   = 4
 
-# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
-# and Class Hierarchy pages using a tree view instead of an ordered list.
-
-USE_INLINE_TREES       = NO
-
 # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
 # used to set the initial width (in pixels) of the frame in which the tree
 # is shown.
 
 TREEVIEW_WIDTH         = 300
 
 # When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
 # links to external symbols imported via tag files in a separate window.
 
 EXT_LINKS_IN_WINDOW    = NO
 
 # Use this tag to change the font size of Latex formulas included
 # as images in the HTML documentation. The default is 10. Note that
 # when you change the font size after a successful doxygen run you need
 # to manually remove any form_*.png images from the HTML output directory
 # to force them to be regenerated.
 
 FORMULA_FONTSIZE       = 10
 
 # Use the FORMULA_TRANPARENT tag to determine whether or not the images
 # generated for formulas are transparent PNGs. Transparent PNGs are
 # not supported properly for IE 6.0, but are supported on all modern browsers.
 # Note that when changing this option you need to delete any form_*.png files
 # in the HTML output before the changes have effect.
 
 FORMULA_TRANSPARENT    = YES
 
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
 # (see http://www.mathjax.org) which uses client side Javascript for the
 # rendering instead of using prerendered bitmaps. Use this if you do not
 # have LaTeX installed or if you want to formulas look prettier in the HTML
 # output. When enabled you may also need to install MathJax separately and
 # configure the path to it using the MATHJAX_RELPATH option.
 
 USE_MATHJAX            = NO
 
 # When MathJax is enabled you need to specify the location relative to the
 # HTML output directory using the MATHJAX_RELPATH option. The destination
 # directory should contain the MathJax.js script. For instance, if the mathjax
 # directory is located at the same level as the HTML output directory, then
 # MATHJAX_RELPATH should be ../mathjax. The default value points to
 # the MathJax Content Delivery Network so you can quickly see the result without
 # installing MathJax.
 # However, it is strongly recommended to install a local
 # copy of MathJax from http://www.mathjax.org before deployment.
 
 MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
 # names that should be enabled during MathJax rendering.
 
 MATHJAX_EXTENSIONS     =
 
 # When the SEARCHENGINE tag is enabled doxygen will generate a search box
 # for the HTML output. The underlying search engine uses javascript
 # and DHTML and should work on any modern browser. Note that when using
 # HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
 # (GENERATE_DOCSET) there is already a search function so this one should
 # typically be disabled. For large projects the javascript based search engine
 # can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
 
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
 # implemented using a PHP enabled web server instead of at the web client
 # using Javascript. Doxygen will generate the search PHP script and index
 # file to put on the web server. The advantage of the server
 # based approach is that it scales better to large projects and allows
 # full text search. The disadvantages are that it is more difficult to setup
 # and does not have live searching capabilities.
 
 SERVER_BASED_SEARCH    = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
 
 # If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
 # generate Latex output.
 
 GENERATE_LATEX         = NO
 
 # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `latex' will be used as the default path.
 
 LATEX_OUTPUT           = latex
 
 # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
 # invoked. If left blank `latex' will be used as the default command name.
 # Note that when enabling USE_PDFLATEX this option is only used for
 # generating bitmaps for formulas in the HTML output, but not in the
 # Makefile that is written to the output directory.
 
 LATEX_CMD_NAME         = latex
 
 # The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
 # generate index for LaTeX. If left blank `makeindex' will be used as the
 # default command name.
 
 MAKEINDEX_CMD_NAME     = makeindex
 
 # If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
 # LaTeX documents. This may be useful for small projects and may help to
 # save some trees in general.
 
 COMPACT_LATEX          = NO
 
 # The PAPER_TYPE tag can be used to set the paper type that is used
 # by the printer. Possible values are: a4, letter, legal and
 # executive. If left blank a4wide will be used.
 
 PAPER_TYPE             = a4wide
 
 # The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
 # packages that should be included in the LaTeX output.
 
 EXTRA_PACKAGES         = amssymb
 
 # The LATEX_HEADER tag can be used to specify a personal LaTeX header for
 # the generated latex document. The header should contain everything until
 # the first chapter. If it is left blank doxygen will generate a
 # standard header. Notice: only use this tag if you know what you are doing!
 
 LATEX_HEADER           =
 
 # The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
 # the generated latex document. The footer should contain everything after
 # the last chapter. If it is left blank doxygen will generate a
 # standard footer. Notice: only use this tag if you know what you are doing!
 
 LATEX_FOOTER           =
 
 # If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
 # is prepared for conversion to pdf (using ps2pdf). The pdf file will
 # contain links (just like the HTML output) instead of page references
 # This makes the output suitable for online browsing using a pdf viewer.
 
 PDF_HYPERLINKS         = NO
 
 # If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
 # plain latex in the generated Makefile. Set this option to YES to get a
 # higher quality PDF documentation.
 
 USE_PDFLATEX           = NO
 
 # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
 # command to the generated LaTeX files. This will instruct LaTeX to keep
 # running if errors occur, instead of asking the user for help.
 # This option is also used when generating formulas in HTML.
 
 LATEX_BATCHMODE        = NO
 
 # If LATEX_HIDE_INDICES is set to YES then doxygen will not
 # include the index chapters (such as File Index, Compound Index, etc.)
 # in the output.
 
 LATEX_HIDE_INDICES     = NO
 
 # If LATEX_SOURCE_CODE is set to YES then doxygen will include
 # source code with syntax highlighting in the LaTeX output.
 # Note that which sources are shown also depends on other settings
 # such as SOURCE_BROWSER.
 
 LATEX_SOURCE_CODE      = NO
 
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
 # http://en.wikipedia.org/wiki/BibTeX for more info.
 
 LATEX_BIB_STYLE        = plain
 
 #---------------------------------------------------------------------------
 # configuration options related to the RTF output
 #---------------------------------------------------------------------------
 
 # If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
 # The RTF output is optimized for Word 97 and may not look very pretty with
 # other RTF readers or editors.
 
 GENERATE_RTF           = NO
 
 # The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `rtf' will be used as the default path.
 
 RTF_OUTPUT             = rtf
 
 # If the COMPACT_RTF tag is set to YES Doxygen generates more compact
 # RTF documents. This may be useful for small projects and may help to
 # save some trees in general.
 
 COMPACT_RTF            = NO
 
 # If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
 # will contain hyperlink fields. The RTF file will
 # contain links (just like the HTML output) instead of page references.
 # This makes the output suitable for online browsing using WORD or other
 # programs which support those fields.
 # Note: wordpad (write) and others do not support links.
 
 RTF_HYPERLINKS         = NO
 
 # Load style sheet definitions from file. Syntax is similar to doxygen's
 # config file, i.e. a series of assignments. You only have to provide
 # replacements, missing definitions are set to their default value.
 
 RTF_STYLESHEET_FILE    =
 
 # Set optional variables used in the generation of an rtf document.
 # Syntax is similar to doxygen's config file.
 
 RTF_EXTENSIONS_FILE    =
 
 #---------------------------------------------------------------------------
 # configuration options related to the man page output
 #---------------------------------------------------------------------------
 
 # If the GENERATE_MAN tag is set to YES (the default) Doxygen will
 # generate man pages
 
 GENERATE_MAN           = NO
 
 # The MAN_OUTPUT tag is used to specify where the man pages will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `man' will be used as the default path.
 
 MAN_OUTPUT             = man
 
 # The MAN_EXTENSION tag determines the extension that is added to
 # the generated man pages (default is the subroutine's section .3)
 
 MAN_EXTENSION          = .3
 
 # If the MAN_LINKS tag is set to YES and Doxygen generates man output,
 # then it will generate one additional man file for each entity
 # documented in the real man page(s). These additional files
 # only source the real man page, but without them the man command
 # would be unable to find the correct page. The default is NO.
 
 MAN_LINKS              = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the XML output
 #---------------------------------------------------------------------------
 
 # If the GENERATE_XML tag is set to YES Doxygen will
 # generate an XML file that captures the structure of
 # the code including all documentation.
 
 GENERATE_XML           = NO
 
 # The XML_OUTPUT tag is used to specify where the XML pages will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `xml' will be used as the default path.
 
 XML_OUTPUT             = xml
 
 # The XML_SCHEMA tag can be used to specify an XML schema,
 # which can be used by a validating XML parser to check the
 # syntax of the XML files.
 
 XML_SCHEMA             =
 
 # The XML_DTD tag can be used to specify an XML DTD,
 # which can be used by a validating XML parser to check the
 # syntax of the XML files.
 
 XML_DTD                =
 
 # If the XML_PROGRAMLISTING tag is set to YES Doxygen will
 # dump the program listings (including syntax highlighting
 # and cross-referencing information) to the XML output. Note that
 # enabling this will significantly increase the size of the XML output.
 
 XML_PROGRAMLISTING     = YES
 
 #---------------------------------------------------------------------------
 # configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
 
 # If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
 # generate an AutoGen Definitions (see autogen.sf.net) file
 # that captures the structure of the code including all
 # documentation. Note that this feature is still experimental
 # and incomplete at the moment.
 
 GENERATE_AUTOGEN_DEF   = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the Perl module output
 #---------------------------------------------------------------------------
 
 # If the GENERATE_PERLMOD tag is set to YES Doxygen will
 # generate a Perl module file that captures the structure of
 # the code including all documentation. Note that this
 # feature is still experimental and incomplete at the
 # moment.
 
 GENERATE_PERLMOD       = NO
 
 # If the PERLMOD_LATEX tag is set to YES Doxygen will generate
 # the necessary Makefile rules, Perl scripts and LaTeX code to be able
 # to generate PDF and DVI output from the Perl module output.
 
 PERLMOD_LATEX          = NO
 
 # If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
 # nicely formatted so it can be parsed by a human reader.
 # This is useful
 # if you want to understand what is going on.
 # On the other hand, if this
 # tag is set to NO the size of the Perl module output will be much smaller
 # and Perl will parse it just the same.
 
 PERLMOD_PRETTY         = YES
 
 # The names of the make variables in the generated doxyrules.make file
 # are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
 # This is useful so different doxyrules.make files included by the same
 # Makefile don't overwrite each other's variables.
 
 PERLMOD_MAKEVAR_PREFIX =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 
 # If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
 # evaluate all C-preprocessor directives found in the sources and include
 # files.
 
 ENABLE_PREPROCESSING   = YES
 
 # If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
 # names in the source code. If set to NO (the default) only conditional
 # compilation will be performed. Macro expansion can be done in a controlled
 # way by setting EXPAND_ONLY_PREDEF to YES.
 
 MACRO_EXPANSION        = YES
 
 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
 # then the macro expansion is limited to the macros specified with the
 # PREDEFINED and EXPAND_AS_DEFINED tags.
 
 EXPAND_ONLY_PREDEF     = NO
 
 # If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
 # pointed to by INCLUDE_PATH will be searched when a #include is found.
 
 SEARCH_INCLUDES        = YES
 
 # The INCLUDE_PATH tag can be used to specify one or more directories that
 # contain include files that are not input files but should be processed by
 # the preprocessor.
 
 INCLUDE_PATH           =
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
 # patterns (like *.h and *.hpp) to filter out the header-files in the
 # directories. If left blank, the patterns specified with FILE_PATTERNS will
 # be used.
 
 INCLUDE_FILE_PATTERNS  =
 
 # The PREDEFINED tag can be used to specify one or more macro names that
 # are defined before the preprocessor is started (similar to the -D option of
 # gcc). The argument of the tag is a list of macros of the form: name
 # or name=definition (no spaces). If the definition and the = are
 # omitted =1 is assumed. To prevent a macro definition from being
 # undefined via #undef or recursively expanded use the := operator
 # instead of the = operator.
 
 PREDEFINED             = itkNotUsed(x)= \
                          "itkSetMacro(name,type)=                   virtual void Set##name (type _arg);" \
                          "itkGetMacro(name,type)=                   virtual type Get##name ();" \
                          "itkGetConstMacro(name,type)=                   virtual type Get##name () const;" \
                          "itkSetStringMacro(name)=                   virtual void Set##name (const char* _arg);" \
                          "itkGetStringMacro(name)=                   virtual const char* Get##name () const;" \
                          "itkSetClampMacro(name,type,min,max)=                   virtual void Set##name (type _arg);" \
                          "itkSetObjectMacro(name,type)=                   virtual void Set##name (type* _arg);" \
                          "itkGetObjectMacro(name,type)=                   virtual type* Get##name ();" \
                          "itkSetConstObjectMacro(name,type)=                   virtual void Set##name ( const type* _arg);" \
                          "itkGetConstObjectMacro(name,type)=                   virtual const type* Get##name ();" \
                          "itkGetConstReferenceMacro(name,type)=                   virtual const type& Get##name ();" \
                          "itkGetConstReferenceObjectMacro(name,type)=                   virtual const type::Pointer& Get##name () const;" \
                          "itkBooleanMacro(name)=                   virtual void name##On ();                   virtual void name##Off ();" \
                          "itkSetVector2Macro(name,type)=                   virtual void Set##name (type _arg1, type _arg2)                   virtual void Set##name (type _arg[2]);" \
                          "itkGetVector2Macro(name,type)=                   virtual type* Get##name () const;                   virtual void Get##name (type& _arg1, type& _arg2) const;                   virtual void Get##name (type _arg[2]) const;" \
                          "itkSetVector3Macro(name,type)=                   virtual void Set##name (type _arg1, type _arg2, type _arg3)                   virtual void Set##name (type _arg[3]);" \
                          "itkGetVector3Macro(name,type)=                   virtual type* Get##name () const;                   virtual void Get##name (type& _arg1, type& _arg2, type& _arg3) const;                   virtual void Get##name (type _arg[3]) const;" \
                          "itkSetVector4Macro(name,type)=                   virtual void Set##name (type _arg1, type _arg2, type _arg3, type _arg4)                   virtual void Set##name (type _arg[4]);" \
                          "itkGetVector4Macro(name,type)=                   virtual type* Get##name () const;                   virtual void Get##name (type& _arg1, type& _arg2, type& _arg3, type& _arg4) const;                   virtual void Get##name (type _arg[4]) const;" \
                          "itkSetVector6Macro(name,type)=                   virtual void Set##name (type _arg1, type _arg2, type _arg3, type _arg4, type _arg5, type _arg6)                   virtual void Set##name (type _arg[6]);" \
                          "itkGetVector6Macro(name,type)=                   virtual type* Get##name () const;                   virtual void Get##name (type& _arg1, type& _arg2, type& _arg3, type& _arg4, type& _arg5, type& _arg6) const;                   virtual void Get##name (type _arg[6]) const;" \
                          "itkSetVectorMacro(name,type,count)=                   virtual void Set##name(type data[]);" \
                          "itkGetVectorMacro(name,type,count)=                   virtual type* Get##name () const;" \
                          "itkNewMacro(type)=                   static Pointer New();" \
                          "itkTypeMacro(thisClass,superclass)=                   virtual const char *GetClassName() const;" \
                          "itkConceptMacro(name,concept)=                   enum { name = 0 };" \
                          "ITK_NUMERIC_LIMITS=                   std::numeric_limits" \
                          "ITK_TYPENAME=                   typename" \
                          "FEM_ABSTRACT_CLASS(thisClass,parentClass)=                   public:                                                                   /** Standard Self typedef.*/                                          typedef thisClass Self;                                                 /** Standard Superclass typedef. */                                   typedef parentClass Superclass;                                         /** Pointer or SmartPointer to an object. */                            typedef Self* Pointer;                                                  /** Const pointer or SmartPointer to an object. */                      typedef const Self* ConstPointer;                                     private:" \
                          "FEM_CLASS(thisClass,parentClass)=                   FEM_ABSTRACT_CLASS(thisClass,parentClass)                               public:                                                                   /** Create a new object from the existing one  */                       virtual Baseclass::Pointer Clone() const;                               /** Class ID for FEM object factory */                                  static const int CLID;                                                  /** Virtual function to access the class ID */                          virtual int ClassID() const                                               { return CLID; }                                                      /** Object creation in an itk compatible way */                         static Self::Pointer New()                                                { return new Self(); }                                              private:" \
                          FREEVERSION \
                          ERROR_CHECKING \
                          HAS_TIFF \
                          HAS_JPEG \
                          HAS_NETLIB \
                          HAS_PNG \
                          HAS_ZLIB \
                          HAS_GLUT \
                          HAS_QT \
                          VCL_USE_NATIVE_STL=1 \
                          VCL_USE_NATIVE_COMPLEX=1 \
                          VCL_HAS_BOOL=1 \
                          VXL_BIG_ENDIAN=1 \
                          VXL_LITTLE_ENDIAN=0 \
                          VNL_DLL_DATA= \
                          size_t=vcl_size_t \
-                         DOXYGEN_SKIP
+                         "US_PREPEND_NAMESPACE(x)=mitk::x" \
+                         "US_BEGIN_NAMESPACE= namespace mitk {" \
+                         "US_END_NAMESPACE=}" \
+                         "US_BASECLASS_NAME=itk::LightObject" \
+                         US_EXPORT=
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
 # this tag can be used to specify a list of macro names that should be expanded.
 # The macro definition that is found in the sources will be used.
 # Use the PREDEFINED tag if you want to use a different macro definition that
 # overrules the definition found in the source code.
 
 EXPAND_AS_DEFINED      =
 
 # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
 # doxygen's preprocessor will remove all references to function-like macros
 # that are alone on a line, have an all uppercase name, and do not end with a
 # semicolon, because these will confuse the parser if not removed.
 
 SKIP_FUNCTION_MACROS   = YES
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
 # The TAGFILES option can be used to specify one or more tagfiles. For each
 # tag file the location of the external documentation should be added. The
 # format of a tag file without this location is as follows:
 #
 # TAGFILES = file1 file2 ...
 # Adding location for the tag files is done as follows:
 #
 # TAGFILES = file1=loc1 "file2 = loc2" ...
 # where "loc1" and "loc2" can be relative or absolute paths
 # or URLs. Note that each tag file must have a unique name (where the name does
 # NOT include the path). If a tag file is not located in the directory in which
 # doxygen is run, you must also specify the path to the tagfile here.
 
 TAGFILES               = @BLUEBERRY_DOXYGEN_TAGFILE@
 
 # When a file name is specified after GENERATE_TAGFILE, doxygen will create
 # a tag file that is based on the input files it reads.
 
 GENERATE_TAGFILE       = @MITK_DOXYGEN_TAGFILE_NAME@
 
 # If the ALLEXTERNALS tag is set to YES all external classes will be listed
 # in the class index. If set to NO only the inherited external classes
 # will be listed.
 
 ALLEXTERNALS           = NO
 
 # If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
 # in the modules index. If set to NO, only the current project's groups will
 # be listed.
 
 EXTERNAL_GROUPS        = NO
 
 # The PERL_PATH should be the absolute path and name of the perl script
 # interpreter (i.e. the result of `which perl').
 
 PERL_PATH              = /usr/bin/perl
 
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 
 # If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
 # generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
 # or super classes. Setting the tag to NO turns the diagrams off. Note that
 # this option also works with HAVE_DOT disabled, but it is recommended to
 # install and use dot, since it yields more powerful graphs.
 
 CLASS_DIAGRAMS         = YES
 
 # You can define message sequence charts within doxygen comments using the \msc
 # command. Doxygen will then run the mscgen tool (see
 # http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
 # documentation. The MSCGEN_PATH tag allows you to specify the directory where
 # the mscgen tool resides. If left empty the tool is assumed to be found in the
 # default search path.
 
 MSCGEN_PATH            =
 
 # If set to YES, the inheritance and collaboration graphs will hide
 # inheritance and usage relations if the target is undocumented
 # or is not a class.
 
 HIDE_UNDOC_RELATIONS   = YES
 
 # If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
 # available from the path. This tool is part of Graphviz, a graph visualization
 # toolkit from AT&T and Lucent Bell Labs. The other options in this section
 # have no effect if this option is set to NO (the default)
 
 HAVE_DOT               = @HAVE_DOT@
 
 # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
 # allowed to run in parallel. When set to 0 (the default) doxygen will
 # base this on the number of processors available in the system. You can set it
 # explicitly to a value larger than 0 to get control over the balance
 # between CPU load and processing speed.
 
 DOT_NUM_THREADS        = @MITK_DOXYGEN_DOT_NUM_THREADS@
 
 # By default doxygen will use the Helvetica font for all dot files that
 # doxygen generates. When you want a differently looking font you can specify
 # the font name using DOT_FONTNAME. You need to make sure dot is able to find
 # the font, which can be done by putting it in a standard location or by setting
 # the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
 # directory containing the font.
 
 DOT_FONTNAME           = FreeSans.ttf
 
 # The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
 # The default size is 10pt.
 
 DOT_FONTSIZE           = 10
 
 # By default doxygen will tell dot to use the Helvetica font.
 # If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
 # set the path where dot can find it.
 
 DOT_FONTPATH           =
 
 # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
 # will generate a graph for each documented class showing the direct and
 # indirect inheritance relations. Setting this tag to YES will force the
 # CLASS_DIAGRAMS tag to NO.
 
 CLASS_GRAPH            = YES
 
 # If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
 # will generate a graph for each documented class showing the direct and
 # indirect implementation dependencies (inheritance, containment, and
 # class references variables) of the class with other documented classes.
 
 COLLABORATION_GRAPH    = YES
 
 # If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
 # will generate a graph for groups, showing the direct groups dependencies
 
 GROUP_GRAPHS           = YES
 
 # If the UML_LOOK tag is set to YES doxygen will generate inheritance and
 # collaboration diagrams in a style similar to the OMG's Unified Modeling
 # Language.
 
 UML_LOOK               = @MITK_DOXYGEN_UML_LOOK@
 
 # If the UML_LOOK tag is enabled, the fields and methods are shown inside
 # the class node. If there are many fields or methods and many nodes the
 # graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
 # threshold limits the number of items for each type to make the size more
 # managable. Set this to 0 for no limit. Note that the threshold may be
 # exceeded by 50% before the limit is enforced.
 
 UML_LIMIT_NUM_FIELDS   = 10
 
 # If set to YES, the inheritance and collaboration graphs will show the
 # relations between templates and their instances.
 
 TEMPLATE_RELATIONS     = YES
 
 # If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
 # tags are set to YES then doxygen will generate a graph for each documented
 # file showing the direct and indirect include dependencies of the file with
 # other documented files.
 
 INCLUDE_GRAPH          = NO
 
 # If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
 # HAVE_DOT tags are set to YES then doxygen will generate a graph for each
 # documented header file showing the documented files that directly or
 # indirectly include this file.
 
 INCLUDED_BY_GRAPH      = NO
 
 # If the CALL_GRAPH and HAVE_DOT options are set to YES then
 # doxygen will generate a call dependency graph for every global function
 # or class method. Note that enabling this option will significantly increase
 # the time of a run. So in most cases it will be better to enable call graphs
 # for selected functions only using the \callgraph command.
 
 CALL_GRAPH             = NO
 
 # If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
 # doxygen will generate a caller dependency graph for every global function
 # or class method. Note that enabling this option will significantly increase
 # the time of a run. So in most cases it will be better to enable caller
 # graphs for selected functions only using the \callergraph command.
 
 CALLER_GRAPH           = NO
 
 # If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
 # will generate a graphical hierarchy of all classes instead of a textual one.
 
 GRAPHICAL_HIERARCHY    = NO
 
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
+# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES
 # then doxygen will show the dependencies a directory has on other directories
 # in a graphical way. The dependency relations are determined by the #include
 # relations between the files in the directories.
 
 DIRECTORY_GRAPH        = YES
 
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
 # generated by dot. Possible values are svg, png, jpg, or gif.
 # If left blank png will be used. If you choose svg you need to set
 # HTML_FILE_EXTENSION to xhtml in order to make the SVG files
 # visible in IE 9+ (other browsers do not have this requirement).
 
 DOT_IMAGE_FORMAT       = png
 
 # If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
 # enable generation of interactive SVG images that allow zooming and panning.
 # Note that this requires a modern browser other than Internet Explorer.
 # Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
 # need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
 # visible. Older versions of IE do not have SVG support.
 
 INTERACTIVE_SVG        = NO
 
 # The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found in the path.
 
 DOT_PATH               = @DOXYGEN_DOT_PATH@
 
 # The DOTFILE_DIRS tag can be used to specify one or more directories that
 # contain dot files that are included in the documentation (see the
 # \dotfile command).
 
 DOTFILE_DIRS           =
 
 # The MSCFILE_DIRS tag can be used to specify one or more directories that
 # contain msc files that are included in the documentation (see the
 # \mscfile command).
 
 MSCFILE_DIRS           =
 
 # The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
 # nodes that will be shown in the graph. If the number of nodes in a graph
 # becomes larger than this value, doxygen will truncate the graph, which is
 # visualized by representing a node as a red box. Note that doxygen if the
 # number of direct children of the root node in a graph is already larger than
 # DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
 # that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
 
 DOT_GRAPH_MAX_NODES    = 50
 
 # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
 # graphs generated by dot. A depth value of 3 means that only nodes reachable
 # from the root by following a path via at most 3 edges will be shown. Nodes
 # that lay further from the root node will be omitted. Note that setting this
 # option to 1 or 2 may greatly reduce the computation time needed for large
 # code bases. Also note that the size of a graph can be further restricted by
 # DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
 
 MAX_DOT_GRAPH_DEPTH    = 0
 
 # Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
 # background. This is disabled by default, because dot on Windows does not
 # seem to support this out of the box. Warning: Depending on the platform used,
 # enabling this option may lead to badly anti-aliased labels on the edges of
 # a graph (i.e. they become hard to read).
 
 DOT_TRANSPARENT        = NO
 
 # Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
 # files in one run (i.e. multiple -o and -T options on the command line). This
 # makes dot run faster, but since only newer versions of dot (>1.8.10)
 # support this, this feature is disabled by default.
 
 DOT_MULTI_TARGETS      = NO
 
 # If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
 # generate a legend page explaining the meaning of the various boxes and
 # arrows in the dot generated graphs.
 
 GENERATE_LEGEND        = YES
 
 # If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
 # remove the intermediate dot files that are used to generate
 # the various graphs.
 
 DOT_CLEANUP            = YES
diff --git a/Documentation/mitk_doxygen.css b/Documentation/mitk_doxygen.css
index 8d49f5c166..3f74083669 100644
--- a/Documentation/mitk_doxygen.css
+++ b/Documentation/mitk_doxygen.css
@@ -1,1010 +1,1195 @@
 /* The standard CSS for doxygen */
 
 body, table, div, p, dl {
-	font-family: Lucida Grande, Verdana, Geneva, Arial, sans-serif;
-	font-size: 12px;
+  font-family: Lucida Grande, Verdana, Geneva, Arial, sans-serif;
+  font-size: 13px;
+  line-height: 1.3;
 }
 
 /* @group Heading Levels */
 
 h1 {
-	font-size: 150%;
+  font-size: 150%;
 }
 
 .title {
-	font-size: 150%;
-	font-weight: bold;
-	margin: 10px 2px;
+  font-size: 150%;
+  font-weight: bold;
+  margin: 10px 2px;
 }
 
 h2 {
-	font-size: 120%;
+  font-size: 120%;
 }
 
 h3 {
-	font-size: 100%;
+  font-size: 100%;
+}
+
+h1, h2, h3, h4, h5, h6 {
+  -webkit-transition: text-shadow 0.5s linear;
+  -moz-transition: text-shadow 0.5s linear;
+  -ms-transition: text-shadow 0.5s linear;
+  -o-transition: text-shadow 0.5s linear;
+  transition: text-shadow 0.5s linear;
+  margin-right: 15px;
+}
+
+h1.glow, h2.glow, h3.glow, h4.glow, h5.glow, h6.glow {
+  text-shadow: 0 0 15px cyan;
 }
 
 dt {
-	font-weight: bold;
+  font-weight: bold;
 }
 
 div.multicol {
-	-moz-column-gap: 1em;
-	-webkit-column-gap: 1em;
-	-moz-column-count: 3;
-	-webkit-column-count: 3;
+  -moz-column-gap: 1em;
+  -webkit-column-gap: 1em;
+  -moz-column-count: 3;
+  -webkit-column-count: 3;
 }
 
 p.startli, p.startdd, p.starttd {
-	margin-top: 2px;
+  margin-top: 2px;
 }
 
 p.endli {
-	margin-bottom: 0px;
+  margin-bottom: 0px;
 }
 
 p.enddd {
-	margin-bottom: 4px;
+  margin-bottom: 4px;
 }
 
 p.endtd {
-	margin-bottom: 2px;
+  margin-bottom: 2px;
 }
 
 /* @end */
 
 caption {
-	font-weight: bold;
+  font-weight: bold;
 }
 
 span.legend {
         font-size: 70%;
         text-align: center;
 }
 
 h3.version {
         font-size: 90%;
         text-align: center;
 }
 
 div.qindex, div.navtab{
-	background-color: #EBEFF6;
-	border: 1px solid #A3B4D7;
-	text-align: center;
+  background-color: #EBEFF6;
+  border: 1px solid #A3B4D7;
+  text-align: center;
 }
 
 div.qindex, div.navpath {
-	width: 100%;
-	line-height: 140%;
+  width: 100%;
+  line-height: 140%;
 }
 
 div.navtab {
-	margin-right: 15px;
+  margin-right: 15px;
 }
 
 /* @group Link Styling */
 
 a {
-	color: #3D578C;
-	font-weight: normal;
-	text-decoration: none;
+  color: #3D578C;
+  font-weight: normal;
+  text-decoration: none;
 }
 
 .contents a:visited {
-	color: #4665A2;
+  color: #4665A2;
 }
 
 a:hover {
-	text-decoration: underline;
+  text-decoration: underline;
 }
 
 a.qindex {
-	font-weight: bold;
+  font-weight: bold;
 }
 
 a.qindexHL {
-	font-weight: bold;
-	background-color: #9CAFD4;
-	color: #ffffff;
-	border: 1px double #869DCA;
+  font-weight: bold;
+  background-color: #9CAFD4;
+  color: #ffffff;
+  border: 1px double #869DCA;
 }
 
 .contents a.qindexHL:visited {
         color: #ffffff;
 }
 
 a.el {
-	font-weight: bold;
+  font-weight: bold;
 }
 
 a.elRef {
 }
 
-a.code {
-	color: #4665A2;
+a.code, a.code:visited {
+  color: #4665A2; 
 }
 
-a.codeRef {
-	color: #4665A2;
+a.codeRef, a.codeRef:visited {
+  color: #4665A2; 
 }
 
 /* @end */
 
 dl.el {
-	margin-left: -1cm;
-}
-
-.fragment {
-	font-family: monospace, fixed;
-	font-size: 105%;
+  margin-left: -1cm;
 }
 
 pre.fragment {
-	border: 1px solid #C4CFE5;
-	background-color: #FBFCFD;
-	padding: 4px 6px;
-	margin: 4px 8px 4px 2px;
-	overflow: auto;
-	word-wrap: break-word;
-	font-size:  9pt;
-	line-height: 125%;
+        border: 1px solid #C4CFE5;
+        background-color: #FBFCFD;
+        padding: 4px 6px;
+        margin: 4px 8px 4px 2px;
+        overflow: auto;
+        word-wrap: break-word;
+        font-size:  9pt;
+        line-height: 125%;
+        font-family: monospace, fixed;
+        font-size: 105%;
+}
+
+div.fragment {
+        padding: 4px;
+        margin: 4px;
+  background-color: #FBFCFD;
+  border: 1px solid #C4CFE5;
+}
+
+div.line {
+  font-family: monospace, fixed;
+        font-size: 13px;
+  min-height: 13px;
+  line-height: 1.0;
+  text-wrap: unrestricted;
+  white-space: -moz-pre-wrap; /* Moz */
+  white-space: -pre-wrap;     /* Opera 4-6 */
+  white-space: -o-pre-wrap;   /* Opera 7 */
+  white-space: pre-wrap;      /* CSS3  */
+  word-wrap: break-word;      /* IE 5.5+ */
+  text-indent: -53px;
+  padding-left: 53px;
+  padding-bottom: 0px;
+  margin: 0px;
+}
+
+span.lineno {
+  padding-right: 4px;
+  text-align: right;
+  border-right: 2px solid #0F0;
+  background-color: #E8E8E8;
+        white-space: pre;
+}
+span.lineno a {
+  background-color: #D8D8D8;
+}
+
+span.lineno a:hover {
+  background-color: #C8C8C8;
 }
 
 div.ah {
-	background-color: black;
-	font-weight: bold;
-	color: #ffffff;
-	margin-bottom: 3px;
-	margin-top: 3px;
-	padding: 0.2em;
-	border: solid thin #333;
-	border-radius: 0.5em;
-	-webkit-border-radius: .5em;
-	-moz-border-radius: .5em;
-	box-shadow: 2px 2px 3px #999;
-	-webkit-box-shadow: 2px 2px 3px #999;
-	-moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px;
-	background-image: -webkit-gradient(linear, left top, left bottom, from(#eee), to(#000),color-stop(0.3, #444));
-	background-image: -moz-linear-gradient(center top, #eee 0%, #444 40%, #000);
+  background-color: black;
+  font-weight: bold;
+  color: #ffffff;
+  margin-bottom: 3px;
+  margin-top: 3px;
+  padding: 0.2em;
+  border: solid thin #333;
+  border-radius: 0.5em;
+  -webkit-border-radius: .5em;
+  -moz-border-radius: .5em;
+  box-shadow: 2px 2px 3px #999;
+  -webkit-box-shadow: 2px 2px 3px #999;
+  -moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#eee), to(#000),color-stop(0.3, #444));
+  background-image: -moz-linear-gradient(center top, #eee 0%, #444 40%, #000);
 }
 
 div.groupHeader {
-	margin-left: 16px;
-	margin-top: 12px;
-	font-weight: bold;
+  margin-left: 16px;
+  margin-top: 12px;
+  font-weight: bold;
 }
 
 div.groupText {
-	margin-left: 16px;
-	font-style: italic;
+  margin-left: 16px;
+  font-style: italic;
 }
 
 body {
-	background-color: white;
-	color: black;
+  background-color: white;
+  color: black;
         margin: 0;
 }
 
 div.contents {
-	margin-top: 10px;
-	margin-left: 8px;
-	margin-right: 8px;
+  margin-top: 10px;
+  margin-left: 12px;
+  margin-right: 8px;
 }
 
 td.indexkey {
-	background-color: #EBEFF6;
-	font-weight: bold;
-	border: 1px solid #C4CFE5;
-	margin: 2px 0px 2px 0;
-	padding: 2px 10px;
+  background-color: #EBEFF6;
+  font-weight: bold;
+  border: 1px solid #C4CFE5;
+  margin: 2px 0px 2px 0;
+  padding: 2px 10px;
+        white-space: nowrap;
+        vertical-align: top;
 }
 
 td.indexvalue {
-	background-color: #EBEFF6;
-	border: 1px solid #C4CFE5;
-	padding: 2px 10px;
-	margin: 2px 0px;
+  background-color: #EBEFF6;
+  border: 1px solid #C4CFE5;
+  padding: 2px 10px;
+  margin: 2px 0px;
 }
 
 tr.memlist {
-	background-color: #EEF1F7;
+  background-color: #EEF1F7;
 }
 
 p.formulaDsp {
-	text-align: center;
+  text-align: center;
 }
 
 img.formulaDsp {
-	
+  
 }
 
 img.formulaInl {
-	vertical-align: middle;
+  vertical-align: middle;
 }
 
 div.center {
-	text-align: center;
+  text-align: center;
         margin-top: 0px;
         margin-bottom: 0px;
         padding: 0px;
 }
 
 div.center img {
-	border: 0px;
+  border: 0px;
 }
 
 address.footer {
-	text-align: right;
-	padding-right: 12px;
+  text-align: right;
+  padding-right: 12px;
 }
 
 img.footer {
-	border: 0px;
-	vertical-align: middle;
+  border: 0px;
+  vertical-align: middle;
 }
 
 /* @group Code Colorization */
 
 span.keyword {
-	color: #008000
+  color: #008000
 }
 
 span.keywordtype {
-	color: #604020
+  color: #604020
 }
 
 span.keywordflow {
-	color: #e08000
+  color: #e08000
 }
 
 span.comment {
-	color: #800000
+  color: #800000
 }
 
 span.preprocessor {
-	color: #806020
+  color: #806020
 }
 
 span.stringliteral {
-	color: #002080
+  color: #002080
 }
 
 span.charliteral {
-	color: #008080
+  color: #008080
 }
 
 span.vhdldigit { 
-	color: #ff00ff 
+  color: #ff00ff 
 }
 
 span.vhdlchar { 
-	color: #000000 
+  color: #000000 
 }
 
 span.vhdlkeyword { 
-	color: #700070 
+  color: #700070 
 }
 
 span.vhdllogic { 
-	color: #ff0000 
+  color: #ff0000 
+}
+
+blockquote {
+        background-color: #F7F8FB;
+        border-left: 2px solid #9CAFD4;
+        margin: 0 24px 0 4px;
+        padding: 0 12px 0 16px;
 }
 
 /* @end */
 
 /*
 .search {
-	color: #003399;
-	font-weight: bold;
+  color: #003399;
+  font-weight: bold;
 }
 
 form.search {
-	margin-bottom: 0px;
-	margin-top: 0px;
+  margin-bottom: 0px;
+  margin-top: 0px;
 }
 
 input.search {
-	font-size: 75%;
-	color: #000080;
-	font-weight: normal;
-	background-color: #e8eef2;
+  font-size: 75%;
+  color: #000080;
+  font-weight: normal;
+  background-color: #e8eef2;
 }
 */
 
 td.tiny {
-	font-size: 75%;
+  font-size: 75%;
 }
 
 .dirtab {
-	padding: 4px;
-	border-collapse: collapse;
-	border: 1px solid #A3B4D7;
+  padding: 4px;
+  border-collapse: collapse;
+  border: 1px solid #A3B4D7;
 }
 
 th.dirtab {
-	background: #EBEFF6;
-	font-weight: bold;
+  background: #EBEFF6;
+  font-weight: bold;
 }
 
 hr {
-	height: 0px;
-	border: none;
-	border-top: 1px solid #4A6AAA;
+  height: 0px;
+  border: none;
+  border-top: 1px solid #4A6AAA;
 }
 
 hr.footer {
-	height: 1px;
+  height: 1px;
 }
 
 /* @group Member Descriptions */
 
 table.memberdecls {
-	border-spacing: 0px;
-	padding: 0px;
+  border-spacing: 0px;
+  padding: 0px;
+}
+
+.memberdecls td {
+  -webkit-transition-property: background-color, box-shadow;
+  -webkit-transition-duration: 0.5s;
+  -moz-transition-property: background-color, box-shadow;
+  -moz-transition-duration: 0.5s;
+  -ms-transition-property: background-color, box-shadow;
+  -ms-transition-duration: 0.5s;
+  -o-transition-property: background-color, box-shadow;
+  -o-transition-duration: 0.5s;
+  transition-property: background-color, box-shadow;
+  transition-duration: 0.5s;
+}
+
+.memberdecls td.glow {
+  background-color: cyan;
+  box-shadow: 0 0 15px cyan;
 }
 
 .mdescLeft, .mdescRight,
 .memItemLeft, .memItemRight,
 .memTemplItemLeft, .memTemplItemRight, .memTemplParams {
-	background-color: #F9FAFC;
-	border: none;
-	margin: 4px;
-	padding: 1px 0 0 8px;
+  background-color: #F9FAFC;
+  border: none;
+  margin: 4px;
+  padding: 1px 0 0 8px;
 }
 
 .mdescLeft, .mdescRight {
-	padding: 0px 8px 4px 8px;
-	color: #555;
+  padding: 0px 8px 4px 8px;
+  color: #555;
 }
 
 .memItemLeft, .memItemRight, .memTemplParams {
-	border-top: 1px solid #C4CFE5;
+  border-top: 1px solid #C4CFE5;
 }
 
 .memItemLeft, .memTemplItemLeft {
         white-space: nowrap;
 }
 
 .memItemRight {
-	width: 100%;
+  width: 100%;
 }
 
 .memTemplParams {
-	color: #4665A2;
+  color: #4665A2;
         white-space: nowrap;
 }
 
 /* @end */
 
 /* @group Member Details */
 
 /* Styles for detailed member documentation */
 
 .memtemplate {
-	font-size: 80%;
-	color: #4665A2;
-	font-weight: normal;
-	margin-left: 9px;
+  font-size: 80%;
+  color: #4665A2;
+  font-weight: normal;
+  margin-left: 9px;
 }
 
 .memnav {
-	background-color: #EBEFF6;
-	border: 1px solid #A3B4D7;
-	text-align: center;
-	margin: 2px;
-	margin-right: 15px;
-	padding: 2px;
+  background-color: #EBEFF6;
+  border: 1px solid #A3B4D7;
+  text-align: center;
+  margin: 2px;
+  margin-right: 15px;
+  padding: 2px;
 }
 
 .mempage {
-	width: 100%;
+  width: 100%;
 }
 
 .memitem {
-	padding: 0;
-	margin-bottom: 10px;
-	margin-right: 5px;
+  padding: 0;
+  margin-bottom: 10px;
+  margin-right: 5px;
+        -webkit-transition: box-shadow 0.5s linear;
+        -moz-transition: box-shadow 0.5s linear;
+        -ms-transition: box-shadow 0.5s linear;
+        -o-transition: box-shadow 0.5s linear;
+        transition: box-shadow 0.5s linear;
+}
+
+.memitem.glow {
+         box-shadow: 0 0 15px cyan;
 }
 
 .memname {
-        white-space: nowrap;
         font-weight: bold;
         margin-left: 6px;
 }
 
+.memname td {
+  vertical-align: bottom;
+}
+
 .memproto, dl.reflist dt {
         border-top: 1px solid #A8B8D9;
         border-left: 1px solid #A8B8D9;
         border-right: 1px solid #A8B8D9;
         padding: 6px 0px 6px 0px;
         color: #253555;
         font-weight: bold;
         text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9);
+        background-image:url('nav_f.png');
+        background-repeat:repeat-x;
+        background-color: #E2E8F2;
         /* opera specific markup */
         box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-        border-top-right-radius: 8px;
-        border-top-left-radius: 8px;
+        border-top-right-radius: 4px;
+        border-top-left-radius: 4px;
         /* firefox specific markup */
         -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
-        -moz-border-radius-topright: 8px;
-        -moz-border-radius-topleft: 8px;
+        -moz-border-radius-topright: 4px;
+        -moz-border-radius-topleft: 4px;
         /* webkit specific markup */
         -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-        -webkit-border-top-right-radius: 8px;
-        -webkit-border-top-left-radius: 8px;
-        background-image:url('nav_f.png');
-        background-repeat:repeat-x;
-        background-color: #E2E8F2;
+        -webkit-border-top-right-radius: 4px;
+        -webkit-border-top-left-radius: 4px;
 
 }
 
 .memdoc, dl.reflist dd {
         border-bottom: 1px solid #A8B8D9;      
         border-left: 1px solid #A8B8D9;      
         border-right: 1px solid #A8B8D9; 
-        padding: 2px 5px;
+        padding: 6px 10px 2px 10px;
         background-color: #FBFCFD;
         border-top-width: 0;
+        background-image:url('nav_g.png');
+        background-repeat:repeat-x;
+        background-color: #FFFFFF;
         /* opera specific markup */
-        border-bottom-left-radius: 8px;
-        border-bottom-right-radius: 8px;
+        border-bottom-left-radius: 4px;
+        border-bottom-right-radius: 4px;
         box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
         /* firefox specific markup */
-        -moz-border-radius-bottomleft: 8px;
-        -moz-border-radius-bottomright: 8px;
+        -moz-border-radius-bottomleft: 4px;
+        -moz-border-radius-bottomright: 4px;
         -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
-        background-image: -moz-linear-gradient(center top, #FFFFFF 0%, #FFFFFF 60%, #F7F8FB 95%, #EEF1F7);
         /* webkit specific markup */
-        -webkit-border-bottom-left-radius: 8px;
-        -webkit-border-bottom-right-radius: 8px;
+        -webkit-border-bottom-left-radius: 4px;
+        -webkit-border-bottom-right-radius: 4px;
         -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-        background-image: -webkit-gradient(linear,center top,center bottom,from(#FFFFFF), color-stop(0.6,#FFFFFF), color-stop(0.60,#FFFFFF), color-stop(0.95,#F7F8FB), to(#EEF1F7));
 }
 
 dl.reflist dt {
         padding: 5px;
 }
 
 dl.reflist dd {
         margin: 0px 0px 10px 0px;
         padding: 5px;
 }
 
 .paramkey {
-	text-align: right;
+  text-align: right;
 }
 
 .paramtype {
-	white-space: nowrap;
+  white-space: nowrap;
 }
 
 .paramname {
-	color: #602020;
-	white-space: nowrap;
+  color: #602020;
+  white-space: nowrap;
 }
 .paramname em {
-	font-style: normal;
+  font-style: normal;
 }
 
 .params, .retval, .exception, .tparams {
-        border-spacing: 6px 2px;
+        margin-left: 0px;
+        padding-left: 0px;
 }       
 
 .params .paramname, .retval .paramname {
         font-weight: bold;
         vertical-align: top;
 }
         
 .params .paramtype {
         font-style: italic;
         vertical-align: top;
 }       
         
 .params .paramdir {
         font-family: "courier new",courier,monospace;
         vertical-align: top;
 }
 
+table.mlabels {
+  border-spacing: 0px;
+}
 
-
-
-/* @end */
-
-/* @group Directory (tree) */
-
-/* for the tree view */
-
-.ftvtree {
-	font-family: sans-serif;
-	margin: 0px;
+td.mlabels-left {
+  width: 100%;
+  padding: 0px;
 }
 
-/* these are for tree view when used as main index */
+td.mlabels-right {
+  vertical-align: bottom;
+  padding: 0px;
+  white-space: nowrap;
+}
 
-.directory {
-	font-size: 9pt;
-	font-weight: bold;
-	margin: 5px;
+span.mlabels {
+        margin-left: 8px;
 }
 
-.directory h3 {
-	margin: 0px;
-	margin-top: 1em;
-	font-size: 11pt;
+span.mlabel {
+        background-color: #728DC1;
+        border-top:1px solid #5373B4;
+        border-left:1px solid #5373B4;
+        border-right:1px solid #C4CFE5;
+        border-bottom:1px solid #C4CFE5;
+  text-shadow: none;
+        color: white;
+        margin-right: 4px;
+        padding: 2px 3px;
+        border-radius: 3px;
+        font-size: 7pt;
+  white-space: nowrap;
 }
 
-/*
-The following two styles can be used to replace the root node title
-with an image of your choice.  Simply uncomment the next two styles,
-specify the name of your image and be sure to set 'height' to the
-proper pixel height of your image.
-*/
 
-/*
-.directory h3.swap {
-	height: 61px;
-	background-repeat: no-repeat;
-	background-image: url("yourimage.gif");
-}
-.directory h3.swap span {
-	display: none;
-}
-*/
 
-.directory > h3 {
-	margin-top: 0;
-}
+/* @end */
 
-.directory p {
-	margin: 0px;
-	white-space: nowrap;
-}
+/* these are for tree view when not used as main index */
 
-.directory div {
-	display: none;
-	margin: 0px;
+div.directory {
+        margin: 10px 0px;
+        border-top: 1px solid #A8B8D9;
+        border-bottom: 1px solid #A8B8D9;
+        width: 100%;
 }
 
-.directory img {
-	vertical-align: -30%;
+.directory table {
+        border-collapse:collapse;
 }
 
-/* these are for tree view when not used as main index */
+.directory td {
+        margin: 0px;
+        padding: 0px;
+  vertical-align: top;
+}
 
-.directory-alt {
-	font-size: 100%;
-	font-weight: bold;
+.directory td.entry {
+        white-space: nowrap;
+        padding-right: 6px;
 }
 
-.directory-alt h3 {
-	margin: 0px;
-	margin-top: 1em;
-	font-size: 11pt;
+.directory td.entry a {
+        outline:none;
 }
 
-.directory-alt > h3 {
-	margin-top: 0;
+.directory td.desc {
+        width: 100%;
+        padding-left: 6px;
+  padding-right: 6px;
+  border-left: 1px solid rgba(0,0,0,0.05);
 }
 
-.directory-alt p {
-	margin: 0px;
-	white-space: nowrap;
+.directory tr.even {
+  padding-left: 6px;
+  background-color: #F7F8FB;
 }
 
-.directory-alt div {
-	display: none;
-	margin: 0px;
+.directory img {
+  vertical-align: -30%;
 }
 
-.directory-alt img {
-	vertical-align: -30%;
+.directory .levels {
+        white-space: nowrap;
+        width: 100%;
+        text-align: right;
+        font-size: 9pt;
 }
 
-/* @end */
+.directory .levels span {
+        cursor: pointer;
+        padding-left: 2px;
+        padding-right: 2px;
+  color: #3D578C;
+}
 
 div.dynheader {
         margin-top: 8px;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
 }
 
 address {
-	font-style: normal;
-	color: #2A3D61;
+  font-style: normal;
+  color: #2A3D61;
 }
 
 table.doxtable {
-	border-collapse:collapse;
+  border-collapse:collapse;
+        margin-top: 4px;
+        margin-bottom: 4px;
 }
 
 table.doxtable td, table.doxtable th {
-	border: 1px solid #2D4068;
-	padding: 3px 7px 2px;
+  border: 1px solid #2D4068;
+  padding: 3px 7px 2px;
 }
 
 table.doxtable th {
-	background-color: #374F7F;
-	color: #FFFFFF;
-	font-size: 110%;
-	padding-bottom: 4px;
-	padding-top: 5px;
-	text-align:left;
+  background-color: #374F7F;
+  color: #FFFFFF;
+  font-size: 110%;
+  padding-bottom: 4px;
+  padding-top: 5px;
 }
 
 table.fieldtable {
         width: 100%;
         margin-bottom: 10px;
         border: 1px solid #A8B8D9;
         border-spacing: 0px;
         -moz-border-radius: 4px;
         -webkit-border-radius: 4px;
         border-radius: 4px;
         -moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px;
         -webkit-box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15);
         box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15);
 }
 
 .fieldtable td, .fieldtable th {
         padding: 3px 7px 2px;
 }
 
 .fieldtable td.fieldtype, .fieldtable td.fieldname {
         white-space: nowrap;
         border-right: 1px solid #A8B8D9;
         border-bottom: 1px solid #A8B8D9;
         vertical-align: top;
 }
 
 .fieldtable td.fielddoc {
         border-bottom: 1px solid #A8B8D9;
         width: 100%;
 }
 
 .fieldtable tr:last-child td {
         border-bottom: none;
 }
 
 .fieldtable th {
         background-image:url('nav_f.png');
         background-repeat:repeat-x;
         background-color: #E2E8F2;
         font-size: 90%;
         color: #253555;
         padding-bottom: 4px;
         padding-top: 5px;
         text-align:left;
         -moz-border-radius-topleft: 4px;
         -moz-border-radius-topright: 4px;
         -webkit-border-top-left-radius: 4px;
         -webkit-border-top-right-radius: 4px;
         border-top-left-radius: 4px;
         border-top-right-radius: 4px;
         border-bottom: 1px solid #A8B8D9;
 }
 
 
 .tabsearch {
-	top: 0px;
-	left: 10px;
-	height: 36px;
-	background-image: url('tab_b.png');
-	z-index: 101;
-	overflow: hidden;
-	font-size: 13px;
+  top: 0px;
+  left: 10px;
+  height: 36px;
+  background-image: url('tab_b.png');
+  z-index: 101;
+  overflow: hidden;
+  font-size: 13px;
 }
 
 .navpath ul
 {
-	font-size: 11px;
-	background-image:url('tab_b.png');
-	background-repeat:repeat-x;
-	height:30px;
-	line-height:30px;
-	color:#8AA0CC;
-	border:solid 1px #C2CDE4;
-	overflow:hidden;
-	margin:0px;
-	padding:0px;
+  font-size: 11px;
+  background-image:url('tab_b.png');
+  background-repeat:repeat-x;
+  height:30px;
+  line-height:30px;
+  color:#8AA0CC;
+  border:solid 1px #C2CDE4;
+  overflow:hidden;
+  margin:0px;
+  padding:0px;
 }
 
 .navpath li
 {
-	list-style-type:none;
-	float:left;
-	padding-left:10px;
-	padding-right:15px;
-	background-image:url('bc_s.png');
-	background-repeat:no-repeat;
-	background-position:right;
-	color:#364D7C;
+  list-style-type:none;
+  float:left;
+  padding-left:10px;
+  padding-right:15px;
+  background-image:url('bc_s.png');
+  background-repeat:no-repeat;
+  background-position:right;
+  color:#364D7C;
 }
 
 .navpath li.navelem a
 {
-	height:32px;
-	display:block;
-	text-decoration: none;
-	outline: none;
+  height:32px;
+  display:block;
+  text-decoration: none;
+  outline: none;
 }
 
 .navpath li.navelem a:hover
 {
-	color:#6884BD;
+  color:#6884BD;
 }
 
 .navpath li.footer
 {
         list-style-type:none;
         float:right;
         padding-left:10px;
         padding-right:15px;
         background-image:none;
         background-repeat:no-repeat;
         background-position:right;
         color:#364D7C;
         font-size: 8pt;
 }
 
 
 div.summary
 {
-	float: right;
-	font-size: 8pt;
-	padding-right: 5px;
-	width: 50%;
-	text-align: right;
+  float: right;
+  font-size: 8pt;
+  padding-right: 5px;
+  width: 50%;
+  text-align: right;
 }       
 
 div.summary a
 {
-	white-space: nowrap;
+  white-space: nowrap;
 }
 
 div.ingroups
 {
-	margin-left: 5px;
-	font-size: 8pt;
-	padding-left: 5px;
-	width: 50%;
-	text-align: left;
+  margin-left: 5px;
+  font-size: 8pt;
+  padding-left: 5px;
+  width: 50%;
+  text-align: left;
 }
 
 div.ingroups a
 {
-	white-space: nowrap;
+  white-space: nowrap;
 }
 
 div.header
 {
         background-image:url('nav_h.png');
         background-repeat:repeat-x;
-	background-color: #F9FAFC;
-	margin:  0px;
-	border-bottom: 1px solid #C4CFE5;
+  background-color: #F9FAFC;
+  margin:  0px;
+  border-bottom: 1px solid #C4CFE5;
 }
 
 div.headertitle
 {
-	padding: 5px 5px 5px 7px;
+  padding: 5px 5px 5px 7px;
 }
 
 dl
 {
         padding: 0 0 0 10px;
 }
 
-dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated, dl.todo, dl.test, dl.bug
+/* dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated, dl.todo, dl.test, dl.bug */
+dl.section
 {
-        border-left:4px solid;
-        padding: 0 0 0 6px;
+  margin-left: 0px;
+  padding-left: 0px;
 }
 
 dl.note
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #D0C000;
 }
 
 dl.warning, dl.attention
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #FF0000;
 }
 
 dl.pre, dl.post, dl.invariant
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #00D000;
 }
 
 dl.deprecated
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #505050;
 }
 
 dl.todo
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #00C0E0;
 }
 
 dl.test
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #3030E0;
 }
 
 dl.bug
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #C08050;
 }
 
+dl.section dd {
+  margin-bottom: 6px;
+}
+
+
 #projectlogo
 {
-	text-align: center;
-	vertical-align: bottom;
-	border-collapse: separate;
+  text-align: center;
+  vertical-align: bottom;
+  border-collapse: separate;
 }
  
 #projectlogo img
 { 
-	border: 0px none;
+  border: 0px none;
 }
  
 #projectname
 {
-	font: 300% Tahoma, Arial,sans-serif;
-	margin: 0px;
-	padding: 2px 0px;
+  font: 300% Tahoma, Arial,sans-serif;
+  margin: 0px;
+  padding: 2px 0px;
 }
     
 #projectbrief
 {
-	font: 120% Tahoma, Arial,sans-serif;
-	margin: 0px;
-	padding: 0px;
+  font: 120% Tahoma, Arial,sans-serif;
+  margin: 0px;
+  padding: 0px;
 }
 
 #projectnumber
 {
-	font: 50% Tahoma, Arial,sans-serif;
-	margin: 0px;
-	padding: 0px;
+  font: 50% Tahoma, Arial,sans-serif;
+  margin: 0px;
+  padding: 0px;
 }
 
 #titlearea
 {
-	padding: 0px;
-	margin: 0px;
-	width: 100%;
-	border-bottom: 1px solid #5373B4;
+  padding: 0px;
+  margin: 0px;
+  width: 100%;
+  border-bottom: 1px solid #5373B4;
 }
 
 .image
 {
         text-align: center;
 }
 
 .dotgraph
 {
         text-align: center;
 }
 
 .mscgraph
 {
         text-align: center;
 }
 
 .caption
 {
-	font-weight: bold;
+  font-weight: bold;
 }
 
 div.zoom
 {
-	border: 1px solid #90A5CE;
+  border: 1px solid #90A5CE;
 }
 
 dl.citelist {
         margin-bottom:50px;
 }
 
 dl.citelist dt {
         color:#334975;
         float:left;
         font-weight:bold;
         margin-right:10px;
         padding:5px;
 }
 
 dl.citelist dd {
         margin:2px 0;
         padding:5px 0;
 }
 
+div.toc {
+        padding: 14px 25px;
+        background-color: #F4F6FA;
+        border: 1px solid #D8DFEE;
+        border-radius: 7px 7px 7px 7px;
+        float: right;
+        height: auto;
+        margin: 0 20px 10px 10px;
+        width: 200px;
+}
+
+div.toc li {
+        background: url("bdwn.png") no-repeat scroll 0 5px transparent;
+        font: 10px/1.2 Verdana,DejaVu Sans,Geneva,sans-serif;
+        margin-top: 5px;
+        padding-left: 10px;
+        padding-top: 2px;
+}
+
+div.toc h3 {
+        font: bold 12px/1.2 Arial,FreeSans,sans-serif;
+  color: #4665A2;
+        border-bottom: 0 none;
+        margin: 0;
+}
+
+div.toc ul {
+        list-style: none outside none;
+        border: medium none;
+        padding: 0px;
+}       
+
+div.toc li.level1 {
+        margin-left: 0px;
+}
+
+div.toc li.level2 {
+        margin-left: 15px;
+}
+
+div.toc li.level3 {
+        margin-left: 30px;
+}
+
+div.toc li.level4 {
+        margin-left: 45px;
+}
+
+.inherit_header {
+        font-weight: bold;
+        color: gray;
+        cursor: pointer;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+
+.inherit_header td {
+        padding: 6px 0px 2px 5px;
+}
+
+.inherit {
+        display: none;
+}
+
+tr.heading h2 {
+        margin-top: 12px;
+        margin-bottom: 4px;
+}
+
 @media print
 {
   #top { display: none; }
   #side-nav { display: none; }
   #nav-path { display: none; }
   body { overflow:visible; }
   h1, h2, h3, h4, h5, h6 { page-break-after: avoid; }
   .summary { display: none; }
   .memitem { page-break-inside: avoid; }
   #doc-content
   {
     margin-left:0 !important;
     height:auto !important;
     width:auto !important;
     overflow:inherit;
     display:inline;
   }
-  pre.fragment
-  {
-    overflow: visible;
-    text-wrap: unrestricted;
-    white-space: -moz-pre-wrap; /* Moz */
-    white-space: -pre-wrap; /* Opera 4-6 */
-    white-space: -o-pre-wrap; /* Opera 7 */
-    white-space: pre-wrap; /* CSS3  */
-    word-wrap: break-word; /* IE 5.5+ */
-  }
 }
 
-
 /* CSS for the generated extension point documentation, copied from schema.css */
 
 H6.SchemaHeader {
-	font-size:16px; 
-	display:inline
+  font-size:16px; 
+  display:inline
 }
 
 P.SchemaCopyright {
-	font-size: smaller; 
-	font-style: normal;
-	color: #336699; 
-	display:inline;
-	margin-top: 3.000000pt;
-	margin-bottom: 11.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 0.000000pt;
+  font-size: smaller; 
+  font-style: normal;
+  color: #336699; 
+  display:inline;
+  margin-top: 3.000000pt;
+  margin-bottom: 11.000000pt;
+  margin-right: 0.000000pt;
+  margin-left: 0.000000pt;
 }
 
 P.SchemaDtd {
-	color: #800000; 
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 10.000000pt;
+  color: #800000; 
+  margin-top: 0.000000pt;
+  margin-bottom: 0.000000pt;
+  margin-right: 0.000000pt;
+  margin-left: 10.000000pt;
 }
 
 P.SchemaDtdAttlist {
-	color: #800000; 
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 20.000000pt;
+  color: #800000; 
+  margin-top: 0.000000pt;
+  margin-bottom: 0.000000pt;
+  margin-right: 0.000000pt;
+  margin-left: 20.000000pt;
 }
 
 span.SchemaTag {
-	color: #000080;
+  color: #000080;
 }
 
 span.SchemaCstring {
-	color: #008000;
+  color: #008000;
 }
 
 pre.Example {
-	margin-top: 0.000000pt;
+  margin-top: 0.000000pt;
 }
 
 .ConfigMarkupElementDesc {
-	color: black;
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 10.000000pt;
+  color: black;
+  margin-top: 0.000000pt;
+  margin-bottom: 0.000000pt;
+  margin-right: 0.000000pt;
+  margin-left: 10.000000pt;
 }
 
 .ConfigMarkupAttlistDesc {
-	color: black;
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 32.000000pt;
+  color: black;
+  margin-top: 0.000000pt;
+  margin-bottom: 0.000000pt;
+  margin-right: 0.000000pt;
+  margin-left: 32.000000pt;
 }
 
-