Improve call performance again.
Merge pull request #297 from mageekguy/master

Improve call performance again.