sub - Added angle1, angle2, Dy and Dx2 couts.
Stable branch for subbuild.