diff --git a/Analysis/Makefile.am b/Analysis/Makefile.am
--- a/Analysis/Makefile.am
+++ b/Analysis/Makefile.am
@@ -1,26 +1,26 @@
 pkglib_LTLIBRARIES = HwAnalysis.la
-HwAnalysis_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 11:0:0
+HwAnalysis_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 12:0:0
 HwAnalysis_la_SOURCES = \
 BasicConsistency.cc BasicConsistency.h \
 LEPMultiplicityCount.cc LEPMultiplicityCount.h \
 MultiplicityInfo.h \
 LEPBMultiplicity.cc\
 LEPBMultiplicity.h \
 SimpleLHCAnalysis.h SimpleLHCAnalysis.cc\
 TTbarAnalysis.h TTbarAnalysis.cc\
 LPairAnalysis.h LPairAnalysis.cc\
 GammaGammaAnalysis.h GammaGammaAnalysis.cc\
 GammaJetAnalysis.h GammaJetAnalysis.cc\
 HiggsJetAnalysis.h HiggsJetAnalysis.cc \
 ParallelRunAnalysis.h ParallelRunAnalysis.cc \
 DrellYanPT.h DrellYanPT.cc
 
 pkglib_LTLIBRARIES += HwJetsAnalysis.la
-HwJetsAnalysis_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 4:0:0
+HwJetsAnalysis_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 5:0:0
 HwJetsAnalysis_la_SOURCES = \
 LeptonsJetsAnalysis.h LeptonsJetsAnalysis.cc \
 JetsPlusAnalysis.h JetsPlusAnalysis.cc \
 HJetsAnalysis.h HJetsAnalysis.cc \
 ZJetsAnalysis.h ZJetsAnalysis.cc \
 TTJetsAnalysis.h TTJetsAnalysis.cc \
 CrossSectionAnalysis.h CrossSectionAnalysis.cc
diff --git a/Decay/EvtGen/Makefile.am b/Decay/EvtGen/Makefile.am
--- a/Decay/EvtGen/Makefile.am
+++ b/Decay/EvtGen/Makefile.am
@@ -1,12 +1,12 @@
 pkglib_LTLIBRARIES = HwEvtGenInterface.la
 
 HwEvtGenInterface_la_SOURCES = \
 EvtGenInterface.cc EvtGenInterface.h EvtGenInterface.fh \
 EvtGenRandom.h \
 EvtGenDecayer.cc EvtGenDecayer.h
 
-HwEvtGenInterface_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 1:0:0
+HwEvtGenInterface_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:0
 HwEvtGenInterface_la_LIBADD = $(EVTGENLIBS)
 HwEvtGenInterface_la_CPPFLAGS = $(AM_CPPFLAGS) $(EVTGENINCLUDE) \
 -DEVTGEN_PREFIX="\"$(EVTGENPREFIX)\"" \
 -DPYTHIA8DATA="\"$(PYTHIA8DATA)\""
diff --git a/Decay/Makefile.am b/Decay/Makefile.am
--- a/Decay/Makefile.am
+++ b/Decay/Makefile.am
@@ -1,249 +1,249 @@
 SUBDIRS = FormFactors Tau Baryon VectorMeson Perturbative \
 	  WeakCurrents ScalarMeson TensorMeson Partonic General Radiation
 
 if HAVE_EVTGEN
 SUBDIRS += EvtGen
 endif
 
 noinst_LTLIBRARIES = libHwDecay.la
 
 libHwDecay_la_LIBADD = \
 $(top_builddir)/PDT/libHwPDT.la
 
 nodist_libHwDecay_la_SOURCES =  \
 hwdecay__all.cc
 
 BUILT_SOURCES  = hwdecay__all.cc
 CLEANFILES = hwdecay__all.cc
 
 hwdecay__all.cc : $(DIR_H_FILES) $(DIR_CC_FILES) Makefile
 	@echo "Concatenating .cc files into $@"
 	@$(top_srcdir)/cat_with_cpplines $(DIR_CC_FILES) > $@
 
 EXTRA_DIST = $(ALL_H_FILES) $(ALL_CC_FILES)
 
 DIR_H_FILES = $(addprefix $(srcdir)/,$(ALL_H_FILES))
 ALL_H_FILES = \
 DecayIntegrator.fh DecayIntegrator.h \
 DecayPhaseSpaceChannel.fh DecayPhaseSpaceChannel.h \
 DecayPhaseSpaceMode.fh DecayPhaseSpaceMode.h \
 HwDecayerBase.fh HwDecayerBase.h \
 HwDecayHandler.h \
 DecayVertex.fh DecayVertex.h \
 DecayMatrixElement.fh DecayMatrixElement.h \
 TwoBodyDecayMatrixElement.h \
 GeneralDecayMatrixElement.fh GeneralDecayMatrixElement.h \
 BranchingRatioReweighter.h 
 
 DIR_CC_FILES = $(addprefix $(srcdir)/,$(ALL_CC_FILES))
 ALL_CC_FILES = \
 DecayIntegrator.cc \
 DecayPhaseSpaceChannel.cc \
 DecayPhaseSpaceMode.cc \
 HwDecayerBase.cc \
 HwDecayHandler.cc \
 DecayVertex.cc \
 DecayMatrixElement.cc \
 TwoBodyDecayMatrixElement.cc \
 GeneralDecayMatrixElement.cc \
 BranchingRatioReweighter.cc
 
 
 
 ##################
 
 pkglib_LTLIBRARIES = Hw64Decay.la
 
 Hw64Decay_la_LDFLAGS = \
-$(AM_LDFLAGS) -module -version-info 9:0:0
+$(AM_LDFLAGS) -module -version-info 10:0:0
 
 Hw64Decay_la_SOURCES = \
 Hw64Decayer.h Hw64Decayer.cc
 
 ##################
 
 pkglib_LTLIBRARIES += HwMamboDecay.la
 
 HwMamboDecay_la_LDFLAGS = \
-$(AM_LDFLAGS) -module -version-info 10:0:0
+$(AM_LDFLAGS) -module -version-info 11:0:0
 
 HwMamboDecay_la_SOURCES = \
 MamboDecayer.h MamboDecayer.cc
 
 ##################
 
 noinst_LTLIBRARIES += libHwFormFactor.la
 
 libHwFormFactor_la_SOURCES = \
 FormFactors/BaryonFormFactor.cc \
 FormFactors/ScalarFormFactor.cc \
 FormFactors/BtoSGammaHadronicMass.cc \
 FormFactors/BaryonFormFactor.fh \
 FormFactors/BaryonFormFactor.h \
 FormFactors/ScalarFormFactor.fh \
 FormFactors/ScalarFormFactor.h \
 FormFactors/BtoSGammaHadronicMass.h \
 FormFactors/BtoSGammaHadronicMass.fh
 
 pkglib_LTLIBRARIES += HwFormFactors.la
 
 HwFormFactors_la_LDFLAGS = \
-$(AM_LDFLAGS) -module -version-info 10:0:0
+$(AM_LDFLAGS) -module -version-info 11:0:0
 
 HwFormFactors_la_CPPFLAGS = \
 $(AM_CPPFLAGS) -I$(srcdir)/FormFactors
 
 nodist_HwFormFactors_la_SOURCES = \
 FormFactors/Formfactor__all.cc
 
 ##################
 
 pkglib_LTLIBRARIES += HwTauDecay.la
 
 HwTauDecay_la_LDFLAGS = \
-$(AM_LDFLAGS) -module -version-info 10:0:0
+$(AM_LDFLAGS) -module -version-info 11:0:0
 
 HwTauDecay_la_SOURCES = \
 Tau/TauDecayer.cc
 
 ##################
 
 pkglib_LTLIBRARIES += HwBaryonDecay.la
 
 HwBaryonDecay_la_LDFLAGS = \
-$(AM_LDFLAGS) -module -version-info 9:0:0
+$(AM_LDFLAGS) -module -version-info 10:0:0
 
 HwBaryonDecay_la_LIBADD = \
 $(top_builddir)/PDT/libHwBaryonWidth.la
 
 HwBaryonDecay_la_CPPFLAGS = \
 $(AM_CPPFLAGS) -I$(srcdir)/Baryon
 
 nodist_HwBaryonDecay_la_SOURCES = \
 Baryon/BaryonDecayer__all.cc
 
 ##################
 
 pkglib_LTLIBRARIES += HwVMDecay.la
 
 HwVMDecay_la_LDFLAGS = \
