Homec4science

rAKA/bugfixes%2F44-failed-tests-in-master-and-features-38-branches
bugfixes/46-bug-in…