Fix instrument switching (changed midi.js)
Merge remote-tracking branch 'origin/master'