fixed bug when computing number of blocks
removed debug output in cpu computation
Merge branch 'master' into outofbounds