Added blocks to code
Pr fix
Pr fix
Pr fix
Pr fix
Pr fix
Pr fix
Merge pull request #148 from erram/master

Added blocks to code