Fixed empty blocks
Merge branch 'origin/master'