Merge pull request #542 from andrerod/dev

Update wrappers
Merge remote-tracking branch 'upstream/dev' into dev