Merge pull request #497 from zukaitis/master

Added type_override option, and its handling to generator