Refresh wrappers
Merge pull request #1170 from andrerod/dev

Refresh wrappers