Merged pull request from adrianagm.
Merge branch 'adrianagm-master'