Homec4science

rAKA/master
features/solver-rewrite