Merge pull request #1 from JonoEPD/master

triangle1
fixed