Merge pull request #389 from aparcar/bmx7_trigger