Fixed Issue # 1029
Merge pull request #1075 from diegosarmentero/master

Fixed Issue # 1029