diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0967fb..8e16b1a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,164 +1,164 @@
 
 ########################################################################
 # Copyright 1998-2020 CERN for the benefit of the EvtGen authors       #
 #                                                                      #
 # This file is part of EvtGen.                                         #
 #                                                                      #
 # EvtGen is free software: you can redistribute it and/or modify       #
 # it under the terms of the GNU General Public License as published by #
 # the Free Software Foundation, either version 3 of the License, or    #
 # (at your option) any later version.                                  #
 #                                                                      #
 # EvtGen is distributed in the hope that it will be useful,            #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of       #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        #
 # GNU General Public License for more details.                         #
 #                                                                      #
 # You should have received a copy of the GNU General Public License    #
 # along with EvtGen.  If not, see <https://www.gnu.org/licenses/>.     #
 ########################################################################
 
 # Top level CMakeLists.txt for EvtGen
 
 # Enforce an out-of-source build.
 # Should be the first action in the top level CMakeLists.txt
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
     message(STATUS "EvtGen requires an out-of-source build.")
     message(STATUS "Please remove the following files from ${CMAKE_BINARY_DIR}:")
     message(STATUS "    CMakeCache.txt")
     message(STATUS "    CMakeFiles")
     message(STATUS "Once these files are removed, create a separate directory")
     message(STATUS "and run CMake from there, pointing it to:")
     message(STATUS "    ${CMAKE_SOURCE_DIR}")
     message(FATAL_ERROR "in-source build detected")
 endif()
 
 # Also require a minimum version of CMake
 cmake_minimum_required(VERSION 3.11.0)
 
 # Project setup
 if(${CMAKE_VERSION} VERSION_LESS 3.12.0)
     project(EvtGen
-        VERSION 2.2.2
+        VERSION 2.2.3
         DESCRIPTION "Monte Carlo generator of particle decays, in particular the weak decays of heavy flavour particles such as B mesons."
         LANGUAGES C CXX
         )
 else()
     project(EvtGen
-        VERSION 2.2.2
+        VERSION 2.2.3
         DESCRIPTION "Monte Carlo generator of particle decays, in particular the weak decays of heavy flavour particles such as B mesons."
         LANGUAGES C CXX
         HOMEPAGE_URL "https://evtgen.hepforge.org"
         )
 endif()
 
 # Prepend this project's custom module path(s) to CMAKE_MODULE_PATH
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules ${CMAKE_MODULE_PATH})
 # Include needed modules to perform any custom setup
 # Install paths
 include(GNUInstallDirs)
 # Compilation/linking flags and related settings
 include(CompilerFlags)
 # EvtGen external dependencies
 option(EVTGEN_HEPMC3 "Enable/disable linking with HepMC3"   ON)
 option(EVTGEN_PYTHIA "Enable/disable linking with Pythia8"  OFF)
 option(EVTGEN_PHOTOS "Enable/disable linking with Photos++" OFF)
 option(EVTGEN_TAUOLA "Enable/disable linking with Tauola++" OFF)
 option(EVTGEN_SUPPRESS_EXTERNAL_WARNINGS "Enable/disable suppression of warnings from external dependencies" OFF)
 if (EVTGEN_HEPMC3)
     message(STATUS "EvtGen: Linking with HepMC3")
 else()
     message(STATUS "EvtGen: Linking with HepMC2")
 endif()
 message(STATUS "EvtGen: Optional linking with HepMC3   EVTGEN_HEPMC3 ${EVTGEN_HEPMC3}")
 message(STATUS "EvtGen: Optional linking with Pythia8  EVTGEN_PYTHIA ${EVTGEN_PYTHIA}")
 message(STATUS "EvtGen: Optional linking with Photos++ EVTGEN_PHOTOS ${EVTGEN_PHOTOS}")
 message(STATUS "EvtGen: Optional linking with Tauola++ EVTGEN_TAUOLA ${EVTGEN_TAUOLA}")
 include(ExternalDependencies)
 
 # Setup clang-tidy checks
 option(EVTGEN_RUN_CLANG_TIDY "Enable/disable running clang-tidy static analysis checks during build" OFF)
 option(EVTGEN_CLANG_TIDY_FIX "Enable/disable automatic fixes in clang-tidy checks"                   OFF)
 set(EVTGEN_CLANG_TIDY_CHECKS "modernize-use-nullptr" CACHE STRING "Specify which clang-tidy checks to run (comma separated)")
 message(STATUS "EvtGen: Optional running of clang-tidy checks     EVTGEN_RUN_CLANG_TIDY    ${EVTGEN_RUN_CLANG_TIDY}")
 message(STATUS "EvtGen: Optional auto-fixes by clang-tidy checks  EVTGEN_CLANG_TIDY_FIX    ${EVTGEN_CLANG_TIDY_FIX}")
 message(STATUS "EvtGen: Optional list of clang-tidy checks to run EVTGEN_CLANG_TIDY_CHECKS ${EVTGEN_CLANG_TIDY_CHECKS}")
 include(EvtGenSetupClangTidyChecks)
 
 # Now build the library
 add_subdirectory(src)
 
 # Copy the particle property and decay tables
 configure_file(DECAY.DEC ${CMAKE_CURRENT_BINARY_DIR}/DECAY.DEC COPYONLY)
 configure_file(DECAY.XML ${CMAKE_CURRENT_BINARY_DIR}/DECAY.XML COPYONLY)
 configure_file(evt.pdl ${CMAKE_CURRENT_BINARY_DIR}/evt.pdl COPYONLY)
 # Copy the older decay tables
 configure_file(DECAY_2009.DEC ${CMAKE_CURRENT_BINARY_DIR}/DECAY_2009.DEC COPYONLY)
 configure_file(DECAY_2009.XML ${CMAKE_CURRENT_BINARY_DIR}/DECAY_2009.XML COPYONLY)
 configure_file(DECAY_2010.DEC ${CMAKE_CURRENT_BINARY_DIR}/DECAY_2010.DEC COPYONLY)
 configure_file(DECAY_2010.XML ${CMAKE_CURRENT_BINARY_DIR}/DECAY_2010.XML COPYONLY)
 
 # Build the executables in the test and validation directories
 option(EVTGEN_BUILD_DOC         "Enable/disable building of userguide documentation in 'doc' directory"   OFF)
 option(EVTGEN_BUILD_DOXYGEN     "Enable/disable building of Doxygen documentation in 'doxygen' directory" OFF)
 option(EVTGEN_BUILD_TESTS       "Enable/disable building of executables in 'test' directory"              OFF)
 option(EVTGEN_BUILD_VALIDATIONS "Enable/disable building of executables in 'validation' directory"        OFF)
 message(STATUS "EvtGen: Building of userguide documentation in 'doc' directory   EVTGEN_BUILD_DOC         ${EVTGEN_BUILD_DOC}")
 message(STATUS "EvtGen: Building of Doxygen documentation in 'doxygen' directory EVTGEN_BUILD_DOXYGEN     ${EVTGEN_BUILD_DOXYGEN}")
 message(STATUS "EvtGen: Building of executables in 'test' directory              EVTGEN_BUILD_TESTS       ${EVTGEN_BUILD_TESTS}")
 message(STATUS "EvtGen: Building of executables in 'validation' directory        EVTGEN_BUILD_VALIDATIONS ${EVTGEN_BUILD_VALIDATIONS}")
 if(EVTGEN_BUILD_DOC)
     add_subdirectory(doc)
 endif()
 if(EVTGEN_BUILD_DOXYGEN)
     add_subdirectory(doxygen)
 endif()
 if(EVTGEN_BUILD_TESTS)
     add_subdirectory(test)
 endif()
 if(EVTGEN_BUILD_VALIDATIONS)
     add_subdirectory(validation)
 endif()
 
 # Install the include directories
 install(DIRECTORY EvtGen         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 install(DIRECTORY EvtGenBase     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 install(DIRECTORY EvtGenExternal DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 install(DIRECTORY EvtGenModels   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
 # Install the particle properties and decay tables
 install(FILES DECAY.DEC DECAY.XML evt.pdl DECAY_2010.XML DECAY_2010.DEC DECAY_2009.XML DECAY_2009.DEC DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME})
 
 # Install the COPYING and AUTHORS files
 install(FILES AUTHORS COPYING DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME})
 
 # Install the README and History files
 install(FILES README.md Pythia8_README.md Tauola_README.md History.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
 
 # Generate CMake config files, which can be used by other projects
 include(CMakePackageConfigHelpers)
 
 set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR})
 set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
 set(DATA_INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME})
 
 configure_package_config_file(cmake/Templates/EvtGenConfig.cmake.in
     ${CMAKE_CURRENT_BINARY_DIR}/EvtGenConfig.cmake
     INSTALL_DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}/cmake
     PATH_VARS INCLUDE_INSTALL_DIR LIB_INSTALL_DIR DATA_INSTALL_DIR
     )
 
 write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/EvtGenConfigVersion.cmake
     COMPATIBILITY AnyNewerVersion
     )
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/EvtGenConfig.cmake
     ${CMAKE_CURRENT_BINARY_DIR}/EvtGenConfigVersion.cmake
     DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}/cmake
     )
 
 install(
     EXPORT "EvtGenTargets"
     NAMESPACE "EvtGen::"
     DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}/cmake
     )
