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

added wrapper stuff