added wrapper stuff
Merge pull request #2 from kmussel/master

added wrapper stuff