Merge pull request #18 from boj/master

The wrapper stuff is no longer necessary.