Detect some bug, fixing.
Merge branch 'master' of https://github.com/jvanbrug/cs143sim