Merge pull request #334 from whisperfish/service-address-no-more

Merge pull request #334 from whisperfish/service-address-no-more #265