diff --git a/.travis.yml b/.travis.yml
index 0abc843a9e326743e97213fe1385afbf7f6ebc7b..b52e9f339b25d204011ecbc4f0eef4b2c5890016 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ before_install:
   - wget http://www.cmake.org/files/v3.7/cmake-3.7.2-Linux-x86_64.tar.gz
 install: 
   - tar -xf cmake-3.7.2-Linux-x86_64.tar.gz
-  - export PATH="${PWD}/cmake-3.7.1-Linux-x86_64/bin:${PATH}"
+  - export PATH="${PWD}/cmake-3.7.2-Linux-x86_64/bin:${PATH}"
   - pip install --user flake8
   - git config --global clangformat.binary clang-format-3.8
 env:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf002ed499ffa3ed137f2b6c213e7914826d71c8..874ef37fbc5ff05792703b722f2e87bd76922c3a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@
 # accompanying file Copyright.txt for details.
 #------------------------------------------------------------------------------#
 
-cmake_minimum_required(VERSION 3.7)
+cmake_minimum_required(VERSION 3.5)
 
 # Fail immediately if not using an out-of-source build
 if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
@@ -46,14 +46,16 @@ include(CMakeDependentOption)
 
 # Setup shared library / -fPIC stuff
 get_property(SHARED_LIBS_SUPPORTED GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS)
-cmake_dependent_option(BUILD_SHARED_LIBS
+cmake_dependent_option(ADIOS_BUILD_SHARED_LIBS
   "Whether or not to build shared libraries" ON
   "SHARED_LIBS_SUPPORTED" OFF)
 if(SHARED_LIBS_SUPPORTED)
   cmake_dependent_option(ADIOS_ENABLE_PIC
     "Build with Position Independent Code" ON
-    "NOT BUILD_SHARED_LIBS" ON)
+    "NOT ADIOS_BUILD_SHARED_LIBS" ON)
 endif()
+set(BUILD_SHARED_LIBS ${ADIOS_BUILD_SHARED_LIBS})
+
 if(ADIOS_ENABLE_PIC)
   set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 endif()
@@ -66,6 +68,8 @@ option(ADIOS_USE_DataMan "Enable support for the DataMan engine" OFF)
 #------------------------------------------------------------------------------#
 # Third party libraries
 #------------------------------------------------------------------------------#
+option(ADIOS_BUILD_TESTING "Build ADIOS tests" OFF)
+set(BUILD_TESTING ${ADIOS_BUILD_TESTING} CACHE INTERNAL "")
 include(CTest)
 add_subdirectory(thirdparty)
 
@@ -97,3 +101,25 @@ if(BUILD_TESTING)
   enable_testing()
   add_subdirectory(testing)
 endif()
+
+#------------------------------------------------------------------------------#
+# Configuration summary
+#------------------------------------------------------------------------------#
+message("")
+message("ADIOS2 build configuration:")
+message("  C++ Compiler: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION} ${CMAKE_CXX_COMPILER_WRAPPER}")
+message("  ${CMAKE_CXX_COMPILER}")
+message("")
+message("  Installation prefix: ${CMAKE_INSTALL_PREFIX}")
+message("  Features:")
+if(BUILD_SHARED_LIBS)
+  message("    Type:    shared")
+else()
+  message("    Type:    static")
+endif()
+message("    Testing: ${BUILD_TESTING}")
+message("    MPI:     ${ADIOS_USE_MPI}")
+message("    BZip2:   ${ADIOS_USE_BZip2}")
+message("    ADIOS1:  ${ADIOS_USE_ADIOS1}")
+message("    DataMan: ${ADIOS_USE_DataMan}")
+message("")
diff --git a/CTestConfig.cmake b/CTestConfig.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..3fe660cf5a26bae6c253911bd5baa07e501b5099
--- /dev/null
+++ b/CTestConfig.cmake
@@ -0,0 +1,12 @@
+#------------------------------------------------------------------------------#
+# Distributed under the OSI-approved Apache License, Version 2.0.  See
+# accompanying file Copyright.txt for details.
+#------------------------------------------------------------------------------#
+
+set(CTEST_PROJECT_NAME "ADIOS")
+set(CTEST_NIGHTLY_START_TIME "01:00:00 UTC")
+
+set(CTEST_DROP_METHOD "http")
+set(CTEST_DROP_SITE "open.cdash.org")
+set(CTEST_DROP_LOCATION "/submit.php?project=ADIOS")
+set(CTEST_DROP_SITE_CDASH TRUE)
diff --git a/bindings/python/include/ADIOSPy.h b/bindings/python/include/ADIOSPy.h
index 50b21a849ad5d4515aa556e2de9f61f114cd4b82..925e7f24455ae4ef605447ed5d551c1778f7c104 100644
--- a/bindings/python/include/ADIOSPy.h
+++ b/bindings/python/include/ADIOSPy.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * ADIOSPy.h
  *
  *  Created on: Mar 13, 2017
diff --git a/bindings/python/include/EnginePy.h b/bindings/python/include/EnginePy.h
index 0f7e3e87bb3eb372f5a89223ecaac2756fdcbb08..8e4be5c15e44f4f4a2a100eb2f72042cb7b02dc4 100644
--- a/bindings/python/include/EnginePy.h
+++ b/bindings/python/include/EnginePy.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * EnginePy.h
  *
  *  Created on: Mar 15, 2017
diff --git a/bindings/python/include/MethodPy.h b/bindings/python/include/MethodPy.h
index 05ad461ecca59b1a1280fc208185a9407588ccf1..3ab8b003196b9443e0338ede51a25b34d4ddb3ed 100644
--- a/bindings/python/include/MethodPy.h
+++ b/bindings/python/include/MethodPy.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * MethodPy.h
  *
  *  Created on: Mar 14, 2017
diff --git a/bindings/python/include/VariablePy.h b/bindings/python/include/VariablePy.h
index 5abc36d39af424741157f0a78ad025fb998140d1..8d843bae20b5a0a2a4c36f230ebe38a809a8659b 100644
--- a/bindings/python/include/VariablePy.h
+++ b/bindings/python/include/VariablePy.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * VariablePy.h
  *
  *  Created on: Mar 13, 2017
diff --git a/bindings/python/include/adiosPyFunctions.h b/bindings/python/include/adiosPyFunctions.h
index 7ae5b1a5fde58a2e5b0e2f52e9c09f30ae55b27a..e64a798b4a6513679b195437c053dc6cf4da3689 100644
--- a/bindings/python/include/adiosPyFunctions.h
+++ b/bindings/python/include/adiosPyFunctions.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * adiosPyFunctions.h
  *
  *  Created on: Mar 13, 2017
diff --git a/bindings/python/src/ADIOSPy.cpp b/bindings/python/src/ADIOSPy.cpp
index 5ca37239bc93428b80f3101d5f1e30b354875336..8e2fe88080b3f5da4dbd110dfd3e60c2ab1e6261 100644
--- a/bindings/python/src/ADIOSPy.cpp
+++ b/bindings/python/src/ADIOSPy.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * ADIOSPy.cpp
  *
  *  Created on: Mar 13, 2017
diff --git a/bindings/python/src/EnginePy.cpp b/bindings/python/src/EnginePy.cpp
index eea898233b4848d8a8ede7fd2eff6dd70493575d..581d0580d98c74700c908a30491d5f41b3272287 100644
--- a/bindings/python/src/EnginePy.cpp
+++ b/bindings/python/src/EnginePy.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * EnginePy.cpp
  *
  *  Created on: Mar 15, 2017
diff --git a/bindings/python/src/MethodPy.cpp b/bindings/python/src/MethodPy.cpp
index d362c04b8715eb585467af360103c3b8d6d9c5e9..e1e57f3c102e0a8c62512d94fa4df07c8071fbd1 100644
--- a/bindings/python/src/MethodPy.cpp
+++ b/bindings/python/src/MethodPy.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * MethodPy.cpp
  *
  *  Created on: Mar 14, 2017
diff --git a/bindings/python/src/VariablePy.cpp b/bindings/python/src/VariablePy.cpp
index e6c236832693794a2adb6121d6c67d8a012a9bce..cc93adcb3fc2c40052bff6a8e8bc91e32b1efca2 100644
--- a/bindings/python/src/VariablePy.cpp
+++ b/bindings/python/src/VariablePy.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * VariablePy.cpp
  *
  *  Created on: Mar 17, 2017
diff --git a/bindings/python/src/adiosPyFunctions.cpp b/bindings/python/src/adiosPyFunctions.cpp
index b986b7e4db6e844f53b1f00f4730d79e7be0f624..778134179a353f2ba64b2552c24866c8fd199170 100644
--- a/bindings/python/src/adiosPyFunctions.cpp
+++ b/bindings/python/src/adiosPyFunctions.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * adiosPyFunctions.cpp
  *
  *  Created on: Mar 13, 2017
diff --git a/bindings/python/src/glueBoostPython.cpp b/bindings/python/src/glueBoostPython.cpp
index 11c8824d4f08ad9a07c9cba43a577d9419cc0727..532cec900ed71e7c16266e4974f5e36cf65c81c1 100644
--- a/bindings/python/src/glueBoostPython.cpp
+++ b/bindings/python/src/glueBoostPython.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * glue.cpp
  *
  *  Created on: Mar 13, 2017
diff --git a/bindings/python/src/gluePyBind11.cpp b/bindings/python/src/gluePyBind11.cpp
index 40ef1127df30f3dff4b746e8b2df7eccca6b500d..cd3cc32f700a07d853eb479e53c21d4b10a4228c 100644
--- a/bindings/python/src/gluePyBind11.cpp
+++ b/bindings/python/src/gluePyBind11.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * gluePyBind11.cpp
  *
  *  Created on: Mar 16, 2017
