Merge pull request #305 from p2t2/DEV2.4.0

Dev2.4.0
Updated for new branch
Merge pull request #7 from p2t2/DEV2.5.0

Dev2.5.0