Merge pull request #33 from Testeroids/Triangulation_Engine

Triangulation engine
better handling with triangulated strings