Update wrappers
Bump versions
merge
fix merge
Merge pull request #747 from andrerod/master

Update wrappers