Replacing block.call with yield

Closes #33