merge master with develop
Merge pull request #86 from telefonicaid/fix_master

merge master with develop