give tone a short name
Merge branch 'master' into SCOop