Homec4science

rAKA/optimization
bugfixes/27-bug-in-the…