-$(AM_LDFLAGS) -module -version-info 9:0:0
+$(AM_LDFLAGS) -module -version-info 10:0:0
 
 HwVMDecay_la_CPPFLAGS = \
 $(AM_CPPFLAGS) -I$(srcdir)/VectorMeson
 
 nodist_HwVMDecay_la_SOURCES = \
 VectorMeson/VMDecayer__all.cc
 
 ##################
 
 pkglib_LTLIBRARIES += HwPerturbativeDecay.la 
 
 HwPerturbativeDecay_la_LDFLAGS = \
-$(AM_LDFLAGS) -module -version-info 10:0:0
+$(AM_LDFLAGS) -module -version-info 11:0:0
 
 HwPerturbativeDecay_la_CPPFLAGS = \
 $(AM_CPPFLAGS) -I$(srcdir)/Perturbative
 
 nodist_HwPerturbativeDecay_la_SOURCES = \
 Perturbative/Perturbative__all.cc
 
 ##################
 
 pkglib_LTLIBRARIES += HwPerturbativeHiggsDecay.la
 
 HwPerturbativeHiggsDecay_la_LDFLAGS = \
-$(AM_LDFLAGS) -module -version-info 10:0:0
+$(AM_LDFLAGS) -module -version-info 11:0:0
 
 HwPerturbativeHiggsDecay_la_CPPFLAGS = \
 $(AM_CPPFLAGS) -I$(srcdir)/Perturbative
 
 nodist_HwPerturbativeHiggsDecay_la_SOURCES = \
 Perturbative/PerturbativeHiggs__all.cc
 
 ##################
 
 noinst_LTLIBRARIES += libHwWeakCurrent.la
 libHwWeakCurrent_la_SOURCES = \
 WeakCurrents/WeakDecayCurrent.cc \
 WeakCurrents/LeptonNeutrinoCurrent.cc \
 WeakCurrents/WeakDecayCurrent.fh \
 WeakCurrents/WeakDecayCurrent.h \
 WeakCurrents/LeptonNeutrinoCurrent.fh \
 WeakCurrents/LeptonNeutrinoCurrent.h
 
 pkglib_LTLIBRARIES += HwWeakCurrents.la
 
 HwWeakCurrents_la_LDFLAGS = \
-$(AM_LDFLAGS) -module -version-info 10:0:0
+$(AM_LDFLAGS) -module -version-info 11:0:0
 
 HwWeakCurrents_la_CPPFLAGS = \
 $(AM_CPPFLAGS) -I$(srcdir)/WeakCurrents
 
 nodist_HwWeakCurrents_la_SOURCES = \
 WeakCurrents/WeakCurrents__all.cc
 
 ##################
 
 pkglib_LTLIBRARIES += HwSMDecay.la
 
 HwSMDecay_la_LDFLAGS = \
-$(AM_LDFLAGS) -module -version-info 11:0:0
+$(AM_LDFLAGS) -module -version-info 12:0:0
 
 HwSMDecay_la_CPPFLAGS = \
 $(AM_CPPFLAGS) -I$(srcdir)/ScalarMeson
 
 nodist_HwSMDecay_la_SOURCES = \
 ScalarMeson/SMDecayer__all.cc
 
 ##################
 
 pkglib_LTLIBRARIES += HwTMDecay.la
 
 HwTMDecay_la_LDFLAGS = \
-$(AM_LDFLAGS) -module -version-info 9:0:0
+$(AM_LDFLAGS) -module -version-info 10:0:0
 
 HwTMDecay_la_CPPFLAGS = \
 $(AM_CPPFLAGS) -I$(srcdir)/TensorMeson
 
 nodist_HwTMDecay_la_SOURCES = \
 TensorMeson/TMDecayer__all.cc
 
 ##################
 
 pkglib_LTLIBRARIES += HwPartonicDecay.la
 
 HwPartonicDecay_la_LDFLAGS = \
-$(AM_LDFLAGS) -module -version-info 10:0:0
+$(AM_LDFLAGS) -module -version-info 11:0:0
 
 HwPartonicDecay_la_CPPFLAGS = \
 $(AM_CPPFLAGS) -I$(srcdir)/Partonic
 
 nodist_HwPartonicDecay_la_SOURCES = \
 Partonic/Partonic__all.cc
 
 ##################
 
 noinst_LTLIBRARIES += libHwDecRad.la
 
 libHwDecRad_la_SOURCES = \
 Radiation/DecayRadiationGenerator.cc \
 Radiation/QEDRadiationHandler.cc \
 Radiation/DecayRadiationGenerator.h \
 Radiation/DecayRadiationGenerator.fh \
 Radiation/QEDRadiationHandler.fh \
 Radiation/QEDRadiationHandler.h
 
 
 pkglib_LTLIBRARIES += HwSOPHTY.la
 
 HwSOPHTY_la_LDFLAGS = \
-$(AM_LDFLAGS) -module -version-info 4:0:0
+$(AM_LDFLAGS) -module -version-info 5:0:0
 
 HwSOPHTY_la_CPPFLAGS = \
 $(AM_CPPFLAGS) -I$(srcdir)/Radiation
 
 nodist_HwSOPHTY_la_SOURCES = \
 Radiation/Sophty__all.cc
 
 ##################
diff --git a/MatrixElement/DIS/Makefile.am b/MatrixElement/DIS/Makefile.am
--- a/MatrixElement/DIS/Makefile.am
+++ b/MatrixElement/DIS/Makefile.am
@@ -1,6 +1,6 @@
 pkglib_LTLIBRARIES = HwMEDIS.la
 HwMEDIS_la_SOURCES = \
 DISBase.h DISBase.cc \
 MENeutralCurrentDIS.cc  MENeutralCurrentDIS.h  \
 MEChargedCurrentDIS.cc  MEChargedCurrentDIS.h
-HwMEDIS_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 7:1:0
+HwMEDIS_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 8:0:0
diff --git a/MatrixElement/Gamma/Makefile.am b/MatrixElement/Gamma/Makefile.am
--- a/MatrixElement/Gamma/Makefile.am
+++ b/MatrixElement/Gamma/Makefile.am
@@ -1,10 +1,10 @@
 pkglib_LTLIBRARIES = HwMEGammaGamma.la HwMEGammaHadron.la
 
 HwMEGammaGamma_la_SOURCES = \
 MEGammaGamma2ff.cc MEGammaGamma2ff.h \
 MEGammaGamma2WW.cc MEGammaGamma2WW.h
-HwMEGammaGamma_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 4:0:0
+HwMEGammaGamma_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 5:0:0
 
 HwMEGammaHadron_la_SOURCES = \
 MEGammaP2Jets.cc MEGammaP2Jets.h
-HwMEGammaHadron_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 4:0:0
+HwMEGammaHadron_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 5:0:0
diff --git a/MatrixElement/Hadron/Makefile.am b/MatrixElement/Hadron/Makefile.am
--- a/MatrixElement/Hadron/Makefile.am
+++ b/MatrixElement/Hadron/Makefile.am
@@ -1,28 +1,28 @@
 pkglib_LTLIBRARIES = HwMEHadron.la
 HwMEHadron_la_SOURCES = \
 MEqq2gZ2ff.cc MEqq2gZ2ff.h \
 MEqq2W2ff.cc MEqq2W2ff.h   \
 MEPP2GammaJet.h MEPP2GammaJet.cc\
 MEQCD2to2.h MEQCD2to2.cc\
 MEPP2HiggsJet.h MEPP2HiggsJet.cc\
 MEPP2GammaGamma.h MEPP2GammaGamma.cc \
 MEPP2QQ.h    MEPP2QQ.cc   \
 MEPP2QQHiggs.h    MEPP2QQHiggs.cc   \
 MEPP2Higgs.h MEPP2Higgs.cc\
 MEPP2WH.h    MEPP2WH.cc   \
 MEPP2ZH.h    MEPP2ZH.cc   \
 MEPP2WJet.cc MEPP2WJet.h  \
 MEPP2ZJet.cc MEPP2ZJet.h  \
 MEPP2VV.cc   MEPP2VV.h  \
 MEPP2VGamma.cc   MEPP2VGamma.h  \
 MEPP2HiggsVBF.cc   MEPP2HiggsVBF.h  \
 MEPP2SingleTop.cc   MEPP2SingleTop.h  \
 MEMinBias.h MEMinBias.cc \
 MEDiffraction.h MEDiffraction.cc
 
