Homec4science

rAKA/master
d846de9e46dfbugfixes/bug-fix-in…