more types in generator
bump version
bump version
resolve merge