update with 4.7.0beta2 changes
Merge pull request #12 from gpazo/update470

update with 4.7.0beta2 changes