Merge pull request #4 from weaties/trunk

Trunk pull request into integration
Merge pull request #5 from weaties/master

promoting master into trunk
Merge branch 'live' into integration
Merge branch 'integration' into trunk