Merge pull request #105 from richard-willowit/version70

Internal structure changes for paramsets.