Fixed Issue #1235
Merge pull request #1297 from diegosarmentero/master

 Fixed Issue #1235