should work better on saxs data
Merge remote-tracking branch 'upstream/master'