Merge branch 'eselect_fact' into my_master
Merge branch 'empty_entries' into my_master