Closes Issue #1217
Merge pull request #1265 from diegosarmentero/issue1217

Closes Issue #1217