AH-231 commiting before merging master into branch.

	Fixed that triangles is correctly drawn.