Merge pull request #2 from weaties/integration

Integration - crud - I wanted a fast forward merge...
Merge branch 'integration' into trunk