Merge pull request #1 from apigen/master

Sync