Proper use of types in autogenerated files.
Merge pull request #63 from narner/develop

Reson/z operations