Homec4science

rAKA/master-stable
bugfixes/46-bug-in…