Added clear buttons, issue #117