Fixed the change settings
Merge branch 'master' of https://github.com/FluidConcepts/Fluid_Concepts
Fixed the changes settings