Update Mouse Handler (Fixes #5)