v2.1.1 - redraw method + bug fixes