merge
merge
SquareView fix