Added roles
Converted Default services
Merge pull request #7 from msarti/iss1

Iss1