Merge pull request #971 from andrerod/dev

Using generated wrappers
Fix typo
:wqerge remote-tracking branch 'upstream/dev' into dev