to_2d accepts blocks for cells, row-totals and col-totals
Merge branch 'develop'