Only extract APIs when necessary
Merge pull request #185 from skyboy/original

Only extract APIs when necessary