Merge pull request #29 from ipa-fxm-db/advertise_service

added some tweaks
Merge pull request #30 from ipa-fxm-db/new_features

Merge pull request #29 from ipa-fxm-db/advertise_service