Merge pull request #1168 from pazguille/master

Resolved issues: #1165, #1166 and #1167.
Merge pull request #1170 from pazguille/master

Resolved issues: #1169.