SquarePeg3D - Issue 22

Issue 22 1
Issue 22 2
Issue 22 3
Issue 22 4
Issue 22 5
Issue 22 6
Issue 22 7