Merge pull request #12 from codius/integration

Merge Integration