Documentation more Go like
Fix merge conflict
merge
Merge pull request #37 from miekg/doc

Documentation more Go like