Merge pull request #3 from rjmackay/3.3/develop

Merge changes from master into 3.3/develop