LOTS OF IMPROVES and some new features
Merge pull request #1774 from diegosarmentero/master

LOTS OF IMPROVES and some new features