-HwMEHadron_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 8:2:0
+HwMEHadron_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 9:0:0
 
 pkglib_LTLIBRARIES += HwMEHadronFast.la
 HwMEHadronFast_la_SOURCES = \
 MEQCD2to2Fast.h MEQCD2to2Fast.cc
-HwMEHadronFast_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 6:0:0
+HwMEHadronFast_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 7:0:0
diff --git a/MatrixElement/Lepton/Makefile.am b/MatrixElement/Lepton/Makefile.am
--- a/MatrixElement/Lepton/Makefile.am
+++ b/MatrixElement/Lepton/Makefile.am
@@ -1,10 +1,10 @@
 pkglib_LTLIBRARIES = HwMELepton.la
 HwMELepton_la_SOURCES = \
 MEee2gZ2qq.h MEee2gZ2qq.cc\
 MEee2gZ2ll.h MEee2gZ2ll.cc\
 MEee2ZH.h MEee2ZH.cc\
 MEee2HiggsVBF.h MEee2HiggsVBF.cc \
 MEee2VV.h MEee2VV.cc \
 MEee2VectorMeson.h MEee2VectorMeson.cc \
 MEee2Higgs2SM.h MEee2Higgs2SM.cc
-HwMELepton_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 7:1:0
+HwMELepton_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 8:0:0
diff --git a/MatrixElement/Matchbox/Builtin/Amplitudes/Makefile.am b/MatrixElement/Matchbox/Builtin/Amplitudes/Makefile.am
--- a/MatrixElement/Matchbox/Builtin/Amplitudes/Makefile.am
+++ b/MatrixElement/Matchbox/Builtin/Amplitudes/Makefile.am
@@ -1,72 +1,72 @@
 pkglib_LTLIBRARIES = HwMatchboxBuiltin.la
 
 HwMatchboxBuiltin_la_LDFLAGS = \
-$(AM_LDFLAGS) -module -version-info 4:1:0
+$(AM_LDFLAGS) -module -version-info 5:0:0
 
 nodist_HwMatchboxBuiltin_la_SOURCES = \
 Amplitudes__all.cc
 
 BUILT_SOURCES  = Amplitudes__all.cc
 CLEANFILES = Amplitudes__all.cc
 
 Amplitudes__all.cc : $(DIR_H_FILES) $(DIR_CC_FILES) Makefile
 	@echo "Concatenating .cc files into $@"
 	@$(top_srcdir)/cat_with_cpplines $(DIR_CC_FILES) > $@
 
 EXTRA_DIST = $(ALL_H_FILES) $(ALL_CC_FILES)
 
 DIR_H_FILES = $(addprefix $(srcdir)/,$(ALL_H_FILES))
 ALL_H_FILES = \
 MatchboxCurrents.h \
 MatchboxZGammaAmplitude.h \
 MatchboxAmplitudellbarqqbargg.h \
 MatchboxAmplitudellbarqqbarg.h \
 MatchboxAmplitudellbarqqbar.h \
 MatchboxAmplitudellbarqqbarqqbar.h \
 MatchboxAmplitudelnuqqbargg.h \
 MatchboxAmplitudelnuqqbarg.h \
 MatchboxAmplitudelnuqqbar.h \
 MatchboxAmplitudelnuqqbarqqbar.h \
 MatchboxAmplitudehbbbarg.h \
 MatchboxAmplitudehbbbar.h \
 MatchboxAmplitudehggg.h \
 MatchboxAmplitudehgg.h \
 MatchboxAmplitudehqqbarg.h \
 MatchboxAmplitudeqqbarttbar.h \
 MatchboxAmplitudeqqbarttbarg.h \
 MatchboxAmplitudeggttbar.h \
 MatchboxAmplitudeggttbarg.h \
 HelAmps_sm.h \
 Parameters_sm.h \
 MG_qqx2ttx.h \
 MG_qqx2ttxg.h \
 MG_gg2ttx.h \
 MG_gg2ttxg.h
 
 DIR_CC_FILES = $(addprefix $(srcdir)/,$(ALL_CC_FILES))
 ALL_CC_FILES = \
 MatchboxCurrents.cc \
 MatchboxZGammaAmplitude.cc \
 MatchboxAmplitudellbarqqbar.cc \
 MatchboxAmplitudellbarqqbarg.cc \
 MatchboxAmplitudellbarqqbargg.cc \
 MatchboxAmplitudellbarqqbarqqbar.cc \
 MatchboxAmplitudelnuqqbar.cc \
 MatchboxAmplitudelnuqqbarg.cc \
 MatchboxAmplitudelnuqqbargg.cc \
 MatchboxAmplitudelnuqqbarqqbar.cc \
 MatchboxAmplitudehbbbar.cc \
 MatchboxAmplitudehbbbarg.cc \
 MatchboxAmplitudehgg.cc \
 MatchboxAmplitudehggg.cc \
 MatchboxAmplitudehqqbarg.cc \
 MatchboxAmplitudeqqbarttbar.cc \
 MatchboxAmplitudeqqbarttbarg.cc \
 MatchboxAmplitudeggttbar.cc \
 MatchboxAmplitudeggttbarg.cc \
 HelAmps_sm.cc \
 Parameters_sm.cc \
 MG_qqx2ttx.cc \
 MG_qqx2ttxg.cc \
 MG_gg2ttx.cc \
 MG_gg2ttxg.cc
diff --git a/MatrixElement/Matchbox/CVolver/Makefile.am b/MatrixElement/Matchbox/CVolver/Makefile.am
--- a/MatrixElement/Matchbox/CVolver/Makefile.am
+++ b/MatrixElement/Matchbox/CVolver/Makefile.am
@@ -1,9 +1,9 @@
 pkglib_LTLIBRARIES = HwCVolver.la
 
-HwCVolver_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 3:0:0
+HwCVolver_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 4:0:0
 
 HwCVolver_la_SOURCES = \
 ColourFlowBasis.cc \
 ColourFlows.cc \
 ColourFlowBasis.h \
 ColourFlows.h
diff --git a/MatrixElement/Matchbox/ColorFull/Makefile.am b/MatrixElement/Matchbox/ColorFull/Makefile.am
--- a/MatrixElement/Matchbox/ColorFull/Makefile.am
+++ b/MatrixElement/Matchbox/ColorFull/Makefile.am
@@ -1,35 +1,35 @@
 pkglib_LTLIBRARIES = HwColorFull.la
 
-HwColorFull_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 3:0:0
+HwColorFull_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 4:0:0
 
 HwColorFull_la_SOURCES = \
 Col_amp.cc \
 Col_amp.h \
 Col_basis.cc \
 Col_basis.h \
 Col_functions.cc \
 Col_functions.h \
 Col_str.cc \
 Col_str.h \
 Monomial.cc \
 Monomial.h \
 Orthogonal_basis.cc \
 Orthogonal_basis.h \
 parameters.h \
 Poly_matr.cc \
 Poly_matr.h \
 Polynomial.cc \
 Polynomial.h \
 Poly_vec.cc \
 Poly_vec.h \
 Quark_line.cc \
 Quark_line.h \
 Trace_basis.cc \
 TraceBasis.cc \
 Trace_basis.h \
 TraceBasis.h \
 Trace_type_basis.cc \
 Trace_type_basis.h \
 Tree_level_gluon_basis.cc \
 Tree_level_gluon_basis.h \
 types.h
diff --git a/MatrixElement/Matchbox/Cuts/Makefile.am b/MatrixElement/Matchbox/Cuts/Makefile.am
--- a/MatrixElement/Matchbox/Cuts/Makefile.am
+++ b/MatrixElement/Matchbox/Cuts/Makefile.am
@@ -1,36 +1,36 @@
 pkglib_LTLIBRARIES = HwMatchboxCuts.la
 
 HwMatchboxCuts_la_LDFLAGS = \
