Merge pull request #2437 from BioDataAnalysis/bda_several_improvements

Several smaller improvements in the C++ code and build