Merge pull request #7 from rdnydnns/master

flesh it out a bit