Merge pull request #1 from ovidiubite/integration

Integration