Latest changes
Merge branch 'saxswaxs' of https://github.com/stmudie/scatterBrain into saxswaxs