simplified processing improved
Merge pull request #1434 from diegosarmentero/master

simplified processing improved