Fixing trace 23 and adding trace 24
Merge branch 'master' of https://github.com/neelsmith/archimedes-hc