Update for 2.3 compatibility
Merge pull request #3 from brendo/integration

Update for 2.3 compatibility