Add service tagging + test
Merge pull request #2 from eexit/master

Add service tagging + test