Merge pull request #9 from cmilhench/master

Fix whois
refactor