After coming back to this branch after a long absence, Igor Pro (6.3.4.0) was throwing errors that it never did before, having to do with how Wave variables are declared.  Fixed.
Merge branch 'master' into imaging