yield instead of block.call
Merge pull request #1995 from seuros/yield

yield instead of block.call