Homec4science

rAKA/bugfixes%2Fcorrecting-for-newer-compilers
3c640e1ffd21old-master