better grep'ing of service names
Merge pull request #7 from oppegard/master

better grep'ing of service names