Merge pull request #198 from klausw-g/generate-refactor