Merge pull request #4 from weaties/trunk

Trunk pull request into integration