Homec4science

rAKA/optimization
bugfixes/46-bug-in…947520befe236c3252c11c5…