de2: button6 works
Merge branch 'button13' of github.com:tonglil/zap into button13