Updates #217 - When there are no more results, user custom message is displayed
Merge pull request #388 from cristiroma/master

Fixes #217 - Which is actually a bug in code