Fix clear button
Merge branch 'master' into refactor