Added triggers
CS fix
Return fix
Merge pull request #3 from ThomasCantonnet/triggers

Triggers