Fixed Issue #1079
Merge pull request #1151 from diegosarmentero/master

 Fixed Issue #1079