Fix simulator
Merge branch 'master' of https://github.com/uwacits4419/DSR