Fixed log cleaning
Merge branch 'dev'