Removed blocktube (too hard for cpu)
Merge branch 'master' into notebook