Preparing an object oriented wrapper.
Merge pull request #2 from rizo/master

Preparing an object oriented wrapper.