Merge pull request #27 from TKramez/master

Block break is now associated with the location of the block being
Merge pull request #28 from TKramez/Dev

Merge pull request #27 from TKramez/master