Update wrappers
Merge pull request #542 from andrerod/dev

Update wrappers