Fixed broken preprocessor directives IPV6
Merge branch 'wip'