two more possible improvements added.
Merge branch 'development' of https://github.com/FlexibleSUSY/FlexibleSUSY into development