-$(AM_LDFLAGS) -module -version-info 3:0:0
+$(AM_LDFLAGS) -module -version-info 4:0:0
 
 nodist_HwMatchboxCuts_la_SOURCES = \
 Cuts__all.cc
 
 BUILT_SOURCES  = Cuts__all.cc
 CLEANFILES = Cuts__all.cc
 
 Cuts__all.cc : $(DIR_H_FILES) $(DIR_CC_FILES) Makefile
 	@echo "Concatenating .cc files into $@"
 	@$(top_srcdir)/cat_with_cpplines $(DIR_CC_FILES) > $@
 
 EXTRA_DIST = $(ALL_H_FILES) $(ALL_CC_FILES)
 
 DIR_H_FILES = $(addprefix $(srcdir)/,$(ALL_H_FILES))
 ALL_H_FILES = \
 IdentifiedParticleCut.h \
 MatchboxDeltaRCut.h \
 MissingPtCut.h \
 FrixionePhotonSeparationCut.h \
 InvariantMassCut.h \
 PairPtCut.h \
 PairRapidityCut.h
 
 DIR_CC_FILES = $(addprefix $(srcdir)/,$(ALL_CC_FILES))
 ALL_CC_FILES = \
 IdentifiedParticleCut.cc \
 MatchboxDeltaRCut.cc \
 MissingPtCut.cc \
 FrixionePhotonSeparationCut.cc \
 InvariantMassCut.cc \
 PairPtCut.cc \
 PairRapidityCut.cc
diff --git a/MatrixElement/Matchbox/External/Makefile.am b/MatrixElement/Matchbox/External/Makefile.am
--- a/MatrixElement/Matchbox/External/Makefile.am
+++ b/MatrixElement/Matchbox/External/Makefile.am
@@ -1,95 +1,95 @@
 SUBDIRS = BLHAGeneric VBFNLO NJet GoSam OpenLoops MadGraph
 
 
 pkglib_LTLIBRARIES =
 
 ##############
 
 if HAVE_GOSAM
 pkglib_LTLIBRARIES += HwMatchboxGoSam.la
 endif
 
 HwMatchboxGoSam_la_LDFLAGS = \
-$(AM_LDFLAGS) -module -version-info 14:1:0
+$(AM_LDFLAGS) -module -version-info 15:0:0
 
 HwMatchboxGoSam_la_CPPFLAGS = $(AM_CPPFLAGS) \
 -DHERWIG_BINDIR="\"$(bindir)\"" \
 -DHERWIG_PKGDATADIR="\"$(pkgdatadir)\"" \
 -DGOSAM_PREFIX="\"$(GOSAMPREFIX)\""
 
 HwMatchboxGoSam_la_SOURCES = \
 GoSam/GoSamAmplitude.cc
 
 
 ###############
 
 if HAVE_VBFNLO
 pkglib_LTLIBRARIES += HwMatchboxVBFNLO.la
 endif
 
-HwMatchboxVBFNLO_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 3:1:0
+HwMatchboxVBFNLO_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 4:0:0
 HwMatchboxVBFNLO_la_CPPFLAGS = $(AM_CPPFLAGS)
 HwMatchboxVBFNLO_la_CPPFLAGS += -I$(VBFNLOINCLUDE)
 HwMatchboxVBFNLO_la_CPPFLAGS += -DVBFNLOLIB=$(VBFNLOLIB)
 
 HwMatchboxVBFNLO_la_SOURCES = \
 VBFNLO/VBFNLOAmplitude.cc \
 VBFNLO/VBFNLOPhasespace.cc
 
 
 ###############
 
 if HAVE_OPENLOOPS
 pkglib_LTLIBRARIES += HwMatchboxOpenLoops.la
 endif
 
 HwMatchboxOpenLoops_la_SOURCES = \
 OpenLoops/OpenLoopsAmplitude.cc
 
-HwMatchboxOpenLoops_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 13:1:0
+HwMatchboxOpenLoops_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 14:0:0
 
 HwMatchboxOpenLoops_la_CPPFLAGS = $(AM_CPPFLAGS) \
 -DOPENLOOPSLIBS="\"$(OPENLOOPSLIBS)\"" \
 -DOPENLOOPSPREFIX="\"$(OPENLOOPSPREFIX)\""
 
 ##############
 
 
 if HAVE_NJET
 pkglib_LTLIBRARIES += HwMatchboxNJet.la
 endif
 
-HwMatchboxNJet_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 13:0:0
+HwMatchboxNJet_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 14:0:0
 
 HwMatchboxNJet_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(NJETINCLUDEPATH) \
 -DNJET_PREFIX="\"$(NJETPREFIX)\"" \
 -DNJET_LIBS="\"$(NJETLIBPATH)\""
 
 HwMatchboxNJet_la_SOURCES = \
 NJet/NJetsAmplitude.cc
 
 
 
 ##############
 
 if HAVE_MADGRAPH
 pkglib_LTLIBRARIES += HwMatchboxMadGraph.la
 endif
 
-HwMatchboxMadGraph_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 4:1:0
+HwMatchboxMadGraph_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 5:0:0
 
 HwMatchboxMadGraph_la_SOURCES = \
 MadGraph/MadGraphAmplitude.cc
 
 HwMatchboxMadGraph_la_CPPFLAGS = $(AM_CPPFLAGS) \
 -DHERWIG_BINDIR="\"$(bindir)\"" \
 -DHERWIG_INCLUDEDIR="\"$(includedir)\"" \
 -DHERWIG_PKGDATADIR="\"$(pkgdatadir)\"" \
 -DMADGRAPH_PREFIX="\"$(MADGRAPHPREFIX)\""
 
 
 
 
 
 
 
diff --git a/MatrixElement/Matchbox/Matching/Makefile.am b/MatrixElement/Matchbox/Matching/Makefile.am
--- a/MatrixElement/Matchbox/Matching/Makefile.am
+++ b/MatrixElement/Matchbox/Matching/Makefile.am
@@ -1,24 +1,24 @@
 noinst_LTLIBRARIES = libHwMatchboxMatching.la
 pkglib_LTLIBRARIES = HwQTildeMatching.la HwDipoleMatching.la
 
 libHwMatchboxMatching_la_SOURCES = \
 HardScaleProfile.h \
 HardScaleProfile.cc \
 ShowerApproximation.h \
 ShowerApproximation.cc \
 ShowerApproximationKernel.h \
 ShowerApproximationKernel.cc \
 ShowerApproximationGenerator.h \
 ShowerApproximationGenerator.cc \
 MEMatching.h \
 MEMatching.cc
 
-HwQTildeMatching_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 3:0:0
+HwQTildeMatching_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 4:0:0
 HwQTildeMatching_la_SOURCES = \
 QTildeMatching.h \
 QTildeMatching.cc
 
-HwDipoleMatching_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 3:1:0
+HwDipoleMatching_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 4:0:0
 HwDipoleMatching_la_SOURCES = \
 DipoleMatching.h \
 DipoleMatching.cc
diff --git a/MatrixElement/Matchbox/Scales/Makefile.am b/MatrixElement/Matchbox/Scales/Makefile.am
--- a/MatrixElement/Matchbox/Scales/Makefile.am
+++ b/MatrixElement/Matchbox/Scales/Makefile.am
@@ -1,32 +1,32 @@
 pkglib_LTLIBRARIES = HwMatchboxScales.la
 
 
-HwMatchboxScales_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 4:1:0
+HwMatchboxScales_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 5:0:0
 
 HwMatchboxScales_la_SOURCES = \
 MatchboxHtScale.h \
 MatchboxLeptonMassScale.h \
 MatchboxLeptonPtScale.h \
 MatchboxParticlePtScale.h \
 MatchboxPtScale.h \
 MatchboxHtScale.cc \
 MatchboxLeptonMassScale.cc \
 MatchboxLeptonPtScale.cc \
 MatchboxParticlePtScale.cc \
 MatchboxPtScale.cc \
 MatchboxSHatScale.h \
 MatchboxSHatScale.cc \
 MatchboxTopMassScale.h \
 MatchboxTopMassScale.cc \
 MatchboxTopMTScale.h \
 MatchboxTopMTScale.cc \
 MatchboxTopSumMTScale.h \
 MatchboxTopSumMTScale.cc \
 MatchboxTopMinMTScale.h \
 MatchboxTopMinMTScale.cc \
 MatchboxTriVecScales.h \
 MatchboxTriVecScales.cc \
 MatchboxTopLinearSumMTScale.h \
 MatchboxTopLinearSumMTScale.cc \
 MatchboxTopIndividualMTScale.h \
 MatchboxTopIndividualMTScale.cc
diff --git a/MatrixElement/Powheg/Makefile.am b/MatrixElement/Powheg/Makefile.am
--- a/MatrixElement/Powheg/Makefile.am
+++ b/MatrixElement/Powheg/Makefile.am
@@ -1,17 +1,17 @@
 pkglib_LTLIBRARIES = HwPowhegMEHadron.la HwPowhegMELepton.la
