beta version
Merge pull request #1848 from diegosarmentero/master

beta version