fixes #21 fixed list view rendering
Merge remote-tracking branch 'upstream/master'