Merged my branch (read commit please)

Corrected some functions

Careful, it might break Cheops. Use this release in case it does not work anymore. I know I shouldn't do it, but I prefer that the new people working on Cheops have the latest version available.