Merge pull request #999 from annando/more-blocks