Fixes wrappers
Merge pull request #45 from lukecampbell/wrappers

Wrappers