Homec4science

rAKA/bugfixes%2Fcorrecting-for-newer-compilers
40100c58c687bugfixes/clean…