Add trial number and finally fix the ribbon switch menu bug.
Merge branch 'master' of github.com:fionawood/commandmaps