conduit patch
Merge pull request #14 from mKarpis/master

conduit patch