Adding ServiceContainer class
Merge branch 'hotfix/0.0.8'