Fixed Issue #939, #932, #854
Merge pull request #1142 from diegosarmentero/master

 Fixed Issue #939, #932, #854