Merge pull request #1 from bsletten/master

Gimme this data please ...
Merge pull request #7 from wjohnson000/master

Mergeit