Fixed Issue #842
Merge pull request #1155 from diegosarmentero/master

 Fixed Issue #842