Merge pull request #36 from khegeman/integration