FIX implementing both feature #81 and #61
FIX terms in README.md
Merge pull request #85 from telefonicaid/feature/81and61

Implementing both feature #81 and #61