Merge pull request #13 from dlogothetis/triangles

Triangles