rwoldford Merge pull request #8 from rwoldford/master