Let serverinfo return instance name

Hi Yuyi,

this patch fixes #355. Please, review and merge.

Thanks,
Manuel