Fixed Issue #1105
Merge pull request #1137 from diegosarmentero/master

 Fixed Issue #1105