Merge pull request #1179 from paulkocialkowski/integration