Feature/saxs merge

I can't merge feature/saxs_merge into develop, see issue #446 . Also, it would be neat to add it to the next release, see issue #447.