Homec4science

rAKA/optimization
bugfixes/multiple_small…