-HwPowhegMEHadron_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 8:0:0
+HwPowhegMEHadron_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 9:0:0
 HwPowhegMEHadron_la_SOURCES = \
 MEqq2gZ2ffPowheg.cc MEqq2gZ2ffPowheg.h \
 MEqq2W2ffPowheg.cc  MEqq2W2ffPowheg.h \
 MEPP2HiggsPowheg.cc  MEPP2HiggsPowheg.h \
 MEPP2WHPowheg.cc  MEPP2WHPowheg.h \
 MEPP2ZHPowheg.cc  MEPP2ZHPowheg.h \
 MEPP2VVPowheg.cc  MEPP2VVPowheg.h \
 VVKinematics.cc VVKinematics.h \
 MEPP2GammaGammaPowheg.cc  MEPP2GammaGammaPowheg.h \
 MEPP2HiggsVBFPowheg.cc MEPP2HiggsVBFPowheg.h
 
-HwPowhegMELepton_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:0
+HwPowhegMELepton_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 3:0:0
 HwPowhegMELepton_la_SOURCES = \
 MEee2gZ2qqPowheg.cc MEee2gZ2qqPowheg.h \
 MEee2gZ2llPowheg.cc MEee2gZ2llPowheg.h 
diff --git a/Models/Makefile.am b/Models/Makefile.am
--- a/Models/Makefile.am
+++ b/Models/Makefile.am
@@ -1,181 +1,181 @@
 SUBDIRS = RSModel  StandardModel General Susy UED Zprime \
           Transplanckian ADD Leptoquarks Sextet TTbAsymm \
           LH LHTP Feynrules
 
 noinst_LTLIBRARIES = libHwStandardModel.la
 nodist_libHwStandardModel_la_SOURCES = \
 StandardModel/SM__all.cc
 
 libHwStandardModel_la_CPPFLAGS = \
 $(AM_CPPFLAGS) -I$(srcdir)/StandardModel
 
 noinst_LTLIBRARIES += libHwModelGenerator.la
 nodist_libHwModelGenerator_la_SOURCES = \
 General/ModelGenerator__all.cc
 
 libHwModelGenerator_la_CPPFLAGS = \
 $(AM_CPPFLAGS) -I$(srcdir)/General
 
 
 
 
 if WANT_BSM
 
 pkglib_LTLIBRARIES = \
 HwRSModel.la \
 HwUED.la \
 HwSusy.la \
 HwNMSSM.la \
 HwRPV.la \
 HwZprimeModel.la \
 HwTransplanck.la \
 HwADDModel.la \
 HwLeptoquarkModel.la \
 HwSextetModel.la \
 HwTTbAModel.la \
 HwLHModel.la \
 HwLHTPModel.la
 
 endif
 
 #############
 
 HwRSModel_la_LDFLAGS = \
-$(AM_LDFLAGS) -module -version-info 10:0:0
+$(AM_LDFLAGS) -module -version-info 11:0:0
 
 HwRSModel_la_CPPFLAGS = \
 $(AM_CPPFLAGS) -I$(srcdir)/RSModel
 
 nodist_HwRSModel_la_SOURCES = \
 RSModel/RS__all.cc
 
 #############
 
 HwUED_la_LDFLAGS = \
-$(AM_LDFLAGS) -module -version-info 10:1:0
+$(AM_LDFLAGS) -module -version-info 11:0:0
 
 HwUED_la_CPPFLAGS = \
 $(AM_CPPFLAGS) -I$(srcdir)/UED
 
 nodist_HwUED_la_SOURCES = \
 UED/UED__all.cc
 
 #############
 
 HwSusy_la_LDFLAGS = \
-$(AM_LDFLAGS) -module -version-info 13:2:0
+$(AM_LDFLAGS) -module -version-info 14:0:0
 
 HwSusy_la_CPPFLAGS = \
 $(AM_CPPFLAGS) -I$(srcdir)/Susy
 
 nodist_HwSusy_la_SOURCES = \
 Susy/Susy__all.cc
 
 #############
 
 HwNMSSM_la_LDFLAGS = \
-$(AM_LDFLAGS) -module -version-info 5:0:0
+$(AM_LDFLAGS) -module -version-info 6:0:0
 
 HwNMSSM_la_CPPFLAGS = \
 $(AM_CPPFLAGS) -I$(srcdir)/Susy/NMSSM
 
 nodist_HwNMSSM_la_SOURCES = \
 Susy/NMSSM/NMSSM__all.cc
 
 #############
 
 HwRPV_la_LDFLAGS = \
-$(AM_LDFLAGS) -module -version-info 3:0:0
+$(AM_LDFLAGS) -module -version-info 4:0:0
 
 HwRPV_la_CPPFLAGS = \
 $(AM_CPPFLAGS) -I$(srcdir)/Susy/RPV
 
 nodist_HwRPV_la_SOURCES = \
 Susy/RPV/RPV__all.cc
 
 #############
 
 HwZprimeModel_la_LDFLAGS = \
-$(AM_LDFLAGS) -module -version-info 3:0:0
+$(AM_LDFLAGS) -module -version-info 4:0:0
 
 HwZprimeModel_la_SOURCES = \
 Zprime/ZprimeModel.cc  Zprime/ZprimeModelZPQQVertex.cc
 
 #############
 
 HwTransplanck_la_LDFLAGS = \
-$(AM_LDFLAGS) -module -version-info 4:1:0
+$(AM_LDFLAGS) -module -version-info 5:0:0
 
 HwTransplanck_la_SOURCES = \
 Transplanckian/METRP2to2.cc
 
 #############
 
 HwADDModel_la_LDFLAGS = \
-$(AM_LDFLAGS) -module -version-info 4:0:0
+$(AM_LDFLAGS) -module -version-info 5:0:0
 
 HwADDModel_la_CPPFLAGS = \
 $(AM_CPPFLAGS) -I$(srcdir)/ADD
 
 nodist_HwADDModel_la_SOURCES = \
 ADD/ADD__all.cc
 
 #############
 
 HwLeptoquarkModel_la_LDFLAGS = \
-$(AM_LDFLAGS) -module -version-info 5:0:0
+$(AM_LDFLAGS) -module -version-info 6:0:0
 
 HwLeptoquarkModel_la_CPPFLAGS = \
 $(AM_CPPFLAGS) -I$(srcdir)/Leptoquarks
 
 nodist_HwLeptoquarkModel_la_SOURCES = \
 Leptoquarks/Leptoquark__all.cc
 
 #############
 
 HwSextetModel_la_LDFLAGS = \
-$(AM_LDFLAGS) -module -version-info 3:0:0
+$(AM_LDFLAGS) -module -version-info 4:0:0
 
 HwSextetModel_la_CPPFLAGS = \
 $(AM_CPPFLAGS) -I$(srcdir)/Sextet
 
 nodist_HwSextetModel_la_SOURCES = \
 Sextet/Sextet__all.cc
 
 #############
 
 HwTTbAModel_la_LDFLAGS = \
-$(AM_LDFLAGS) -module -version-info 3:0:0
+$(AM_LDFLAGS) -module -version-info 4:0:0
 
 HwTTbAModel_la_CPPFLAGS = \
 $(AM_CPPFLAGS) -I$(srcdir)/TTbAsymm
 
 nodist_HwTTbAModel_la_SOURCES = \
 TTbAsymm/TTbA__all.cc
 
 #############
 
 HwLHModel_la_LDFLAGS = \
-$(AM_LDFLAGS) -module -version-info 5:0:0
+$(AM_LDFLAGS) -module -version-info 6:0:0
 
 HwLHModel_la_CPPFLAGS = \
 $(AM_CPPFLAGS) -I$(srcdir)/LH
 
 nodist_HwLHModel_la_SOURCES = \
 LH/LH__all.cc
 
 #############
 
 HwLHTPModel_la_LDFLAGS = \
-$(AM_LDFLAGS) -module -version-info 5:0:0
+$(AM_LDFLAGS) -module -version-info 6:0:0
 
 HwLHTPModel_la_LIBADD = \
 $(GSLLIBS)
 
 HwLHTPModel_la_CPPFLAGS = \
 $(AM_CPPFLAGS) $(GSLINCLUDE) -I$(srcdir)/LHTP
 
 nodist_HwLHTPModel_la_SOURCES = \
 LHTP/LHTP__all.cc
 
 #############
