Added triangle as object
forward commit
Merge commit 'b4419'