Added the ability to show a message stating the list is empty
Merge remote-tracking branch 'origin/master'