Merge branch 'master' of https://github.com/bananu7/Blocks