Merge pull request #290 from ralexstokes/copy-gen-types

Merge pull request #290 from ralexstokes/copy-gen-types #375