switched over to blocks
Merge remote-tracking branch 'origin/master'