Closes #20. Focus now works correctly.