Merge pull request #1 from clutchwave/master

Rebase with master before doing new dev
Removed old static code, fixed typo
Merge pull request #2 from clutchwave/set-post-focus

Removed old static code, fixed typo