fixes #2
Merge branch 'fix_select_list'