Adapt to Conduit APIs
Merge pull request #21 from avsm/master

Adapt to Conduit APIs