cleaner code, thanks to Nigel Tao

https://groups.google.com/forum/#!searchin/golang-nuts/bill$20mill/golang-nuts/IrfXFTUavXE/hWE4SIcon4wJ
Merge branch 'master' of https://github.com/llimllib/ipaddress