Merge branch 'adapt', used to change Inline for adapting rather than injecting.

closes #20