clean flag
add clean method
Merge branch 'dev'