fixed wrong or suboptimal use of sotoi/satof
Merge branch 'master' of https://github.com/zalf-lsa/monica