previous commit incomplete; apparently missed these other files' changes too
Merge pull request #97 from nickboldt/generate-composite-for-JBTIS-disco_4

previous commit incomplete; apparently missed these other files' changes too >> master