Update

Changed trigger and untrigger conditions
Tagging as v1.2

Committing v1.2 to new branch