Update wrappers
Fix jsHint errors
Merge pull request #1197 from andrerod/dev

Update wrappers