listview optimized
Merge remote-tracking branch 'origin/master'
wrote todo comment