Feature work
Fixes #1 with redraw issue
Merge pull request #2 from githubteacher/fix-redraw-issue

Fix redraw issue