Autofocusing on first inputs
Merge pull request #1066 from jdalphon/minor_changes

Autofocusing on first inputs
Merge remote-tracking branch 'upstream/master' into jp592