Merge pull request #1 from millken/master

Merge
ipdata
Merge pull request #6 from labanyd/master

ipdata