Merge pull request #3 from zaidan/feature/multi-services

Feature/multi services