add a trap about global & UnboundLocalError
Merge remote-tracking branch 'origin/master'