Changes required to fix zephir generate
Merge pull request #2051 from Cinderella-Man/2.0.0

Changes required to fix zephir generate