Merge pull request #114 from ernstchan/master

merge
Merge pull request #115 from ernstchan/ipv6-support

Merge pull request #114 from ernstchan/master