Homec4science

rAKA/optimization
bugfixes/46-bug-in…