Merge pull request #484 from andrerod/dev

Update wrappers
Updating module versions