Merge pull request #294 from bruttenberg/DEV2.4.0

Dev2.4.0