adjust to lib changes.
Merge pull request #11 from olear/master

adjust to lib changes.