Closes #1240
Merge pull request #1295 from diegosarmentero/master

 Closes #1240