API generation:
Fix template
Merge pull request #49 from Masadow/macroAPI

API generation:
Merge remote-tracking branch 'upstream/master'