Fixes #170.

TO DO: more feedback for users in cases where index records
are not returned, or other remote errors occur.
Updated merge branch 'issue-170' into development

Grabbing last (cleanup) commmit from local wc