fix folder selection bug
Merge branch 'tools'