Support conduit-1.0
Merge pull request #6 from basvandijk/master

Support conduit-1.0