Minor changes due to conflict with main repo
Fixed this issue: https://github.com/weppos/whois/issues/322
Merge branch 'master' of github.com:huyphan/whois