SquarePeg3D - Issue 36

Issue 36 1
Issue 36 2
Issue 36 3