Merge pull request #295 from bruttenberg/DEV2.4.0

Dev2.4.0