Fix code generation steps ordering. closes #85
Merge pull request #86 from bubenkoff/generation-order-steps

Fix code generation steps ordering. closes #85