Merge pull request #40 from khegeman/integration