Made changes from pull request #338. Fixes #282. cjaday, jnallard, ssmaceachern
Merge branch 'dev-codonbleu' of https://github.com/zoccihedron/wpi-suite into dev-codonbleu