Merge pull request #8 from weaties/trunk

trunk to integration promotion