Merge pull request #1 from spindance/integration

Integration