error fix
Merge branch 'master' of https://github.com/x711Li/Trumpet
typo
bug fix
extract constant
finishing touches
javascript order
javascript order
javascript fix