diff --git a/setupEvtGen.sh b/setupEvtGen.sh
index 0704410..e0013c1 100644
--- a/setupEvtGen.sh
+++ b/setupEvtGen.sh
@@ -1,261 +1,261 @@
 #!/bin/bash
 
 ########################################################################
 # Copyright 1998-2020 CERN for the benefit of the EvtGen authors       #
 #                                                                      #
 # This file is part of EvtGen.                                         #
 #                                                                      #
 # EvtGen is free software: you can redistribute it and/or modify       #
 # it under the terms of the GNU General Public License as published by #
 # the Free Software Foundation, either version 3 of the License, or    #
 # (at your option) any later version.                                  #
 #                                                                      #
 # EvtGen is distributed in the hope that it will be useful,            #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of       #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        #
 # GNU General Public License for more details.                         #
 #                                                                      #
 # You should have received a copy of the GNU General Public License    #
 # along with EvtGen.  If not, see <https://www.gnu.org/licenses/>.     #
 ########################################################################
 
 # This script installs EvtGen with all external dependencies.
 # The variable INSTALL_PREFIX specifies the installation location.
 # The variable VERSION specifies the tag of EvtGen you want to use.
 # The list of available tags can be found by either going to the url
 # https://phab.hepforge.org/source/evtgen/tags/master
 # or issuing the command (without the need to clone the git repository)
 # git ls-remote --tags http://phab.hepforge.org/source/evtgen.git | cut -d '/' -f3
 # The recommended versions of the external dependencies are given below.
 # Later versions should be OK as well, assuming their C++ interfaces do not change.
 # HepMC (either HepMC2 or HepMC3, the latter is recommended) is mandatory.
 # Note that some earlier EvtGen versions will not be compatible with all
 # external dependency versions given below, owing to C++ interface differences;
 # see the specific tagged version of the EvtGen/README file for guidance.
 # It is also not possible to compile Tauola++ on macOS at present, unless you
 # are building on a volume with a case sensitive file system, so this is
 # disabled by default.
 # To obtain this script use the "Download File" option on the right of the webpage:
 # https://phab.hepforge.org/source/evtgen/browse/master/setupEvtGen.sh?view=raw
 
 # Location in which to install
 INSTALL_PREFIX="/usr/local"
 
 # EvtGen version or tag number (or branch name). No extra spaces on this line!
