Fixed Issue #867
Merge pull request #1154 from diegosarmentero/master

 Fixed Issue #867