Merge pull request #186 from edmaas/master

Feature: Resource limits for services