Merge pull request #71 from euanh/trunk-planex-update

Trunk planex update