-When generating elapsed time, corrects missing scatter if nessisary and switches to it.
Merge pull request #390 from mmcguinn/master

-When generating elapsed time, corrects missing scatter if nessisary and...