wrapper update
Merge pull request #37 from creighton/master

wrapper update