-VERSION=R02-02-02
+VERSION=R02-02-03
 
 # HepMC version numbers - change HEPMCMAJORVERSION to 2 in order to use HepMC2
 HEPMCMAJORVERSION="3"
 HEPMC2VER="2.06.10"
 HEPMC3VER="3.2.0"
 HEPMC2PKG="HepMC-"$HEPMC2VER
 HEPMC3PKG="HepMC3-"$HEPMC3VER
 HEPMC2TAR="hepmc"$HEPMC2VER".tgz"
 HEPMC3TAR=$HEPMC3PKG".tar.gz"
 
 # Pythia version number with no decimal points, e.g. 8230 corresponds to version 8.230. This
 # follows the naming convention of Pythia install tar files. Again, no extra spaces allowed.
 PYTHIAVER=8243
 PYTHIAPKG="pythia"$PYTHIAVER
 PYTHIATAR=$PYTHIAPKG".tgz"
 
 # Photos++ version number
 PHOTOSVER="3.64"
 PHOTOSPKG="PHOTOS"
 PHOTOSDIR="PHOTOS."$PHOTOSVER
 PHOTOSTAR=$PHOTOSDIR".tar.gz"
 
 # Tauola++ version number
 TAUOLAVER="1.1.8"
 TAUOLAPKG="TAUOLA"
 TAUOLADIR="TAUOLA."$TAUOLAVER
 TAUOLATAR=$TAUOLADIR".tar.gz"
 
 # Determine OS
 osArch=`uname`
 
 #This is for systems with cmake and cmake3
 if command -v cmake3; then
     CMAKE=cmake3
 else
     CMAKE=cmake
 fi
 
 echo Will install EvtGen version $VERSION and its dependencies in $INSTALL_PREFIX
 
 BUILD_BASE=`mktemp -d` || exit 1
 
 echo Temporary build area is $BUILD_BASE
 
 cd $BUILD_BASE
 
 mkdir -p tarfiles
 mkdir -p sources
 mkdir -p builds
 
 echo Downloading EvtGen source from GIT
 
 cd sources
 git clone https://phab.hepforge.org/source/evtgen.git evtgen
 cd evtgen
 git checkout $VERSION
 
 echo Downloading sources of external dependencies
 
 cd $BUILD_BASE/tarfiles
 
 if [ "$osArch" == "Darwin" ]
 then
     export LANG=en_US.UTF-8
     export LC_ALL=en_US.UTF-8
 fi
 
 if [ "$HEPMCMAJORVERSION" -lt "3" ]
 then
     curl -O http://hepmc.web.cern.ch/hepmc/releases/$HEPMC2TAR
 else
     curl -O http://hepmc.web.cern.ch/hepmc/releases/$HEPMC3TAR
 fi
 curl -O https://pythia.org/download/pythia${PYTHIAVER:0:2}/$PYTHIATAR
 curl -O http://photospp.web.cern.ch/photospp/resources/$PHOTOSDIR/$PHOTOSTAR
 curl -O http://tauolapp.web.cern.ch/tauolapp/resources/$TAUOLADIR/$TAUOLATAR
 
 cd $BUILD_BASE/sources
 
 echo Extracting external dependencies
 if [ "$HEPMCMAJORVERSION" -lt "3" ]
 then
     tar -xzf $BUILD_BASE/tarfiles/$HEPMC2TAR
 else
     tar -xzf $BUILD_BASE/tarfiles/$HEPMC3TAR
 fi
 tar -xzf $BUILD_BASE/tarfiles/$PYTHIATAR
 tar -xzf $BUILD_BASE/tarfiles/$PHOTOSTAR
 tar -xzf $BUILD_BASE/tarfiles/$TAUOLATAR
 
 # Patch TAUOLA and PHOTOS on Darwin (Mac)
 if [ "$osArch" == "Darwin" ]
 then
     sed -i '' 's/soname/install_name/g' PHOTOS/Makefile
     sed -i '' 's/soname/install_name/g' TAUOLA/Makefile
     patch -p0 < $BUILD_BASE/sources/evtgen/platform/tauola_Darwin.patch
     patch -p0 < $BUILD_BASE/sources/evtgen/platform/photos_Darwin.patch
     # Uncomment the lines below to force usage of clang
     # export CC=clang
     # export CXX=clang++
     # sed -i '' 's/\-lstdc++/-lc++/g' PHOTOS/platform/make.inc.in
     # sed -i '' 's/\-lstdc++/-lc++/g' TAUOLA/platform/make.inc.in
 fi
 
 cd $BUILD_BASE
 
 if [ "$HEPMCMAJORVERSION" -lt "3" ]
 then
     echo Installing HepMC from $BUILD_BASE/sources/$HEPMC2PKG
     mkdir -p $BUILD_BASE/builds/HepMC2
     cd $BUILD_BASE/builds/HepMC2
     $CMAKE -DCMAKE_INSTALL_PREFIX:PATH=$INSTALL_PREFIX $BUILD_BASE/sources/$HEPMC2PKG -Dmomentum:STRING=GEV -Dlength:STRING=MM
     make
     make install
 
     echo Installing pythia8 from $BUILD_BASE/sources/$PYTHIAPKG
     cd $BUILD_BASE/sources/$PYTHIAPKG
     ./configure --enable-shared --prefix=$INSTALL_PREFIX
     make
     make install
 
     echo Installing PHOTOS from $BUILD_BASE/sources/$PHOTOSPKG
     cd $BUILD_BASE/sources/$PHOTOSPKG
     ./configure --with-hepmc3= --with-hepmc=$INSTALL_PREFIX --prefix=$INSTALL_PREFIX
     make
     make install
 
     if [ "$osArch" != "Darwin" ]
     then
         echo Installing TAUOLA from $BUILD_BASE/sources/$TAUOLAPKG
         cd $BUILD_BASE/sources/$TAUOLAPKG
         ./configure --without-hepmc3 --with-hepmc=$INSTALL_PREFIX --prefix=$INSTALL_PREFIX
         make
         make install
     fi
 
 else
 
     echo Installing HepMC3 from $BUILD_BASE/sources/$HEPMC3PKG
     mkdir -p $BUILD_BASE/builds/HepMC3
     cd $BUILD_BASE/builds/HepMC3
     $CMAKE -DHEPMC3_ENABLE_ROOTIO:BOOL=OFF -DHEPMC3_ENABLE_PYTHON:BOOL=OFF -DCMAKE_INSTALL_PREFIX:PATH=$INSTALL_PREFIX $BUILD_BASE/sources/$HEPMC3PKG
     make
     make install
 
     echo Installing pythia8 from $BUILD_BASE/souces/$PYTHIAPKG
     cd $BUILD_BASE/sources/$PYTHIAPKG
     ./configure --enable-shared --prefix=$INSTALL_PREFIX
     make
     make install
 
     echo Installing PHOTOS from $BUILD_BASE/sources/$PHOTOSPKG
     cd $BUILD_BASE/sources/$PHOTOSPKG
     ./configure --without-hepmc --with-hepmc3=$INSTALL_PREFIX --prefix=$INSTALL_PREFIX
     make
     make install
 
     if [ "$osArch" != "Darwin" ]
     then
         echo Installing TAUOLA from $BUILD_BASE/sources/$TAUOLAPKG
         cd $BUILD_BASE/sources/$TAUOLAPKG
         ./configure --without-hepmc --with-hepmc3=$INSTALL_PREFIX --prefix=$INSTALL_PREFIX
         make
         make install
     fi
 fi
 
 echo Installing EvtGen from $BUILD_BASE/sources/evtgen
 mkdir -p $BUILD_BASE/builds/evtgen
 cd $BUILD_BASE/builds/evtgen
 if [ "$osArch" == "Darwin" ]
 then
     if [ "$HEPMCMAJORVERSION" -lt "3" ]
     then
         $CMAKE -DCMAKE_INSTALL_PREFIX:PATH=$INSTALL_PREFIX $BUILD_BASE/sources/evtgen \
 		-DEVTGEN_HEPMC3:BOOL=OFF -DHEPMC2_ROOT_DIR:PATH=$INSTALL_PREFIX \
 		-DEVTGEN_PYTHIA:BOOL=ON  -DPYTHIA8_ROOT_DIR:PATH=$INSTALL_PREFIX \
 		-DEVTGEN_PHOTOS:BOOL=ON  -DPHOTOSPP_ROOT_DIR:PATH=$INSTALL_PREFIX \
 		-DEVTGEN_TAUOLA:BOOL=OFF
     else
         $CMAKE -DCMAKE_INSTALL_PREFIX:PATH=$INSTALL_PREFIX $BUILD_BASE/sources/evtgen \
 		-DEVTGEN_HEPMC3:BOOL=ON  -DHEPMC3_ROOT_DIR:PATH=$INSTALL_PREFIX \
 		-DEVTGEN_PYTHIA:BOOL=ON  -DPYTHIA8_ROOT_DIR:PATH=$INSTALL_PREFIX \
 		-DEVTGEN_PHOTOS:BOOL=ON  -DPHOTOSPP_ROOT_DIR:PATH=$INSTALL_PREFIX \
 		-DEVTGEN_TAUOLA:BOOL=OFF
     fi
 else
     if [ "$HEPMCMAJORVERSION" -lt "3" ]
     then
         $CMAKE -DCMAKE_INSTALL_PREFIX:PATH=$INSTALL_PREFIX $BUILD_BASE/sources/evtgen \
 		-DEVTGEN_HEPMC3:BOOL=OFF -DHEPMC2_ROOT_DIR:PATH=$INSTALL_PREFIX \
 		-DEVTGEN_PYTHIA:BOOL=ON  -DPYTHIA8_ROOT_DIR:PATH=$INSTALL_PREFIX \
 		-DEVTGEN_PHOTOS:BOOL=ON  -DPHOTOSPP_ROOT_DIR:PATH=$INSTALL_PREFIX \
 		-DEVTGEN_TAUOLA:BOOL=ON  -DTAUOLAPP_ROOT_DIR:PATH=$INSTALL_PREFIX
     else
         $CMAKE -DCMAKE_INSTALL_PREFIX:PATH=$INSTALL_PREFIX $BUILD_BASE/sources/evtgen \
 		-DEVTGEN_HEPMC3:BOOL=ON  -DHEPMC3_ROOT_DIR:PATH=$INSTALL_PREFIX \
 		-DEVTGEN_PYTHIA:BOOL=ON  -DPYTHIA8_ROOT_DIR:PATH=$INSTALL_PREFIX \
 		-DEVTGEN_PHOTOS:BOOL=ON  -DPHOTOSPP_ROOT_DIR:PATH=$INSTALL_PREFIX \
 		-DEVTGEN_TAUOLA:BOOL=ON  -DTAUOLAPP_ROOT_DIR:PATH=$INSTALL_PREFIX
     fi
 fi
 make
 make install
 
 echo Setup done.
 echo To complete, set the Pythia8 data path:
 if [ "$PYTHIAVER" -lt "8200" ]
 then
     echo PYTHIA8DATA=$INSTALL_PREFIX/xmldoc
 else
     echo PYTHIA8DATA=$INSTALL_PREFIX/share/Pythia8/xmldoc
 fi
 
 echo If installation fully successful you can remove the temporary build area $BUILD_BASE
 cd $BUILD_BASE