Homec4science

rAKA/optimization
bugfixes/44-failed…