Merge pull request #1 from weaties/trunk

a commit on the trunk branch
a change on integration
Merge branch 'integration' into trunk