add trigger support
Merge remote-tracking branch 'upstream/0.4.0.1' into 0.4.0.1
fix issue 198 - afr
Merge pull request #196 from Cxquan/0.4.0.1

add trigger support