Merge pull request #27 from marinaserranomontes/develop

Cleaning comments
Merge pull request #28 from marinaserranomontes/develop

Removing duplicate service
Cleaning code
Adding license