Added WaitGroup for services
Merge pull request #15 from corebob/master

Added WaitGroup for services