added and_trap_block
Merge branch 'master' of github.com:karlin/motion-facon