Update main (3.1)

Now you can control number of cells and cell size.