issue #25 resolved. Also applied to reset button too.