Merge pull request #33 from criskelly/integration

Integration