Some minor improves
Merge pull request #1381 from diegosarmentero/master

Some minor improves