Blocks merged

Merged blocks into master branch