Fixed some stuff V2
Merge branch 'github' of github.com:wombat23/CUBISM-MPCF into github