Merge pull request #185 from telefonicaid/bug/184

bug/184
bug detected and fixed for issue 203
Merge pull request #205 from telefonicaid/bug/203

Bug/203