diff --git a/PDF/Makefile.am b/PDF/Makefile.am
--- a/PDF/Makefile.am
+++ b/PDF/Makefile.am
@@ -1,58 +1,58 @@
 EXTRA_DIST = diffraction
 
 pkglib_LTLIBRARIES = HwPomeronPDF.la
 HwPomeronPDF_la_SOURCES = \
 PomeronPDF.cc PomeronPDF.h
 ## add this to produce tests of the PDFs
 ## HwDIFFRACTIVEPDF_la_CPPFLAGS=$(AM_CPPFLAGS) -DDIFFRACTIVEPDF_TESTING
-HwPomeronPDF_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 3:0:0
+HwPomeronPDF_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 4:0:0
 
 pkglib_LTLIBRARIES += HwReggeonPDF.la
 HwReggeonPDF_la_SOURCES = \
 ReggeonPDF.cc ReggeonPDF.h
 ## add this to produce tests of the PDFs
 ## HwDIFFRACTIVEPDF_la_CPPFLAGS=$(AM_CPPFLAGS) -DDIFFRACTIVEPDF_TESTING
-HwReggeonPDF_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 3:0:0
+HwReggeonPDF_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 4:0:0
 
 pkglib_LTLIBRARIES += HwPomeronFlux.la
 HwPomeronFlux_la_SOURCES = \
 PomeronFlux.h PomeronFlux.cc
-HwPomeronFlux_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 4:0:0
+HwPomeronFlux_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 5:0:0
 
 ## bound into HwShower.la
 noinst_LTLIBRARIES = libHwRemDecayer.la
 libHwRemDecayer_la_SOURCES = \
 HwRemDecayer.h HwRemDecayer.cc HwRemDecayer.fh
 
 ## bound into HwShower.la
 noinst_LTLIBRARIES += libHwMPIPDF.la
 libHwMPIPDF_la_SOURCES = \
 MPIPDF.h MPIPDF.cc MPIPDF.fh \
 MinBiasPDF.h MinBiasPDF.cc MinBiasPDF.fh
 
 pkglib_LTLIBRARIES += HwSatPDF.la
 HwSatPDF_la_SOURCES = \
 SatPDF.h SatPDF.cc
 
-HwSatPDF_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 6:0:0
+HwSatPDF_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 7:0:0
 
 pkglib_LTLIBRARIES += HwIncomingPhotonEvolver.la
 HwIncomingPhotonEvolver_la_SOURCES = \
 IncomingPhotonEvolver.h IncomingPhotonEvolver.cc
 
-HwIncomingPhotonEvolver_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 6:0:0
+HwIncomingPhotonEvolver_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 7:0:0
 
 pkglib_LTLIBRARIES += HwSaSPhotonPDF.la
 HwSaSPhotonPDF_la_SOURCES = \
 SaSGamma.f SaSPhotonPDF.cc SaSPhotonPDF.h
 
