All changes reflect release for 3.30. They have not been release yet; closes #17, closes #18