V0.6 Triggers added
Merge branch 'entw'