Fix shapely name
Merge tag '0.2.1'

Conflicts:
	setup.py