slightly updated stub
Includes unit test
Merge branch '0.1.cells' into 0.1

Conflicts:
	cells.py
Merge branch '0.1.cells' into 0.1

Conflicts:
	cells.py