Merge pull request #12 from bill-looby/integration-fixes

Integration fixes