Merge pull request #623 from FHenry/3.3

3.3