smarter autofocus
Merge origin/master