diff --git a/bindings/python/test_hello.py b/bindings/python/test_hello.py
index c12bb2e4c4eb5947704917277961efb071367d89..b66f26289eca4cccf11abde4f68a1f99de2156b7 100644
--- a/bindings/python/test_hello.py
+++ b/bindings/python/test_hello.py
@@ -1,3 +1,7 @@
+#
+# Distributed under the OSI-approved Apache License, Version 2.0.  See
+# accompanying file Copyright.txt for details.
+#
 # test_hello.py
 #  Created on: Feb 2, 2017
 #      Author: wfg
diff --git a/cmake/FindDataMan.cmake b/cmake/FindDataMan.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..fd9ce61b5f48f8db808983bb637cf1aa04e4a153
--- /dev/null
+++ b/cmake/FindDataMan.cmake
@@ -0,0 +1,71 @@
+#------------------------------------------------------------------------------#
+# Distributed under the OSI-approved Apache License, Version 2.0.  See
+# accompanying file Copyright.txt for details.
+#------------------------------------------------------------------------------#
+#
+# FindDataMan
+# ---------
+#
+# Try to find the DataMan library from Jason Wang, ORNL
+# https://github.com/JasonRuonanWang/DataMan
+#
+# This module defines the following variables:
+#
+#   DataMan_FOUND        - System has DataMan
+#   DataMan_INCLUDE_DIRS - The DataMan include directory
+#   DataMan_LIBRARIES    - Link these to use DataMan
+#
+# and the following imported targets:
+#   DataMan::DataMan - The core DataMan library
+#
+# You can also set the following variable to help guide the search:
+#   DataMan_ROOT_DIR - The install prefix for DataMan containing the
+#                      include and lib folders
+#                      Note: this can be set as a CMake variable or an
+#                            environment variable.  If specified as a CMake
+#                            variable, it will override any setting specified
+#                            as an environment variable.
+
+if(NOT DataMan_FOUND)
+  if((NOT DataMan_ROOT_DIR) AND (NOT (ENV{DataMan_ROOT_DIR} STREQUAL "")))
+    set(DataMan_ROOT_DIR "$ENV{DataMan_ROOT_DIR}")
+  endif()
+
+  # Search for the core libraries
+  if(DataMan_ROOT_DIR)
+    # If a root directory is specified, then don't look anywhere else 
+    find_path(DataMan_INCLUDE_DIR DataMan.h
+      HINTS ${DataMan_ROOT_DIR}/include
+      NO_DEFAULT_PATHS
+    )
+    set(_DataMan_LIBRARY_HINT HINTS ${DataMan_ROOT_DIR}/lib NO_DEFAULT_PATHS)
+  else()
+    # Otherwise use the include dir as a basis to search for the lib
+    find_path(DataMan_INCLUDE_DIR DataMan.h)
+    if(DataMan_INCLUDE_DIR)
+      get_filename_component(_DataMan_PREFIX "${DataMan_INCLUDE_DIR}" PATH)
+      set(_DataMan_LIBRARY_HINT HINTS ${_DataMan_PREFIX}/lib)
+      unset(_DataMan_PREFIX)
+    endif()
+  endif()
+  find_library(DataMan_LIBRARY dataman ${_DataMan_LIBRARY_HINT})
+  unset(_DataMan_LIBRARY_HINT)
+
+  find_package_handle_standard_args(DataMan
+    FOUND_VAR DataMan_FOUND
+    REQUIRED_VARS
+      DataMan_INCLUDE_DIR
+      DataMan_LIBRARY
+  )
+  if(DataMan_FOUND)
+    set(DataMan_INCLUDE_DIRS ${DataMan_INCLUDE_DIR})
+    set(DataMan_LIBRARIES ${DataMan_LIBRARY})
+    if(DataMan_FOUND AND NOT TARGET DataMan::DataMan)
+      add_library(DataMan::DataMan UNKNOWN IMPORTED)
+      set_target_properties(DataMan::DataMan PROPERTIES
+        IMPORTED_LOCATION "${DataMan_LIBRARY}"
+        INTERFACE_INCLUDE_DIRECTORIES "${DataMan_INCLUDE_DIR}"
+      )
+    endif()
+  endif()
+endif()
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 33bde8ad15c721c3e779238cf38beb9419ee77b2..ffe6d00e4d8057f0e861d7e2209d16b7f2b26fe6 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1 +1,6 @@
+#------------------------------------------------------------------------------#
+# Distributed under the OSI-approved Apache License, Version 2.0.  See
+# accompanying file Copyright.txt for details.
+#------------------------------------------------------------------------------#
+
 add_subdirectory(hello)
diff --git a/examples/globalArray/globalArrayNoXML.cpp b/examples/globalArray/globalArrayNoXML.cpp
index ad9e4df1817df8b45edd330f827b9af552c58a19..e8f96975ee3f22a19ec21cc8389edc2b967088bc 100644
--- a/examples/globalArray/globalArrayNoXML.cpp
+++ b/examples/globalArray/globalArrayNoXML.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * globalArrayNoXML.cpp
  *
  *  Created on: Oct 31, 2016
diff --git a/examples/globalArray/globalArrayXML.cpp b/examples/globalArray/globalArrayXML.cpp
index ce91c974f95e37fd924eb252081dded8be039cd9..9d3285df6295b0d6b605bcfc0f92b8d49872a779 100644
--- a/examples/globalArray/globalArrayXML.cpp
+++ b/examples/globalArray/globalArrayXML.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * globalArrayXML.cpp
  *
  *  Created on: Oct 31, 2016
diff --git a/examples/globalArray/globalArrayZeroCopy.cpp b/examples/globalArray/globalArrayZeroCopy.cpp
index 116c6bcca5ecbac30b2bea8adc7516be4bdb6bce..8206c131aa9388f39618f064c8b98ecdfacf2c42 100644
--- a/examples/globalArray/globalArrayZeroCopy.cpp
+++ b/examples/globalArray/globalArrayZeroCopy.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * globalArrayZeroCopy.cpp
  *
  *  Created on: Oct 31, 2016
diff --git a/examples/groupless/basic/reader.cpp b/examples/groupless/basic/reader.cpp
index fde99ee8735d7dbf32b3d768792c331266d760e3..ea8832438a92fc97b1ceb5c78efe033079d18b4c 100644
--- a/examples/groupless/basic/reader.cpp
+++ b/examples/groupless/basic/reader.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * reader.cpp
  *
  *  Created on: Feb 13, 2017
diff --git a/examples/groupless/basic/writer.cpp b/examples/groupless/basic/writer.cpp
index 49832c9f45e472a6bbda982bfa37f01dec0de940..33debd164199378814b12c12af7c74462e65d057 100644
--- a/examples/groupless/basic/writer.cpp
+++ b/examples/groupless/basic/writer.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * writer.cpp
  *
  *  Created on: Feb 13, 2017
diff --git a/examples/groupless/compound/reader.cpp b/examples/groupless/compound/reader.cpp
index fae2c75830712d1843d35fefd025d7e84dcf8aa7..6dc89ad4bd512c915409c6f1902c76739234d641 100644
--- a/examples/groupless/compound/reader.cpp
+++ b/examples/groupless/compound/reader.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * reader.cpp
  *
  *  Created on: Feb 21, 2017
diff --git a/examples/groupless/compound/writer.cpp b/examples/groupless/compound/writer.cpp
index 086d8e1a7fa61b9efe0aab071f4068637fcde9c2..a235ebb4205ec148af8653717fc2407d26c8790c 100644
--- a/examples/groupless/compound/writer.cpp
+++ b/examples/groupless/compound/writer.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * writer.cpp
  *
  *  Created on: Feb 13, 2017
diff --git a/examples/groupless/multistep/reader_allsteps.cpp b/examples/groupless/multistep/reader_allsteps.cpp
index 8d4c421994db7ed9db5308aa4d86b961f479aa69..d71703dda7276d3dfc3c8bd19e495fbcb20ce011 100644
--- a/examples/groupless/multistep/reader_allsteps.cpp
+++ b/examples/groupless/multistep/reader_allsteps.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * reader.cpp
  *
  *  Created on: Feb 13, 2017
diff --git a/examples/groupless/multistep/reader_stepping.cpp b/examples/groupless/multistep/reader_stepping.cpp
index f86dc95a7b9aa95f64b63356ab3bf63beaa687c3..df5adb7d542b9c031c6312bd6db4613b0c40467c 100644
--- a/examples/groupless/multistep/reader_stepping.cpp
+++ b/examples/groupless/multistep/reader_stepping.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * reader.cpp
  *
  *  Created on: Feb 13, 2017
diff --git a/examples/groupless/multistep/writer_multistep.cpp b/examples/groupless/multistep/writer_multistep.cpp
index e9b167b4334f6df2c82c4687a6c4aaa0490fe29d..946d20f951356e8121dceef8a27f31b38f5b2d29 100644
--- a/examples/groupless/multistep/writer_multistep.cpp
+++ b/examples/groupless/multistep/writer_multistep.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * writer.cpp
  *
  *  Created on: Feb 13, 2017
diff --git a/examples/heatTransfer/HeatTransfer.cpp b/examples/heatTransfer/HeatTransfer.cpp
index d37f21b31e5543bb58b3f8d82af7f4a9eb1cefe1..5cac74fc91b389d6a6167b95e9fc8a58a0737dd7 100644
--- a/examples/heatTransfer/HeatTransfer.cpp
+++ b/examples/heatTransfer/HeatTransfer.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * heatTransfer.cpp
  *
  * Recreates heat_transfer.f90 (Fortran) in C++
