Merge pull request #21 from rycee/master

[xml-conduit] Minor optimizations