Merge branch 'master' of https://github.com/ReactorModelling/SMRinFBR
--amend
Fixed conflicts
Segregated approach