More IPAddressSupport Fixes
Merge pull request #93 from andylyall/2014.05

More IPAddressSupport Fixes