Fixing 1.8
Config with &SUGGEST;
Merge origin/master