Merge pull request #22 from rjmackay/3.3/develop

Merge master updates in 3.3/develop