Close #119. Fixed return bug and updated to use display name in presenting return value.