Merge pull request #7 from weaties/master

promoting master to trunk with a pull request