fix selectedIndex line
merge files
Merge remote-tracking branch 'origin'