Updated for blocks
Merge branch 'video' of https://github.com/soney/red into video