updates to bus emulator
Merge remote-tracking branch 'origin/master'