Merge pull request #295 from bruttenberg/DEV2.4.0

Dev2.4.0
Merge pull request #4 from p2t2/DEV2.4.0

Merge pull request #295 from bruttenberg/DEV2.4.0