simplify wrapper
Merge pull request #299 from davidchambers/wrapper

simplify wrapper