fixed input focus problem
Merge branch 'asta'
Merge branch 'asta'
testing