More encoding.
Merge branch 'master' of github.com:drdrang/isearch