Fix event and screen clearing
Merge pull request #1 from timpark/patch-1

Fix event and screen clearing