Improved API generation.
Merge pull request #47 from ezzatron/feature/improved-api

Improved API generation.