-HwSaSPhotonPDF_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 1:0:0
+HwSaSPhotonPDF_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:0
 
 install-data-local:
 	for i in `find $(srcdir)/diffraction -name '*.data'`; \
 	do \
 	$(install_sh_DATA) $$i $(DESTDIR)$(pkgdatadir)/PDF/$${i#$(srcdir)/}; \
 	done
 
 uninstall-local:
 	rm -rf $(DESTDIR)$(pkgdatadir)/PDF
diff --git a/Sampling/Makefile.am b/Sampling/Makefile.am
--- a/Sampling/Makefile.am
+++ b/Sampling/Makefile.am
@@ -1,40 +1,40 @@
 SUBDIRS = CellGrids
 
 pkglib_LTLIBRARIES = HwSampling.la
 
-HwSampling_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 6:0:0
+HwSampling_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 7:0:0
 HwSampling_la_SOURCES = \
 GeneralStatistics.h GeneralStatistics.cc \
 MultiIterationStatistics.h MultiIterationStatistics.cc \
 BinSampler.h BinSampler.cc \
 GeneralSampler.h GeneralSampler.cc \
 MonacoSampler.h MonacoSampler.cc \
 Remapper.h Remapper.cc \
 exsample/cell.icc \
 exsample/generator.h \
 exsample/linear_interpolator.icc \
 exsample/config.h \
 exsample/selectors.h \
 exsample/adaption_info.h \
 exsample/selectors.icc \
 exsample/adaption_info.icc \
 exsample/exponential_generator.h \
 exsample/exponential_generator.icc \
 exsample/generator.icc \
 exsample/statistics.h \
 exsample/linear_interpolator.h \
 exsample/cell.h \
 exsample/utility.h \
 exsample/binary_tree.h \
 exsample/statistics.icc
 
 HwSampling_la_LIBADD = \
 CellGrids/libHwCellGrids.la
 
 EXTRA_DIST = herwig-mergegrids.py
 
 install-exec-local:
 	$(install_sh_SCRIPT) $(srcdir)/herwig-mergegrids.py $(DESTDIR)$(bindir)/herwig-mergegrids
 
 uninstall-local:
 	rm -f  $(DESTDIR)$(bindir)/herwig-mergegrids
diff --git a/Shower/Dipole/AlphaS/Makefile.am b/Shower/Dipole/AlphaS/Makefile.am
--- a/Shower/Dipole/AlphaS/Makefile.am
+++ b/Shower/Dipole/AlphaS/Makefile.am
@@ -1,14 +1,14 @@
 pkglib_LTLIBRARIES = HwDipoleShowerAlphaS.la
 
-HwDipoleShowerAlphaS_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 5:0:0
+HwDipoleShowerAlphaS_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 6:0:0
 
 HwDipoleShowerAlphaS_la_SOURCES =  \
 alpha_s.h \
 alpha_s.cc \
 lo_alpha_s.h \
 lo_alpha_s.cc \
 nlo_alpha_s.h \
 nlo_alpha_s.cc \
 gsl.h \
 gsl.tcc \
 gsl.cc
diff --git a/Shower/Dipole/Makefile.am b/Shower/Dipole/Makefile.am
--- a/Shower/Dipole/Makefile.am
+++ b/Shower/Dipole/Makefile.am
@@ -1,22 +1,22 @@
 SUBDIRS = Base Kernels Kinematics Utility AlphaS Merging 
 
 pkglib_LTLIBRARIES = HwDipoleShower.la
 
-HwDipoleShower_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 9:1:0
+HwDipoleShower_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 10:0:0
 
 HwDipoleShower_la_LIBADD = \
 	Base/libHwDipoleShowerBase.la \
 	Kernels/libHwDipoleShowerKernels.la \
 	Kinematics/libHwDipoleShowerKinematics.la \
 	Utility/libHwDipoleShowerUtility.la \
 	Merging/libHwDipoleShowerMerging.la
 
 HwDipoleShower_la_SOURCES =  \
 	DipoleShowerHandler.h DipoleShowerHandler.fh DipoleShowerHandler.cc
 
 
 pkglib_LTLIBRARIES += HwKrknloEventReweight.la
 HwKrknloEventReweight_la_SOURCES = \
 	KrkNLO/KrknloEventReweight.h KrkNLO/KrknloEventReweight.cc
 
-HwKrknloEventReweight_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 1:0:0
+HwKrknloEventReweight_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:0
diff --git a/Shower/QTilde/Makefile.am b/Shower/QTilde/Makefile.am
--- a/Shower/QTilde/Makefile.am
+++ b/Shower/QTilde/Makefile.am
@@ -1,27 +1,27 @@
 SUBDIRS = Matching
 pkglib_LTLIBRARIES = HwShower.la
-HwShower_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 25:2:0
+HwShower_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 26:0:0
 HwShower_la_SOURCES =  \
 Couplings/ShowerAlphaQCD.h Couplings/ShowerAlphaQCD.cc \
 Couplings/ShowerAlphaQED.h Couplings/ShowerAlphaQED.cc\
 QTildeShowerHandler.h QTildeShowerHandler.fh QTildeShowerHandler.cc \
 SplittingFunctions/HalfHalfOneSplitFn.h SplittingFunctions/HalfHalfOneSplitFn.cc\
 SplittingFunctions/OneOneOneSplitFn.h SplittingFunctions/OneOneOneSplitFn.cc\
 SplittingFunctions/ZeroZeroOneSplitFn.h SplittingFunctions/ZeroZeroOneSplitFn.cc\
 SplittingFunctions/OneHalfHalfSplitFn.h SplittingFunctions/OneHalfHalfSplitFn.cc\
 SplittingFunctions/HalfOneHalfSplitFn.h SplittingFunctions/HalfOneHalfSplitFn.cc\
 Default/QTildeSudakov.cc Default/QTildeSudakov.h\
 Default/QTildeModel.cc Default/QTildeModel.h\
 Default/Decay_QTildeShowerKinematics1to2.cc \
 Default/Decay_QTildeShowerKinematics1to2.h  \
 Default/IS_QTildeShowerKinematics1to2.cc    Default/IS_QTildeShowerKinematics1to2.h  \
 Default/FS_QTildeShowerKinematics1to2.cc    Default/FS_QTildeShowerKinematics1to2.h  \
 Default/QTildeFinder.cc Default/QTildeFinder.h\
 Default/QTildeReconstructor.cc Default/QTildeReconstructor.h Default/QTildeReconstructor.tcc \
 Base/KinematicsReconstructor.cc \
 Base/KinematicsReconstructor.h \
 Base/KinematicsReconstructor.fh \
 Base/ShowerModel.cc Base/ShowerModel.h Base/ShowerModel.fh \
 Base/PartnerFinder.h Base/PartnerFinder.fh Base/PartnerFinder.cc \
 Base/ShowerVeto.h Base/ShowerVeto.fh Base/ShowerVeto.cc \
 Base/FullShowerVeto.h Base/FullShowerVeto.fh Base/FullShowerVeto.cc
diff --git a/Shower/QTilde/Matching/Makefile.am b/Shower/QTilde/Matching/Makefile.am
--- a/Shower/QTilde/Matching/Makefile.am
+++ b/Shower/QTilde/Matching/Makefile.am
@@ -1,8 +1,8 @@
 pkglib_LTLIBRARIES = HwMatching.la
 
-HwMatching_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 4:0:0
+HwMatching_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 5:0:0
 
 HwMatching_la_SOURCES = \
 PowhegShowerHandler.h	PowhegShowerHandler.cc	\
 CKKWTree.h CKKWTree.fh CKKWTree.cc \
 ProtoTree.h ProtoBranching.h PotentialTree.h
diff --git a/UnderlyingEvent/Makefile.am b/UnderlyingEvent/Makefile.am
--- a/UnderlyingEvent/Makefile.am
+++ b/UnderlyingEvent/Makefile.am
@@ -1,15 +1,15 @@
 pkglib_LTLIBRARIES = HwUA5.la
 HwUA5_la_SOURCES = UA5Handler.cc  UA5Handler.h UA5Handler.icc
-HwUA5_la_LDFLAGS= $(AM_LDFLAGS) -module -version-info 6:0:0
+HwUA5_la_LDFLAGS= $(AM_LDFLAGS) -module -version-info 7:0:0
 
 pkglib_LTLIBRARIES += HwMPI.la
 HwMPI_la_SOURCES = MPISampler.cc MPISampler.h MPISampler.icc \
 	MPISampler.fh MPIHandler.cc \
 	MPIHandler.fh MPIHandler.h \
 	ProcessHandler.cc ProcessHandler.icc \
 	ProcessHandler.fh ProcessHandler.h \
 	MPIXSecReweighter.h MPIXSecReweighter.cc \
 	stat.h
-HwMPI_la_LDFLAGS= $(AM_LDFLAGS) -module -version-info 14:0:0
+HwMPI_la_LDFLAGS= $(AM_LDFLAGS) -module -version-info 15:0:0
 HwMPI_la_LIBADD= $(GSLLIBS)
 HwMPI_la_CPPFLAGS= $(AM_CPPFLAGS) $(GSLINCLUDE)
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1,243 +1,243 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.63])
-AC_INIT([Herwig],[7.1.4],[herwig@projects.hepforge.org],[Herwig])
+AC_INIT([Herwig],[7.1.5],[herwig@projects.hepforge.org],[Herwig])
 AC_CONFIG_SRCDIR([Utilities/HerwigStrategy.cc])
 AC_CONFIG_AUX_DIR([Config])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([Config/config.h])
 dnl AC_PRESERVE_HELP_ORDER
 AC_CANONICAL_HOST
 
 dnl === disable debug symbols by default =====
 if test "x$CXXFLAGS" = "x"; then
    CXXFLAGS=-O2
 fi
 if test "x$CFLAGS" = "x"; then
    CFLAGS=-O2
 fi
 
 AC_LANG([C++])
 
 AM_INIT_AUTOMAKE([1.11 subdir-objects gnu dist-bzip2 no-dist-gzip -Wall -Wno-portability])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
 dnl Checks for C++ compiler. Handle C++11 flags.
 AC_PROG_CXX
 AX_CXX_COMPILE_STDCXX([11],[noext],[mandatory])
 
 dnl check for POSIX
 AC_CHECK_HEADER([unistd.h],[],
       [AC_MSG_ERROR([Herwig needs "unistd.h". Non-POSIX systems are not supported.])])
 
 dnl Checks for programs.
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_PROG_LN_S
 
 dnl modified search order
 AC_PROG_FC([gfortran g95 g77]) 
 dnl xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn xlf90 f90 pgf90 pghpf epcf90 xlf f77 frt pgf77 cf77 fort77 fl32 af77])
 AC_LANG_PUSH([Fortran])
 AC_MSG_CHECKING([if the Fortran compiler ($FC) works])
 AC_COMPILE_IFELSE(
    	AC_LANG_PROGRAM([],[      print *[,]"Hello"]),
 	[AC_MSG_RESULT([yes])],
 	[AC_MSG_RESULT([no])
 	 AC_MSG_ERROR([A Fortran compiler is required to build Herwig.])
 	]
 )
 AC_LANG_POP([Fortran])
 AC_FC_WRAPPERS
 
 
 LT_PREREQ([2.2.6])
 LT_INIT([disable-static dlopen pic-only])
 
 dnl ####################################
 dnl ####################################
 
 dnl for Doc/fixinterfaces.pl
 AC_PATH_PROG(PERL, perl)
 
 dnl for Models/Feynrules
 AM_PATH_PYTHON([2.6],, [:])
 AM_CONDITIONAL([HAVE_PYTHON], [test "x$PYTHON" != "x:"])
 
 HERWIG_CHECK_GSL
 
 HERWIG_CHECK_THEPEG
 
 BOOST_REQUIRE([1.41])
 BOOST_FIND_HEADER([boost/numeric/ublas/io.hpp])
 dnl Boost 1.64 is missing a required header to make these work
 dnl we just assume they're there if io.hpp has been found OK above
 dnl BOOST_FIND_HEADER([boost/numeric/ublas/matrix.hpp])
 dnl BOOST_FIND_HEADER([boost/numeric/ublas/matrix_proxy.hpp])
 dnl BOOST_FIND_HEADER([boost/numeric/ublas/matrix_sparse.hpp])
 dnl BOOST_FIND_HEADER([boost/numeric/ublas/symmetric.hpp])
 dnl BOOST_FIND_HEADER([boost/numeric/ublas/vector.hpp])
 BOOST_FIND_HEADER([boost/operators.hpp])
 BOOST_FIND_HEADER([boost/progress.hpp])
 BOOST_FILESYSTEM([mt])
 BOOST_TEST()
 
 HERWIG_CHECK_VBFNLO
 
 HERWIG_CHECK_NJET
 
 HERWIG_CHECK_GOSAM
 
 HERWIG_CHECK_GOSAM_CONTRIB
 
 HERWIG_CHECK_OPENLOOPS
 
 HERWIG_CHECK_MADGRAPH
 
 HERWIG_CHECK_EVTGEN
 HERWIG_CHECK_PYTHIA
 
 HERWIG_COMPILERFLAGS
 
 HERWIG_LOOPTOOLS
 
 FASTJET_CHECK_FASTJET
 
 HERWIG_ENABLE_MODELS
 
 SHARED_FLAG=-shared
 AM_CONDITIONAL(NEED_APPLE_FIXES,
 		[test "xx${host/darwin/foundit}xx" != "xx${host}xx"])
 if test "xx${host/darwin/foundit}xx" != "xx${host}xx"; then
    APPLE_DSO_FLAGS=-Wl,-undefined,dynamic_lookup
    SHARED_FLAG=-bundle
 fi
 AC_SUBST([APPLE_DSO_FLAGS])
 AC_SUBST([SHARED_FLAG])
 
 AC_CONFIG_FILES([UnderlyingEvent/Makefile
 		Models/Makefile
 		Models/StandardModel/Makefile
 		Models/RSModel/Makefile
 		Models/General/Makefile
 		Models/Susy/Makefile
 		Models/Susy/NMSSM/Makefile
 		Models/Susy/RPV/Makefile
 		Models/UED/Makefile
 		Models/LH/Makefile
 		Models/LHTP/Makefile
 		Models/Transplanckian/Makefile
 		Models/Leptoquarks/Makefile
 		Models/Zprime/Makefile
 		Models/TTbAsymm/Makefile
 		Models/Feynrules/Makefile
 		Models/Feynrules/python/Makefile-FR
 		Models/ADD/Makefile
 		Models/Sextet/Makefile
 		Decay/Makefile
 		Decay/FormFactors/Makefile
 		Decay/Tau/Makefile
 		Decay/Baryon/Makefile
 		Decay/VectorMeson/Makefile
 		Decay/Perturbative/Makefile
 		Decay/ScalarMeson/Makefile
 		Decay/TensorMeson/Makefile
 		Decay/WeakCurrents/Makefile
 		Decay/Partonic/Makefile
 		Decay/General/Makefile	
 		Decay/Radiation/Makefile
 		Decay/EvtGen/Makefile
 		Doc/refman.conf
 		Doc/refman.h
 		PDT/Makefile
 		PDF/Makefile
 		MatrixElement/Makefile
 		MatrixElement/General/Makefile
 		MatrixElement/Lepton/Makefile
 		MatrixElement/Hadron/Makefile
 		MatrixElement/DIS/Makefile
 		MatrixElement/Powheg/Makefile
 		MatrixElement/Gamma/Makefile
 		MatrixElement/Reweighters/Makefile
 		MatrixElement/Matchbox/Makefile
 		MatrixElement/Matchbox/Base/Makefile
 		MatrixElement/Matchbox/Utility/Makefile
 		MatrixElement/Matchbox/Phasespace/Makefile
 		MatrixElement/Matchbox/Dipoles/Makefile
 		MatrixElement/Matchbox/InsertionOperators/Makefile
 		MatrixElement/Matchbox/Matching/Makefile
 		MatrixElement/Matchbox/Cuts/Makefile
 		MatrixElement/Matchbox/Scales/Makefile
 		MatrixElement/Matchbox/ColorFull/Makefile
 		MatrixElement/Matchbox/CVolver/Makefile
 		MatrixElement/Matchbox/Builtin/Makefile
 		MatrixElement/Matchbox/Builtin/Amplitudes/Makefile
 		MatrixElement/Matchbox/Tests/Makefile
 		MatrixElement/Matchbox/External/Makefile
 		MatrixElement/Matchbox/External/BLHAGeneric/Makefile
 		MatrixElement/Matchbox/External/VBFNLO/Makefile
 		MatrixElement/Matchbox/External/NJet/Makefile
 		MatrixElement/Matchbox/External/GoSam/Makefile
 		MatrixElement/Matchbox/External/OpenLoops/Makefile
 		MatrixElement/Matchbox/External/MadGraph/Makefile
 		MatrixElement/Matchbox/External/MadGraph/mg2herwig.py
 		Sampling/Makefile
 		Sampling/CellGrids/Makefile
 		Shower/Makefile
 		Shower/QTilde/Makefile
 		Shower/QTilde/Matching/Makefile
 		Shower/Dipole/Makefile
 		Shower/Dipole/Base/Makefile
 		Shower/Dipole/Kernels/Makefile
 		Shower/Dipole/Kinematics/Makefile
 		Shower/Dipole/Utility/Makefile
 		Shower/Dipole/AlphaS/Makefile
 		Utilities/Makefile
 		Utilities/XML/Makefile
 		Utilities/Statistics/Makefile
 		Hadronization/Makefile
 		lib/Makefile
 		include/Makefile
 		src/Makefile
 		src/defaults/Makefile
 		src/snippets/Makefile
 		src/Matchbox/Makefile
 		src/herwig-config
 		Doc/Makefile
 		Doc/HerwigDefaults.in
 		Looptools/Makefile
 		Analysis/Makefile
 		API/Makefile
 		src/Makefile-UserModules
 		src/defaults/Analysis.in
 		src/defaults/MatchboxDefaults.in
 		src/defaults/Decays.in
 		src/defaults/decayers.in
 		src/defaults/setup.gosam.in
 		src/Matchbox/LO-DefaultShower.in
 		src/Matchbox/LO-DipoleShower.in
 		src/Matchbox/MCatLO-DefaultShower.in
 		src/Matchbox/MCatLO-DipoleShower.in
 		src/Matchbox/LO-NoShower.in
 		src/Matchbox/MCatNLO-DefaultShower.in
 		src/Matchbox/MCatNLO-DipoleShower.in
 		src/Matchbox/NLO-NoShower.in
 		src/Matchbox/Powheg-DefaultShower.in
 		src/Matchbox/Powheg-DipoleShower.in
 		src/Merging/Makefile
 		Shower/Dipole/Merging/Makefile
 		src/defaults/MatchboxMergingDefaults.in
 		Contrib/Makefile
 		Contrib/make_makefiles.sh
 		Tests/Makefile
 		Makefile])
 
 AC_CONFIG_LINKS([Doc/BSMlibs.in:Doc/BSMlibs.in])
 AC_CONFIG_FILES([Doc/fixinterfaces.pl],[chmod +x Doc/fixinterfaces.pl])
 AC_CONFIG_HEADERS([PDF/SaSPhotonPDF.cc])
 HERWIG_OVERVIEW
 
 AC_CONFIG_COMMANDS([summary],[cat config.herwig])
 
 AC_OUTPUT
