small and equal triangles
Merge branch 'master' into small_triangle