Does now support IpV6!
Merge pull request #169 from pdelvo/ipv6

Does now support IpV6!
Merged master into refactoring