Homec4science

rAKA/harbomaster
bugfixes/27-bug-in-the…