Merge pull request #116 from kjd/release-3.3

Release 3.3