Homec4science

rAKA/optimization
bugfixes/bug-fix-in…