Merge pull request #253 from Genshin/mass_cleaning

Mass cleaning
single char show stopper...
Merge branch 'master' into split_into_engines