diff --git a/examples/heatTransfer/HeatTransfer.h b/examples/heatTransfer/HeatTransfer.h
index 74ec07d3a3a4bf9dc8c05277c022be5b2eb8a081..12334f0664a36eaf54b86aa1b83e2d607a5cd4d8 100644
--- a/examples/heatTransfer/HeatTransfer.h
+++ b/examples/heatTransfer/HeatTransfer.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * HeatTransfer.h
  *
  *  Created on: Feb 2017
diff --git a/examples/heatTransfer/IO.h b/examples/heatTransfer/IO.h
index 5acec1f6a0a3ea84b9d8aa37811a7d2729daf535..e9c7c6195b24fab12590f009f9c0b024d7009b59 100644
--- a/examples/heatTransfer/IO.h
+++ b/examples/heatTransfer/IO.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * IO.h
  *
  *  Created on: Feb 2017
diff --git a/examples/heatTransfer/IO_adios1.cpp b/examples/heatTransfer/IO_adios1.cpp
index ebf15ea9e27da50ed19a77b2cf5bc1c8a818e0b2..806c654d09ed8e73b6ef0d656953b4fcc5fc48fa 100644
--- a/examples/heatTransfer/IO_adios1.cpp
+++ b/examples/heatTransfer/IO_adios1.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * IO_ADIOS1.cpp
  *
  *  Created on: Feb 2017
diff --git a/examples/heatTransfer/IO_adios2.cpp b/examples/heatTransfer/IO_adios2.cpp
index acb22b01bf50407907e544baf765582a61566d6a..49e9c58602b8dd5bcf05d4c2502746af42b14e54 100644
--- a/examples/heatTransfer/IO_adios2.cpp
+++ b/examples/heatTransfer/IO_adios2.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * IO_ADIOS2.cpp
  *
  *  Created on: Feb 2017
diff --git a/examples/heatTransfer/IO_ascii.cpp b/examples/heatTransfer/IO_ascii.cpp
index 1bf55d5bb869ce214798c1ce03fbf7ec648aee08..ccf158dabdf8b373fb47290165556f6bb40e8254 100644
--- a/examples/heatTransfer/IO_ascii.cpp
+++ b/examples/heatTransfer/IO_ascii.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * IO_ascii.cpp
  *
  *  Created on: Feb 2017
diff --git a/examples/heatTransfer/IO_hdf5_a.cpp b/examples/heatTransfer/IO_hdf5_a.cpp
index 6126ce78a4a3a8dd7e8910ec97362160f44c2a30..881085f0c59a28aa4a8547fb3a67853d99c35f9a 100644
--- a/examples/heatTransfer/IO_hdf5_a.cpp
+++ b/examples/heatTransfer/IO_hdf5_a.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * IO_hdf5_a.cpp
  *
  * Write output with sequential HDF5, one file per process, one separate set per
diff --git a/examples/heatTransfer/Settings.cpp b/examples/heatTransfer/Settings.cpp
index fdf37d5d7b64d44dbe62090ebcd6a13894d105ac..f5e0459ed2f989dcc08cb3a0c466e476369af247 100644
--- a/examples/heatTransfer/Settings.cpp
+++ b/examples/heatTransfer/Settings.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * Settings.cpp
  *
  *  Created on: Feb 2017
diff --git a/examples/heatTransfer/Settings.h b/examples/heatTransfer/Settings.h
index 5a8dabf8865b225bb641fbefe2dd3178e5f886de..85382656abff49205a77422ec5b880588ff74af6 100644
--- a/examples/heatTransfer/Settings.h
+++ b/examples/heatTransfer/Settings.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * Settings.h
  *
  *  Created on: Feb 2017
diff --git a/examples/heatTransfer/main.cpp b/examples/heatTransfer/main.cpp
index 6d787b8f951d8336af16b0fb1f04a8653436bb9a..d15216eb8f775819f037eba802772949dd369bbb 100644
--- a/examples/heatTransfer/main.cpp
+++ b/examples/heatTransfer/main.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * main.cpp
  *
  * Recreates heat_transfer.f90 (Fortran) ADIOS tutorial example in C++
diff --git a/examples/hello/C/helloFStream.c b/examples/hello/C/helloFStream.c
index 7e8a9392e5d4dfc105763ade01dddfc7efd01cb3..58cca1452e86c5dc2ffb22451b47f7bd0122fdd2 100644
--- a/examples/hello/C/helloFStream.c
+++ b/examples/hello/C/helloFStream.c
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * helloFStream.c  Test for C API version of helloFStream
  *  Created on: Nov 2, 2016
  *      Author: wfg
diff --git a/examples/hello/CMakeLists.txt b/examples/hello/CMakeLists.txt
index de6811d5f2eda4d16f17411e02dbb874cc7d0d86..0cf0a5df520d8388fa7c5e19f9ca8c9a94aec614 100644
--- a/examples/hello/CMakeLists.txt
+++ b/examples/hello/CMakeLists.txt
@@ -1,3 +1,8 @@
+#------------------------------------------------------------------------------#
+# Distributed under the OSI-approved Apache License, Version 2.0.  See
+# accompanying file Copyright.txt for details.
+#------------------------------------------------------------------------------#
+
 add_subdirectory(bpWriter)
 add_subdirectory(timeBP)
 
@@ -6,5 +11,6 @@ if(ADIOS_USE_ADIOS1)
 endif()
 
 if(ADIOS_USE_DataMan)
-  add_subdirectory(dataman)
+  add_subdirectory(datamanReader)
+  add_subdirectory(datamanWriter)
 endif()
diff --git a/examples/hello/adios1Writer/helloADIOS1Writer.cpp b/examples/hello/adios1Writer/helloADIOS1Writer.cpp
index 7420df8bddac2d7bd63140a048577a69e83323a8..9543ec43b2530c7f64d1435092dee25e8b6719e0 100644
--- a/examples/hello/adios1Writer/helloADIOS1Writer.cpp
+++ b/examples/hello/adios1Writer/helloADIOS1Writer.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * helloWriter.cpp
  *
  *  Created on: Feb 16, 2017
diff --git a/examples/hello/adios1Writer/helloADIOS1Writer_nompi.cpp b/examples/hello/adios1Writer/helloADIOS1Writer_nompi.cpp
index eff97abab043f1a7daac6272bf5d7e3470332847..eb282251d2de28fbf726628c99dddfcc6bc62eb2 100644
--- a/examples/hello/adios1Writer/helloADIOS1Writer_nompi.cpp
+++ b/examples/hello/adios1Writer/helloADIOS1Writer_nompi.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * helloADIOSNoXML_OOP.cpp
  *
  *  Created on: Jan 9, 2017
diff --git a/examples/hello/bpReader/helloBPReader.cpp b/examples/hello/bpReader/helloBPReader.cpp
index 020883c90a5f0fcd1d94efc569a601a579be3f6b..5558ee04a5ff9e00ccc772986689c0a348a3d295 100644
--- a/examples/hello/bpReader/helloBPReader.cpp
+++ b/examples/hello/bpReader/helloBPReader.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * helloWriter.cpp
  *
  *  Created on: Feb 16, 2017
diff --git a/examples/hello/bpReader/helloBPReader_nompi.cpp b/examples/hello/bpReader/helloBPReader_nompi.cpp
index d214e968beb6be74d427b6d937f89c657c62a6bb..d5a604fbddb59f33f8f8a38ad09a825ec940d737 100644
--- a/examples/hello/bpReader/helloBPReader_nompi.cpp
+++ b/examples/hello/bpReader/helloBPReader_nompi.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * helloADIOSNoXML_OOP.cpp
  *
  *  Created on: Jan 9, 2017
diff --git a/examples/hello/bpWriter/CMakeLists.txt b/examples/hello/bpWriter/CMakeLists.txt
index 801a8a1cad77d7e0205c0a01cb208f8dd2da011d..3518b42787191b823fce4f840f9275693867b8f3 100644
--- a/examples/hello/bpWriter/CMakeLists.txt
+++ b/examples/hello/bpWriter/CMakeLists.txt
@@ -1,5 +1,14 @@
-add_executable(hello_bpWriter helloBPWriter.cpp)
-target_link_libraries(hello_bpWriter adios2)
+#------------------------------------------------------------------------------#
+# Distributed under the OSI-approved Apache License, Version 2.0.  See
+# accompanying file Copyright.txt for details.
+#------------------------------------------------------------------------------#
+
+if(ADIOS_USE_MPI)
+  find_package(MPI COMPONENTS C REQUIRED)
+  add_executable(hello_bpWriter helloBPWriter.cpp)
+  target_include_directories(hello_bpWriter PRIVATE ${MPI_C_INCLUDE_PATH})
+  target_link_libraries(hello_bpWriter adios2 ${MPI_C_LIBRARIES})
+endif()
 
 add_executable(hello_bpWriter_nompi helloBPWriter_nompi.cpp)
 target_link_libraries(hello_bpWriter_nompi adios2)
diff --git a/examples/hello/bpWriter/helloBPWriter.cpp b/examples/hello/bpWriter/helloBPWriter.cpp
index 3f54ee9f6b47da8438ac8cbb43b9d96c5a55453c..1be2cececb66a16a6c09d2b5b050bc019f53fe05 100644
--- a/examples/hello/bpWriter/helloBPWriter.cpp
+++ b/examples/hello/bpWriter/helloBPWriter.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * helloWriter.cpp
  *
  *  Created on: Feb 16, 2017
@@ -8,7 +11,9 @@
 #include <iostream>
 #include <vector>
 
+#define OMPI_SKIP_MPICXX 1 // workaround for OpenMPI forcing C++ bindings
 #include <mpi.h>
+#undef OMPI_SKIP_MPICXX
 
 #include "ADIOS_CPP.h"
 
