+ visual tweaks (clear all button)
Merge remote-tracking branch 'origin/master'