add func
Merge branch 'master' of github.com:miekg/go
move this up
more stuff