added code to prevent ipv6
Merge branch 'master' into develop