Trying to fix issue #173.

Every block is finished with it's own name.

Is this the way to make a pull request? Thanks!