Update 3/17/14

Compat with new CoordinateSquare