Merge pull request #484 from Maaack/fix-capture-focus