Homec4science

rAKA/hbm
bugfixes/46-bug-in…