Created FileCleander and other fixes
Bug fixed
Merge remote-tracking branch 'origin/pele' into mazanuj