diff --git a/lib/Makefile.am b/lib/Makefile.am
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,49 +1,49 @@
 pkglib_LTLIBRARIES = Herwig.la
 Herwig_la_SOURCES =
 Herwig_la_LIBTOOLFLAGS = --tag=CXX
-Herwig_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 25:0:0
+Herwig_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 26:0:0
 Herwig_la_LDFLAGS += $(THEPEGLDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_FILESYSTEM_LDFLAGS) $(FCLIBS)
 Herwig_la_LIBADD = \
 $(top_builddir)/Hadronization/libHwHadronization.la \
 $(top_builddir)/Models/libHwStandardModel.la \
 $(top_builddir)/Decay/libHwDecay.la \
 $(top_builddir)/Decay/libHwFormFactor.la \
 $(top_builddir)/Decay/libHwDecRad.la \
 $(top_builddir)/Utilities/libHwUtils.la \
 $(top_builddir)/Models/libHwModelGenerator.la \
 $(top_builddir)/Decay/General/libHwGeneralDecay.la \
 $(top_builddir)/MatrixElement/General/libHwGeneralME.la \
 $(top_builddir)/MatrixElement/libHwME.la \
 $(top_builddir)/MatrixElement/Reweighters/libHwReweighters.la \
 $(top_builddir)/MatrixElement/Matchbox/libHwMatchbox.la \
 $(top_builddir)/Decay/libHwWeakCurrent.la \
 $(top_builddir)/Looptools/libHwLooptools.la \
 $(top_builddir)/Shower/libHwShower.la \
 $(THEPEGLIB) $(BOOST_SYSTEM_LIBS) $(BOOST_FILESYSTEM_LIBS) -ldl
 
 dist_noinst_SCRIPTS = fix-osx-path
 
 
 POSTPROCESSING = done-all-links
 
 if NEED_APPLE_FIXES
 POSTPROCESSING += apple-fixes
 endif
 
 
 
 all-local: $(POSTPROCESSING)
 
 done-all-links: Herwig.la
 	find $(top_builddir) \( -name '*.so.*' -or -name '*.so' \) \
   -not -name 'lib*' -not -path '$(top_builddir)/lib/*' \
   -not -path '$(top_builddir)/.hg/*' -exec $(LN_S) -f \{\} \;
 	$(LN_S) -f .libs/Herwig*so* .
 	echo "stamp" > $@
 
 apple-fixes: fix-osx-path done-all-links
 	./$<
 	echo "stamp" > $@
 
 clean-local:
 	rm -f *.so *.so.* done-all-links apple-fixes