Fix variable names
Fix math detection
Merge branch 'master' of github.com:ProjetPP/PPP-CAS