diff --git a/examples/hello/bpWriter/helloBPWriter_nompi.cpp b/examples/hello/bpWriter/helloBPWriter_nompi.cpp
index eff97abab043f1a7daac6272bf5d7e3470332847..edb09e086fd8a8d9b20c8b3a04ea51070e5135d8 100644
--- a/examples/hello/bpWriter/helloBPWriter_nompi.cpp
+++ b/examples/hello/bpWriter/helloBPWriter_nompi.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * helloADIOSNoXML_OOP.cpp
  *
  *  Created on: Jan 9, 2017
@@ -13,7 +16,7 @@
 int main(int argc, char *argv[])
 {
   const bool adiosDebug = true;
-  adios::ADIOS adios(adiosDebug);
+  adios::ADIOS adios(adios::Verbose::WARN, adiosDebug);
 
   // Application variable
   std::vector<double> myDoubles = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
diff --git a/examples/hello/compound/helloCompound.cpp b/examples/hello/compound/helloCompound.cpp
index 9409faebf82ada0821951d47be7acdea677a0ec2..fac04ed5936bf0d7fe4c7865435df32f2a84c96f 100644
--- a/examples/hello/compound/helloCompound.cpp
+++ b/examples/hello/compound/helloCompound.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * helloCompound.cpp
  *
  *  Created on: Feb 20, 2017
diff --git a/examples/hello/compound/helloCompound_nompi.cpp b/examples/hello/compound/helloCompound_nompi.cpp
index 4f8f18a6b8e736ca92085f9ced06ae71fb5477d5..08b7debffa9c5f46ed2d2e129bde24f0b8e75778 100644
--- a/examples/hello/compound/helloCompound_nompi.cpp
+++ b/examples/hello/compound/helloCompound_nompi.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * helloCompound.cpp
  *
  *  Created on: Feb 20, 2017
diff --git a/examples/hello/datamanReader/CMakeLists.txt b/examples/hello/datamanReader/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f32a2283869203b1157cdb67dc540fe19b7ef90d
--- /dev/null
+++ b/examples/hello/datamanReader/CMakeLists.txt
@@ -0,0 +1,10 @@
+#------------------------------------------------------------------------------#
+# Distributed under the OSI-approved Apache License, Version 2.0.  See
+# accompanying file Copyright.txt for details.
+#------------------------------------------------------------------------------#
+
+add_executable(hello_datamanReader helloDataManReader.cpp)
+target_link_libraries(hello_datamanReader adios2)
+
+add_executable(hello_datamanReader_nompi helloDataManReader_nompi.cpp)
+target_link_libraries(hello_datamanReader_nompi adios2)
diff --git a/examples/hello/datamanReader/helloDataManReader.cpp b/examples/hello/datamanReader/helloDataManReader.cpp
index bed40a1f024aba2012f6822ab75bb9559bd40169..ec1713e73fa3368f0048caeba5abdb59b0efb37d 100644
--- a/examples/hello/datamanReader/helloDataManReader.cpp
+++ b/examples/hello/datamanReader/helloDataManReader.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * helloDataManReader.cpp
  *
  *  Created on: Feb 16, 2017
diff --git a/examples/hello/datamanReader/helloDataManReader_nompi.cpp b/examples/hello/datamanReader/helloDataManReader_nompi.cpp
index 278431bd87ffc7f859246a7eb45da2706899c72a..28973cbc19a94c8dc6b5b9cd111b85a19c0b30fa 100644
--- a/examples/hello/datamanReader/helloDataManReader_nompi.cpp
+++ b/examples/hello/datamanReader/helloDataManReader_nompi.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * helloADIOSNoXML_OOP.cpp
  *
  *  Created on: Jan 9, 2017
diff --git a/examples/hello/datamanWriter/CMakeLists.txt b/examples/hello/datamanWriter/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..dee5f38e1823c4a55f22d53954d09c440e1c6ff4
--- /dev/null
+++ b/examples/hello/datamanWriter/CMakeLists.txt
@@ -0,0 +1,10 @@
+#------------------------------------------------------------------------------#
+# Distributed under the OSI-approved Apache License, Version 2.0.  See
+# accompanying file Copyright.txt for details.
+#------------------------------------------------------------------------------#
+
+add_executable(hello_datamanWriter helloDataManWriter.cpp)
+target_link_libraries(hello_datamanWriter adios2)
+
+add_executable(hello_datamanWriter_nompi helloDataManWriter_nompi.cpp)
+target_link_libraries(hello_datamanWriter_nompi adios2)
diff --git a/examples/hello/datamanWriter/helloDataManWriter.cpp b/examples/hello/datamanWriter/helloDataManWriter.cpp
index 44876132fa7bcbaedd299e5325e1cb29c26c2d74..138abbcec405bed0ac6847667438387bf22b1ca1 100644
--- a/examples/hello/datamanWriter/helloDataManWriter.cpp
+++ b/examples/hello/datamanWriter/helloDataManWriter.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * helloWriter.cpp
  *
  *  Created on: Feb 16, 2017
diff --git a/examples/hello/datamanWriter/helloDataManWriter_nompi.cpp b/examples/hello/datamanWriter/helloDataManWriter_nompi.cpp
index 7010c088a933b282db159aec0b94e8452a6338f3..75114e8721323d17809359be69bbd2bfa32e4e03 100644
--- a/examples/hello/datamanWriter/helloDataManWriter_nompi.cpp
+++ b/examples/hello/datamanWriter/helloDataManWriter_nompi.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * helloADIOSNoXML_OOP.cpp
  *
  *  Created on: Jan 9, 2017
diff --git a/examples/hello/timeBP/CMakeLists.txt b/examples/hello/timeBP/CMakeLists.txt
index db8991a5c479e1233df405a55b2e9c2e2befebe8..a0e38282532c2bf6cd2c2c726a809e2dd2ea2cac 100644
--- a/examples/hello/timeBP/CMakeLists.txt
+++ b/examples/hello/timeBP/CMakeLists.txt
@@ -1,5 +1,16 @@
-add_executable(hello_timeBPWriter timeBPWriter.cpp)
-target_link_libraries(hello_timeBPWriter adios2)
+#------------------------------------------------------------------------------#
+# Distributed under the OSI-approved Apache License, Version 2.0.  See
+# accompanying file Copyright.txt for details.
+#------------------------------------------------------------------------------#
+
+if(ADIOS_USE_MPI)
+  find_package(MPI COMPONENTS C REQUIRED)
+  add_executable(hello_timeBPWriter timeBPWriter.cpp)
+  target_link_libraries(hello_timeBPWriter adios2)
+  target_include_directories(hello_timeBPWriter PRIVATE ${MPI_C_INCLUDE_PATH})
+  target_link_libraries(hello_timeBPWriter adios2 ${MPI_C_LIBRARIES})
+endif()
+
 
 add_executable(hello_timeBPWriter_nompi timeBPWriter_nompi.cpp)
 target_link_libraries(hello_timeBPWriter_nompi adios2)
diff --git a/examples/hello/timeBP/timeBPWriter.cpp b/examples/hello/timeBP/timeBPWriter.cpp
index 90ffa6e47cb5706e21016145ed75eecfcc43f2aa..846151357b20798aa26070aa8e6044267558bb30 100644
--- a/examples/hello/timeBP/timeBPWriter.cpp
+++ b/examples/hello/timeBP/timeBPWriter.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * timeBPWriter.cpp  example for time aggregation
  *
  *  Created on: Feb 16, 2017
@@ -8,7 +11,9 @@
 #include <iostream>
 #include <vector>
 
+#define OMPI_SKIP_MPICXX 1 // workaround for OpenMPI forcing C++ bindings
 #include <mpi.h>
+#undef OMPI_SKIP_MPICXX
 
 #include "ADIOS_CPP.h"
 
diff --git a/examples/hello/timeBP/timeBPWriter_nompi.cpp b/examples/hello/timeBP/timeBPWriter_nompi.cpp
index c887af83c59b4b769e980cc6127d81d8595b3114..dc4135216764e46c753656f5cac4a3f4a1fdc4d9 100644
--- a/examples/hello/timeBP/timeBPWriter_nompi.cpp
+++ b/examples/hello/timeBP/timeBPWriter_nompi.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * timeBPWriter.cpp  example for time aggregation
  *
  *  Created on: Feb 16, 2017
diff --git a/examples/solidfluid/solidfluid_read.cpp b/examples/solidfluid/solidfluid_read.cpp
index 062d165ec790f53685fe679865924eb3cc58ec18..97f7f950563cf91b85747b32b3ba02f69b6ef6a4 100644
--- a/examples/solidfluid/solidfluid_read.cpp
+++ b/examples/solidfluid/solidfluid_read.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * globalArrayXML.cpp
  *
  *  Created on: Oct 31, 2016
diff --git a/examples/solidfluid/solidfluid_write.cpp b/examples/solidfluid/solidfluid_write.cpp
index 3db4b432b9a64d434bd152f8b70ca8d37b59db49..fd17df803d8c77336a471649e31c7543e1bec75f 100644
--- a/examples/solidfluid/solidfluid_write.cpp
+++ b/examples/solidfluid/solidfluid_write.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * solid fluid example
  *
  *  Created on: Oct 31, 2016
diff --git a/examples/solidfluid/solidfluid_write_nompi.cpp b/examples/solidfluid/solidfluid_write_nompi.cpp
index e2df6f25159e4460f6dfc1290198bc3c15e54dd6..c5342e9a755746b62dbad7c9118e68f4154247c5 100644
--- a/examples/solidfluid/solidfluid_write_nompi.cpp
+++ b/examples/solidfluid/solidfluid_write_nompi.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * solid fluid example
  *
  *  Created on: Oct 31, 2016
diff --git a/examples/xmlParser/xmlParser.cpp b/examples/xmlParser/xmlParser.cpp
index fc735442010163725e67e4e86b4d5aa8b15b62c7..358f4467888e4b44e34f3b8290dd1c5fed9f0e4e 100644
--- a/examples/xmlParser/xmlParser.cpp
+++ b/examples/xmlParser/xmlParser.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * xmlParser.cpp
  *
  *  Created on: Nov 2, 2016
diff --git a/include/ADIOS.h b/include/ADIOS.h
index 8129d0a1153d5ba92b48d7b026c5d5b8dd8ca7f7..5d5af9dc0e3541962cad962211f241015dd48512 100644
--- a/include/ADIOS.h
+++ b/include/ADIOS.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * ADIOS.h
  *
  *  Created on: Oct 3, 2016
@@ -18,11 +21,7 @@
 #include <vector>
 /// \endcond
 
-#ifdef ADIOS_NOMPI
-#include "mpidummy.h"
-#else
-#include <mpi.h>
-#endif
+#include "ADIOS_MPI.h"
 
 #include "ADIOSTypes.h"
 #include "core/Method.h"
diff --git a/include/ADIOSTypes.h b/include/ADIOSTypes.h
index d66faf593cd60f911e53ed08f0df4d26d66cdaae..3949bbc36f98f935a5069b38ea95c567a99d00f5 100644
--- a/include/ADIOSTypes.h
+++ b/include/ADIOSTypes.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * ADIOS_Types.h
  *
  *  Created on: Mar 23, 2017
diff --git a/include/ADIOS_C.h b/include/ADIOS_C.h
index 985d6733f85fdf4a822dfbdae96df68e9b850227..53f96070e23a352a20e8d923f819c72b1f5fffb2 100644
--- a/include/ADIOS_C.h
+++ b/include/ADIOS_C.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * ADIOS_C.h  "C" interface to ADIOS C++ class. This header defines the C API
  *
  *  Created on: Oct 31, 2016
@@ -8,11 +11,7 @@
 #ifndef ADIOS_C_H_
 #define ADIOS_C_H_
 
-#ifdef ADIOS_NOMPI
-#define MPI_Comm int
-#else
-#include <mpi.h>
-#endif
+#include "ADIOS_MPI.h"
 
 typedef void ADIOS;
 typedef void Method;
diff --git a/include/ADIOS_CPP.h b/include/ADIOS_CPP.h
index 9078d36116275241ef98fe5f95d8fe3d7e1c810e..5998ff78e1d2c6559608283e8e976e6f62b35533 100644
--- a/include/ADIOS_CPP.h
+++ b/include/ADIOS_CPP.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * ADIOS_CPP.h
  *
  *  Created on: Jan 9, 2017
diff --git a/include/ADIOS_MPI.h b/include/ADIOS_MPI.h
new file mode 100644
index 0000000000000000000000000000000000000000..9948a863609301b0b96ec38357fe0d6894d860fe
--- /dev/null
+++ b/include/ADIOS_MPI.h
@@ -0,0 +1,17 @@
+/*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ */
+
+#ifndef ADIOS_MPI_H_
+#define ADIOS_MPI_H_
+
+#ifdef ADIOS_NOMPI
+#include "mpidummy.h"
+#else
+#define OMPI_SKIP_MPICXX 1 // workaround for OpenMPI forcing C++ bindings
+#include <mpi.h>
+#undef OMPI_SKIP_MPICXX
+#endif
+
+#endif /* ADIOS_MPI_H_ */
diff --git a/include/capsule/heap/STLVector.h b/include/capsule/heap/STLVector.h
index e272ec628894306fbe01c7d4298f2d7d66acd845..bd8104e8b3b0a63e3510d353f62d7dacf7efe103 100644
--- a/include/capsule/heap/STLVector.h
+++ b/include/capsule/heap/STLVector.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * Heap.h
  *
  *  Created on: Dec 19, 2016
diff --git a/include/core/Attribute.h b/include/core/Attribute.h
index b60cde535866af26e5d52752ee4e347440277b63..dae2644b77d155d16c52c64aff5cf90f6c301f7f 100644
--- a/include/core/Attribute.h
+++ b/include/core/Attribute.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * Attribute.h
  *
  *  Created on: Oct 5, 2016
diff --git a/include/core/Capsule.h b/include/core/Capsule.h
index 5c7eedf40aa1e2f87e144212605da3bb04fe311c..a3b63f3f129401fb5ce16673d99c1dd706ec26ff 100644
--- a/include/core/Capsule.h
+++ b/include/core/Capsule.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * Capsule.h
  *
  *  Created on: Dec 7, 2016
diff --git a/include/core/Engine.h b/include/core/Engine.h
index 25fe9ad5702919197f248f8fa44c02c82fe7288e..26a5fa03414bae38191549e5d06fd11714e6c190 100644
--- a/include/core/Engine.h
+++ b/include/core/Engine.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * Engine.h
  *
  *  Created on: Nov 7, 2016
@@ -17,11 +20,7 @@
 #include <vector>
 /// \endcond
 
-#ifdef ADIOS_NOMPI
-#include "mpidummy.h"
-#else
-#include <mpi.h>
-#endif
+#include "ADIOS_MPI.h"
 
 #include "ADIOS.h"
 #include "ADIOSTypes.h"
diff --git a/include/core/Method.h b/include/core/Method.h
index 71e0e783505aa2c1daaa49a4469a72a970af16d6..686391f96e01de5dae3cae4d2e7de29e91ce3802 100644
--- a/include/core/Method.h
+++ b/include/core/Method.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * Method.h
  *
  *  Created on: Dec 16, 2016
diff --git a/include/core/Profiler.h b/include/core/Profiler.h
index 1a1d0fad9ee5876a091c613780dc8fa8f7319cc3..84550456ce83a37d00f1aac4ba58c393a8d14c50 100644
--- a/include/core/Profiler.h
+++ b/include/core/Profiler.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * Profiler.h
  *
  *  Created on: Mar 9, 2017
diff --git a/include/core/Support.h b/include/core/Support.h
index 3adf2ab3e33b8e17a58ac9c6f8974130834d458a..481f8fb4185ec57f73c60369a1fc8a019152d1af 100644
--- a/include/core/Support.h
+++ b/include/core/Support.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * SSupport.h
  *
  *  Created on: Oct 10, 2016
diff --git a/include/core/Transform.h b/include/core/Transform.h
index 5a5482324aa9e6933c66272991a306e7f85b97b8..190541dac62c8c84f93abf05eb20d9a6e65194fd 100644
--- a/include/core/Transform.h
+++ b/include/core/Transform.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * Transform.h
  *
  *  Created on: Oct 17, 2016
diff --git a/include/core/Transport.h b/include/core/Transport.h
index 8b92971bccfe8647ea906cfeba949ecc81d25ad0..8b768825a2a5a28688540a5ed581de4d58b21783 100644
--- a/include/core/Transport.h
+++ b/include/core/Transport.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * Transport.h
  *
  *  Created on: Oct 6, 2016
@@ -13,11 +16,7 @@
 #include <vector>
 /// \endcond
 
-#ifdef ADIOS_NOMPI
-#include "mpidummy.h"
-#else
-#include <mpi.h>
-#endif
+#include "ADIOS_MPI.h"
 
 #include "core/Profiler.h"
 
diff --git a/include/core/Variable.h b/include/core/Variable.h
index b9294bbfc583ef8ae00ffec6f763d5a650212c8d..67930c46795349ff908fdf93446941eee0e77d1a 100644
--- a/include/core/Variable.h
+++ b/include/core/Variable.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * Variable.h
  *
  *  Created on: Oct 6, 2016
diff --git a/include/core/VariableBase.h b/include/core/VariableBase.h
index 87ca02a21b7f8071741e528b0af31f2bbc25e032..25312d6cf829c448a6734637f7e98b488085a153 100644
--- a/include/core/VariableBase.h
+++ b/include/core/VariableBase.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * VariableBase.h
  *
  *  Created on: Feb 20, 2017
diff --git a/include/core/VariableCompound.h b/include/core/VariableCompound.h
index 35194f0f97dd7c3732d4add3a700e13f92fafc50..7200873a41487d26e76cd0432c268a5d3af5cb6a 100644
--- a/include/core/VariableCompound.h
+++ b/include/core/VariableCompound.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * VariableCompound.h
  *
  *  Created on: Feb 20, 2017
diff --git a/include/engine/adios1/ADIOS1Reader.h b/include/engine/adios1/ADIOS1Reader.h
index eade47f8fca46ce656e4e9d681362a44eb59838a..70b89700aadabcbd4f2479d48dee4cacba480efc 100644
--- a/include/engine/adios1/ADIOS1Reader.h
+++ b/include/engine/adios1/ADIOS1Reader.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * ADIOS1Reader.h
  * Class to read files using old adios 1.x library.
  * It requires adios 1.x installed
diff --git a/include/engine/adios1/ADIOS1Writer.h b/include/engine/adios1/ADIOS1Writer.h
index c581db8edb26893c0c4f7545b17487a575cfd36d..054e7063a05b0f3456575c7e7fcd3bcb54a0a0a7 100644
--- a/include/engine/adios1/ADIOS1Writer.h
+++ b/include/engine/adios1/ADIOS1Writer.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * ADIOS1Writer.h
  * Class to write files using old adios 1.x library.
  * It requires adios 1.x installed
diff --git a/include/engine/bp/BPFileReader.h b/include/engine/bp/BPFileReader.h
index 2b2e5c1e0ed82929b3179a885a24fb6ba4aa4d76..3613ef2833a3e50d86fa6653f0e86105ae7de874 100644
--- a/include/engine/bp/BPFileReader.h
+++ b/include/engine/bp/BPFileReader.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * BPReader.h
  *
  *  Created on: Feb 27, 2017
diff --git a/include/engine/bp/BPFileWriter.h b/include/engine/bp/BPFileWriter.h
index dabd62cd06b5a2c22272cd1b48e11faf7dfd3ede..0465333b1e24c984c14dbcf7000f3550d58ac21f 100644
--- a/include/engine/bp/BPFileWriter.h
+++ b/include/engine/bp/BPFileWriter.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * BPWriter.h
  *
  *  Created on: Dec 16, 2016
diff --git a/include/engine/dataman/DataManReader.h b/include/engine/dataman/DataManReader.h
index 455d9e06fc76365f7360ef3182edf21ed4d82b1a..88ba7b65c84664dd906dca772311bd4f93e1fcbb 100644
--- a/include/engine/dataman/DataManReader.h
+++ b/include/engine/dataman/DataManReader.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * DataManReader.h
  *
  *  Created on: Feb 21, 2017
diff --git a/include/engine/dataman/DataManWriter.h b/include/engine/dataman/DataManWriter.h
index f13419db9f8ca948071526750d0560b1525ba3fa..b60399fdcf7bc1f4e767669c862d97e74680d89c 100644
--- a/include/engine/dataman/DataManWriter.h
+++ b/include/engine/dataman/DataManWriter.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * DataMan.h
  *
  *  Created on: Jan 10, 2017
diff --git a/include/format/BP1.h b/include/format/BP1.h
index 2668b52bd269f0d113c95322285c48b26976b171..fd2e16a4a3bb872631d0053baea7cba40ca7c29f 100644
--- a/include/format/BP1.h
+++ b/include/format/BP1.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * BP1.h
  *
  *  Created on: Feb 2, 2017
@@ -16,11 +19,7 @@
 //#include <queue>  //std::priority_queue to be added later
 /// \endcond
 
-#if ADIOS_NOMPI
-#include "mpidummy.h"
-#else
-#include <mpi.h>
-#endif
+#include "ADIOS_MPI.h"
 
 #include "core/Profiler.h"
 #include "core/Transport.h"
diff --git a/include/format/BP1Aggregator.h b/include/format/BP1Aggregator.h
index 736c33ff6af4b2cddfbe6563c65b464ce339bd2a..a8cf13372fd7b105b0d59967498af1589fd55c18 100644
--- a/include/format/BP1Aggregator.h
+++ b/include/format/BP1Aggregator.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * BP1Aggregator.h
  *
  *  Created on: Mar 1, 2017
@@ -8,11 +11,7 @@
 #ifndef BP1AGGREGATOR_H_
 #define BP1AGGREGATOR_H_
 
-#ifdef ADIOS_NOMPI
-#include "mpidummy.h"
-#else
-#include <mpi.h>
-#endif
+#include "ADIOS_MPI.h"
 
 namespace adios
 {
diff --git a/include/format/BP1Writer.h b/include/format/BP1Writer.h
index 298bc0c21df6529de98bd930ec73707f894c6689..1a08598a4b2a4fa55c8b2ce86301eeb20354dc38 100644
--- a/include/format/BP1Writer.h
+++ b/include/format/BP1Writer.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * BP1.h
  *
  *  Created on: Jan 24, 2017
diff --git a/include/functions/adiosFunctions.h b/include/functions/adiosFunctions.h
index 2f1d35e899f52186012d01760262ae2ed9a282a7..ab6edba1df018dfd6a17d5b740a6fabcdf8574b1 100644
--- a/include/functions/adiosFunctions.h
+++ b/include/functions/adiosFunctions.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * adiosFunctions.h Long helper functions used by ADIOS class
  *
  *  Created on: Oct 10, 2016
@@ -16,11 +19,7 @@
 #include <vector>
 /// \endcond
 
-#ifdef ADIOS_NOMPI
-#include "mpidummy.h"
-#else
-#include <mpi.h>
-#endif
+#include "ADIOS_MPI.h"
 
 #include "core/Transform.h"
 
diff --git a/include/functions/adiosTemplates.h b/include/functions/adiosTemplates.h
index 38b5cb911541180e548d11cf474679ad7e0a9ea9..249bebf32393497319372466611b0347b6b40839 100644
--- a/include/functions/adiosTemplates.h
+++ b/include/functions/adiosTemplates.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * adiosTemplates.h
  *
  *  Created on: Jan 26, 2017
diff --git a/include/functions/capsuleTemplates.h b/include/functions/capsuleTemplates.h
index 68ff55049c239db8e0e354b7c1f3ab103fa2f026..2d53eb0484725b71f06f0d6a9e19ffa49589a0fb 100644
--- a/include/functions/capsuleTemplates.h
+++ b/include/functions/capsuleTemplates.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * capsuleTemplates.h
  *
  *  Created on: Nov 18, 2016
diff --git a/include/mpidummy.h b/include/mpidummy.h
index e718b2e28bedb1c6672061761e8fe58f55bf511b..65b380f5cd4a229e87ddffad8bb24c806bf452a6 100644
--- a/include/mpidummy.h
+++ b/include/mpidummy.h
@@ -1,8 +1,6 @@
 /*
- * ADIOS is freely available under the terms of the BSD license described
- * in the COPYING file in the top level directory of this source distribution.
- *
- * Copyright (c) 2008 - 2009.  UT-BATTELLE, LLC. All rights reserved.
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
  */
 
 #ifndef __MPI_DUMMY_H__
diff --git a/include/transform/BZip2.h b/include/transform/BZip2.h
index 30c2b2e36778e6ee2f91ee27d4455ba9d3d692b5..755b6453c2631db0fb5207ce06e3abbd0b3dd477 100644
--- a/include/transform/BZip2.h
+++ b/include/transform/BZip2.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * BZip2.h
  *
  *  Created on: Oct 17, 2016
diff --git a/include/transport/file/FStream.h b/include/transport/file/FStream.h
index 023445c77fdbca0a57aecfd21e5a81ab608f1109..163b96478e23334fcf2fc0ab8afe1b824789d9f2 100644
--- a/include/transport/file/FStream.h
+++ b/include/transport/file/FStream.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * FStream.h
  *
  *  Created on: Oct 18, 2016
diff --git a/include/transport/file/FileDescriptor.h b/include/transport/file/FileDescriptor.h
index 5e344e0d9aaaf5f56f72d363494e540b916eea93..98d17dfb86d77303588b398a4363fe3c68e2d2ab 100644
--- a/include/transport/file/FileDescriptor.h
+++ b/include/transport/file/FileDescriptor.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * FileDescriptor.h uses POSIX as the underlying library
  *
  *  Created on: Oct 6, 2016
diff --git a/include/transport/file/FilePointer.h b/include/transport/file/FilePointer.h
index 5b665dfceacac391a4fe7bd55c712957d811a683..439bffebebf6ce3bcfb520b05bb4603c2759ee6e 100644
--- a/include/transport/file/FilePointer.h
+++ b/include/transport/file/FilePointer.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * FilePointer.h
  *
  *  Created on: Jan 6, 2017
diff --git a/include/transport/file/MPI_File.h b/include/transport/file/MPI_File.h
index d2201b7874023c5726a1d77bbf385aa35cd1a015..5966cc531da35b6e991cd6fe47189a569fb6e5ec 100644
--- a/include/transport/file/MPI_File.h
+++ b/include/transport/file/MPI_File.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * MPIFile.h
  *
  *  Created on: Jan 5, 2017
diff --git a/include/transport/wan/MdtmMan.h b/include/transport/wan/MdtmMan.h
index c9eb8243f9808cda6b127de21c8e4fb6636a1107..84a71156e560909da7b31b7c087337de2bdf1bce 100644
--- a/include/transport/wan/MdtmMan.h
+++ b/include/transport/wan/MdtmMan.h
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * MdtmMan.h
  *
  *  Created on: Jan 18, 2017
diff --git a/scripts/travis/run-format.sh b/scripts/travis/run-format.sh
index 29e55e0a271136e30c16e118e4d2f2077b527676..79f393f7a0185e333e39d6ab69d0dd74933e3e1f 100755
--- a/scripts/travis/run-format.sh
+++ b/scripts/travis/run-format.sh
@@ -16,7 +16,7 @@ cd ${SOURCE_DIR}
 # Check C and C++ code with clang-format
 echo "Checking formatting for commit range: ${COMMIT_RANGE}"
 DIFF="$(./scripts/developer/git/git-clang-format --diff ${COMMIT_RANGE})"
-if [ -n "${DIFF}" ]
+if [ -n "${DIFF}" ] && [ "${DIFF}" != "no modified files to format" ]
 then
   echo "clang-format:"
   echo "  Code format checks failed."
diff --git a/source/ADIOS.cpp b/source/ADIOS.cpp
index be16443963bb52f42d1589b77f9fa439e8b827ff..fab4a377432786fe0ab3536626868d9e53371bb6 100644
--- a/source/ADIOS.cpp
+++ b/source/ADIOS.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * ADIOS.cpp
  *
  *  Created on: Sep 29, 2016
diff --git a/source/ADIOS_C.cpp b/source/ADIOS_C.cpp
index 36f9e4b29a5fca35c3dcd6cd6737c0cc44a31059..d6f30da48a55cf7fae051d584852fb289c0abbd2 100644
--- a/source/ADIOS_C.cpp
+++ b/source/ADIOS_C.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * ADIOS_C.cpp
  *
  *  Created on: Oct 31, 2016
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index f57dc0afbb739e9e2d2dff5db4cb05dc1efadb11..a8f3685abaaf8561f02068615bd25016616bbdc5 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -1,6 +1,34 @@
+#------------------------------------------------------------------------------#
+# Distributed under the OSI-approved Apache License, Version 2.0.  See
+# accompanying file Copyright.txt for details.
+#------------------------------------------------------------------------------#
+
 add_library(adios2
   ADIOS.cpp
   #ADIOS_C.cpp
+
+  capsule/heap/STLVector.cpp
+  capsule/shmem/ShmSystemV.cpp
+
+  core/Capsule.cpp
+  core/Engine.cpp
+  core/Method.cpp
+  core/Support.cpp
+  core/Transform.cpp
+  core/Transport.cpp
+
+  engine/bp/BPFileReader.cpp
+  engine/bp/BPFileWriter.cpp
+
+  format/BP1.cpp
+  format/BP1Aggregator.cpp
+  format/BP1Writer.cpp
+
+  functions/adiosFunctions.cpp
+
+  transport/file/FStream.cpp
+  transport/file/FileDescriptor.cpp
+  transport/file/FilePointer.cpp
 )
 target_include_directories(adios2 PUBLIC ${ADIOS_SOURCE_DIR}/include)
 
@@ -9,14 +37,31 @@ if(ADIOS_USE_MPI)
   target_include_directories(adios2 PUBLIC ${MPI_C_INCLUDE_PATH})
   target_link_libraries(adios2 PUBLIC ${MPI_C_LIBRARIES})
 else()
-  target_sources(adios2 mpidummy.cpp)
+  target_sources(adios2 PRIVATE mpidummy.cpp)
   target_compile_definitions(adios2 PUBLIC ADIOS_NOMPI)
 endif()
 
-add_subdirectory(capsule)
-add_subdirectory(core)
-add_subdirectory(engine)
-add_subdirectory(format)
-add_subdirectory(functions)
-add_subdirectory(transport)
-add_subdirectory(transform)
+if(ADIOS_USE_ADIOS1)
+  find_package(ADIOS REQUIRED)
+  target_sources(adios2 PRIVATE
+    engine/adios1/ADIOS1Reader.cpp
+    engine/adios1/ADIOS1Writer.cpp
+  )
+  target_link_libraries(adios2 PRIVATE adios::adios)
+endif()
+
+if(ADIOS_USE_DataMan)
+  find_package(DataMan REQUIRED)
+  target_sources(adios2 PRIVATE
+    engine/dataman/DataManReader.cpp
+    engine/dataman/DataManWriter.cpp
+    transport/wan/MdtmMan.cpp
+  )
+  target_link_libraries(adios2 PRIVATE DataMan::DataMan)
+endif()
+
+if(ADIOS_USE_BZip2)
+  find_package(BZip2 REQUIRED)
+  target_sources(adios2 PRIVATE transform/BZip2.cpp)
+  target_link_libraries(adios2 PRIVATE BZip2::BZip2)
+endif()
diff --git a/source/capsule/CMakeLists.txt b/source/capsule/CMakeLists.txt
deleted file mode 100644
index 8e8bff322a278d59b626a3470dfd1bbda2970645..0000000000000000000000000000000000000000
--- a/source/capsule/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-target_sources(adios2 PRIVATE
-  capsule/heap/STLVector.cpp
-  capsule/shmem/ShmSystemV.cpp
-)
diff --git a/source/capsule/heap/STLVector.cpp b/source/capsule/heap/STLVector.cpp
index b8735c04d8bc272e0e7a5e637a7146d16fa4618c..b6f12dbdc82983dc231b303322cd5d0092947c24 100644
--- a/source/capsule/heap/STLVector.cpp
+++ b/source/capsule/heap/STLVector.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * Heap.cpp
  *
  *  Created on: Dec 22, 2016
diff --git a/source/capsule/shmem/ShmSystemV.cpp b/source/capsule/shmem/ShmSystemV.cpp
index 1b414a3276e99be148208d99a86eac92a1bf794f..ed2e4af57a9d842d5a813fd09675ee2c3b66595c 100644
--- a/source/capsule/shmem/ShmSystemV.cpp
+++ b/source/capsule/shmem/ShmSystemV.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * ShmSystemV.cpp
  *
  *  Created on: Dec 22, 2016
diff --git a/source/core/CMakeLists.txt b/source/core/CMakeLists.txt
deleted file mode 100644
index 8770dd9071342c4dc88cb45912d71c95fad20999..0000000000000000000000000000000000000000
--- a/source/core/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-target_sources(adios2 PRIVATE
-  core/Capsule.cpp
-  core/Engine.cpp
-  core/Method.cpp
-  core/Support.cpp
-  core/Transform.cpp
-  core/Transport.cpp
-)
diff --git a/source/core/Capsule.cpp b/source/core/Capsule.cpp
index 9325119dfccf5df9aa4c383554e67eaec7244683..f80b2025e9c01d2f7657acf10238175a2dfa2d55 100644
--- a/source/core/Capsule.cpp
+++ b/source/core/Capsule.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * Capsule.cpp
  *
  *  Created on: Nov 11, 2016
diff --git a/source/core/Engine.cpp b/source/core/Engine.cpp
index 8e4de6658b059411048ad9f9a6490d14564700f1..515d4781cc3cc5c6c9d69a6eb787f42a12e940f5 100644
--- a/source/core/Engine.cpp
+++ b/source/core/Engine.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * Engine.cpp
  *
  *  Created on: Dec 19, 2016
@@ -17,7 +20,7 @@ Engine::Engine(ADIOS &adios, const std::string engineType,
                MPI_Comm mpiComm, const Method &method, const bool debugMode,
                const unsigned int nthreads, const std::string endMessage)
     : m_MPIComm{mpiComm}, m_EngineType{engineType}, m_Name{name},
-      m_AccessMode{accessMode}, m_Method{method}, m_ADIOS{adios},
+      m_AccessMode{accessMode}, m_Method{method}, m_ADIOS(adios),
       m_DebugMode{debugMode}, m_nThreads{nthreads}, m_EndMessage(endMessage)
 {
   if (m_DebugMode == true)
diff --git a/source/core/Method.cpp b/source/core/Method.cpp
index 0d88459d6d44d05590c8bdf6b09d2cb71d372b92..f3738786aa2eaa1c8ed56f6b92494e3fb67f4359 100644
--- a/source/core/Method.cpp
+++ b/source/core/Method.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * Method.cpp
  *
  *  Created on: Jan 6, 2017
diff --git a/source/core/Support.cpp b/source/core/Support.cpp
index 1a8bdf254d6679d6c5ee1326a9d544f6dcf41173..02be66d86108af579eeafd5805adad1e5a1537b4 100644
--- a/source/core/Support.cpp
+++ b/source/core/Support.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * Support.cpp
  *
  *  Created on: Oct 18, 2016
diff --git a/source/core/Transform.cpp b/source/core/Transform.cpp
index 288715626962ca2ae5fc2bc489f0f93cc7225457..0b719ccc86bcdf858a93c1417f662982817e45c3 100644
--- a/source/core/Transform.cpp
+++ b/source/core/Transform.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * Transform.cpp
  *
  *  Created on: Dec 5, 2016
diff --git a/source/core/Transport.cpp b/source/core/Transport.cpp
index 1de1339a0623e08314b11f179fe45dcd1b18710c..9b1f7f5ee20ef5d5b91204db0daa4c3dd56c01ed 100644
--- a/source/core/Transport.cpp
+++ b/source/core/Transport.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * Transport.cpp
  *
  *  Created on: Dec 5, 2016
diff --git a/source/engine/CMakeLists.txt b/source/engine/CMakeLists.txt
deleted file mode 100644
index 5422483ca6584888882744858713c4542f0d43e7..0000000000000000000000000000000000000000
--- a/source/engine/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-target_sources(adios2 PRIVATE
-  engine/bp/BPFileReader.cpp
-  engine/bp/BPFileWriter.cpp
-)
-
-if(ADIOS_USE_ADIOS1)
-  find_package(ADIOS REQUIRED)
-  target_sources(adios2 PRIVATE
-    adios1/ADIOS1Reader.cpp
-    adios1/ADIOS1Writer.cpp
-  )
-  target_link_libraries(adios2 adios::adios)
-endif()
-
-if(ADIOS_USE_DataMan)
-  find_pacakge(DataMan REQUIRED)
-  target_sources(adios2 PRIVATE
-    dataman/DataManReader.cpp
-    dataman/DataManWriter.cpp
-  )
-  target_link_libraries(adios2 PRIVATE DataMan::DataMan)
-endif()
diff --git a/source/engine/adios1/ADIOS1Reader.cpp b/source/engine/adios1/ADIOS1Reader.cpp
index 5f2ea142060377f8d9591ca0039d3aa9419dd528..a44996c149f2644d5e69215904ca908133410cf6 100644
--- a/source/engine/adios1/ADIOS1Reader.cpp
+++ b/source/engine/adios1/ADIOS1Reader.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * BPFileReader.cpp
  *
  *  Created on: Feb 27, 2017
diff --git a/source/engine/adios1/ADIOS1Writer.cpp b/source/engine/adios1/ADIOS1Writer.cpp
index 304dd31fce59e073f0fbbefdb6bd4547068a831a..d8c95ffe86f20f52031e3dc2c1bdac2b19e933e8 100644
--- a/source/engine/adios1/ADIOS1Writer.cpp
+++ b/source/engine/adios1/ADIOS1Writer.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * ADIOS1Writer.cpp
  * Class to write files using old adios 1.x library.
  * It requires adios 1.x installed
diff --git a/source/engine/bp/BPFileReader.cpp b/source/engine/bp/BPFileReader.cpp
index 5f2ea142060377f8d9591ca0039d3aa9419dd528..a44996c149f2644d5e69215904ca908133410cf6 100644
--- a/source/engine/bp/BPFileReader.cpp
+++ b/source/engine/bp/BPFileReader.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * BPFileReader.cpp
  *
  *  Created on: Feb 27, 2017
diff --git a/source/engine/bp/BPFileWriter.cpp b/source/engine/bp/BPFileWriter.cpp
index f272a586a0d0cade07e199dfefe1651fdb7b7614..e68fae284241c517e90608222512fe49d1e92ece 100644
--- a/source/engine/bp/BPFileWriter.cpp
+++ b/source/engine/bp/BPFileWriter.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * BPFileWriter.cpp
  *
  *  Created on: Dec 19, 2016
diff --git a/source/engine/dataman/DataManReader.cpp b/source/engine/dataman/DataManReader.cpp
index 103178eff756b257858e7a9e24459b7338be06f1..2e65596e7ca9fa847b3b53d35f7e628ae39b7c3a 100644
--- a/source/engine/dataman/DataManReader.cpp
+++ b/source/engine/dataman/DataManReader.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * DataManReader.cpp
  *
  *  Created on: Feb 21, 2017
diff --git a/source/engine/dataman/DataManWriter.cpp b/source/engine/dataman/DataManWriter.cpp
index 8cd653c96e3397a6aa737a9b7b98e2d7fd1bedb7..8430a5921410eec2454d76053dfa749f4cb7436c 100644
--- a/source/engine/dataman/DataManWriter.cpp
+++ b/source/engine/dataman/DataManWriter.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * DataMan.cpp
  *
  *  Created on: Jan 10, 2017
diff --git a/source/format/BP1.cpp b/source/format/BP1.cpp
index 8272e1d765736fd3660f1a72048edfc172a38712..c81e7b6fe34fcbb63f5e7e62472051ea99cbd672 100644
--- a/source/format/BP1.cpp
+++ b/source/format/BP1.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * BP1.cpp
  *
  *  Created on: Feb 7, 2017
diff --git a/source/format/BP1Aggregator.cpp b/source/format/BP1Aggregator.cpp
index c105d5edee46e0057b17bdb6a53cc98d7e68cec2..442c22f6166ab80cf0b3df5c92e746588cf17d6c 100644
--- a/source/format/BP1Aggregator.cpp
+++ b/source/format/BP1Aggregator.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * BP1Aggregator.cpp
  *
  *  Created on: Mar 21, 2017
@@ -7,6 +10,7 @@
 
 /// \cond EXCLUDE_FROM_DOXYGEN
 #include <fstream>
+#include <stdexcept>
 #include <vector>
 /// \endcond
 
diff --git a/source/format/BP1Writer.cpp b/source/format/BP1Writer.cpp
index bba94a9ad887b66baceb560ba3e55e4ca45fd9f5..b5aed5404ca9804d498b9f1220bc997f93643a14 100644
--- a/source/format/BP1Writer.cpp
+++ b/source/format/BP1Writer.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * BP1Writer.cpp
  *
  *  Created on: Feb 1, 2017
diff --git a/source/format/CMakeLists.txt b/source/format/CMakeLists.txt
deleted file mode 100644
index e71f524c9eb69e7f2bc1511c25d2eefb54c12cae..0000000000000000000000000000000000000000
--- a/source/format/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-target_sources(adios2 PRIVATE
-  format/BP1.cpp
-  format/BP1Aggregator.cpp
-  format/BP1Writer.cpp
-)
diff --git a/source/functions/CMakeLists.txt b/source/functions/CMakeLists.txt
deleted file mode 100644
index 2f06e58daf6f0c50fd317fa3dcc7a0d48348867e..0000000000000000000000000000000000000000
--- a/source/functions/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-target_sources(adios2 PRIVATE
-  functions/adiosFunctions.cpp
-)
diff --git a/source/functions/adiosFunctions.cpp b/source/functions/adiosFunctions.cpp
index 22c362467dcb1e8e680cf15e2c511c95f8725e88..0886e029ad14a4e6fc4dd8b04b296071175d3678 100644
--- a/source/functions/adiosFunctions.cpp
+++ b/source/functions/adiosFunctions.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * adiosFunctions.cpp
  *
  *  Created on: Oct 10, 2016
diff --git a/source/mpidummy.cpp b/source/mpidummy.cpp
index cf2539fed53fd42587547384bc857fc5dc74e7f6..e0c932a0599cc8b125204d2e926144518c5dc497 100644
--- a/source/mpidummy.cpp
+++ b/source/mpidummy.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * ADIOS is freely available under the terms of the BSD license described
  * in the COPYING file in the top level directory of this source distribution.
  *
diff --git a/source/transform/BZip2.cpp b/source/transform/BZip2.cpp
index 5eafca87fa1a5a6fe1a0f44b173047d824ea3080..646b8bc6c75ba201e575cf245c54380eff9e712f 100644
--- a/source/transform/BZip2.cpp
+++ b/source/transform/BZip2.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * BZIP2.cpp
  *
  *  Created on: Oct 19, 2016
diff --git a/source/transform/CMakeLists.txt b/source/transform/CMakeLists.txt
deleted file mode 100644
index 762c372fe05ee73584973e359b027eac36844689..0000000000000000000000000000000000000000
--- a/source/transform/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-if(ADIOS_USE_BZIP2)
-  find_package(BZip REQUIRED)
-  target_sources(adios2 BZip2.cpp)
-  target_link_libraries(adios2 PRIVATE BZip2::BZip2)
-endif()
diff --git a/source/transport/CMakeLists.txt b/source/transport/CMakeLists.txt
deleted file mode 100644
index e9b16abd93840d835b422ea72f58db0fd9057080..0000000000000000000000000000000000000000
--- a/source/transport/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-target_sources(adios2 PRIVATE
-  transport/file/FStream.cpp
-  transport/file/FileDescriptor.cpp
-  transport/file/FilePointer.cpp
-)
-
-if(ADIOS_USE_DataMan)
-  find_pacakge(DataMan REQUIRED)
-  target_sources(adios2 PRIVATE
-    wan/MdtmMan.cpp
-  )
-  target_link_libraries(adios2 PRIVATE DataMan::DataMan)
-endif()
diff --git a/source/transport/file/FStream.cpp b/source/transport/file/FStream.cpp
index a01d94220486ed0042184dbca2eea40c523a2fd8..6496f4e05d542a4ce0e57de69b297e56881fb3c0 100644
--- a/source/transport/file/FStream.cpp
+++ b/source/transport/file/FStream.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * CFStream.cpp
  *
  *  Created on: Oct 24, 2016
diff --git a/source/transport/file/FileDescriptor.cpp b/source/transport/file/FileDescriptor.cpp
index 2d7cb72c41f00f3aa25e3b5eafb8d44b64138622..bfa9439d0327b296474b13f9dace9395f87c3030 100644
--- a/source/transport/file/FileDescriptor.cpp
+++ b/source/transport/file/FileDescriptor.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * FileDescriptor.cpp file descriptor
  *
  *  Created on: Oct 6, 2016
diff --git a/source/transport/file/FilePointer.cpp b/source/transport/file/FilePointer.cpp
index a308083813beedf442a049beed6c115d64204e2a..ce9c107235930e1eb177870fb2724f294facd7cc 100644
--- a/source/transport/file/FilePointer.cpp
+++ b/source/transport/file/FilePointer.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * FP.cpp
  *
  *  Created on: Jan 6, 2017
diff --git a/source/transport/wan/MdtmMan.cpp b/source/transport/wan/MdtmMan.cpp
index f269d5f1f197a12ca87b292db2dc35eb45e52cb0..6238bbe3d4162fd5d369e798ece7d50923b37512 100644
--- a/source/transport/wan/MdtmMan.cpp
+++ b/source/transport/wan/MdtmMan.cpp
@@ -1,4 +1,7 @@
 /*
+ * Distributed under the OSI-approved Apache License, Version 2.0.  See
+ * accompanying file Copyright.txt for details.
+ *
  * MdtmMan.cpp
  *
  *  Created on: Jan 22, 2017
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..bfecd4ddcd5bd7a92be2b138c122f0b992fb0737 100644
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -0,0 +1,4 @@
+#------------------------------------------------------------------------------#
+# Distributed under the OSI-approved Apache License, Version 2.0.  See
+# accompanying file Copyright.txt for details.
+#------------------------------------------------------------------------------#
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
index 39215e37afc26c2212293c896536e17b4faa5831..0825c4704eca3867613ee2f58fdd5636d2fdee5b 100644
--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
@@ -1,3 +1,8 @@
+#------------------------------------------------------------------------------#
+# Distributed under the OSI-approved Apache License, Version 2.0.  See
+# accompanying file Copyright.txt for details.
+#------------------------------------------------------------------------------#
+
 set(ADIOS_THIRDPARTY_DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}/downloads
   CACHE PATH "Download directory for third party dependencies")
 
diff --git a/thirdparty/googletest/CMakeLists.txt b/thirdparty/googletest/CMakeLists.txt
index 7d742ab09a149cd747bce92868a399e2c2a54941..5fc4fa9ee1dfe938e27473fbc1ae7ea0b9c90aea 100644
--- a/thirdparty/googletest/CMakeLists.txt
+++ b/thirdparty/googletest/CMakeLists.txt
@@ -1,3 +1,7 @@
+#------------------------------------------------------------------------------#
+# Distributed under the OSI-approved Apache License, Version 2.0.  See
+# accompanying file Copyright.txt for details.
+#------------------------------------------------------------------------------#
 
 ExternalProject_Add(googletest
   URL     https://github.com/google/googletest/archive/release-1.8.0.zip