Closes issue #1270
Merge pull request #1294 from diegosarmentero/master

 Closes issue #1270