Handle focus event
Merge pull request #57 from bvssvni/master

Handle focus event