longer timeout
Merge branch 'master' of github.com:ChristianMeisenbichler/SAXS