Haddock fixes.
Merge pull request #2 from supki/haddock-fixes

Haddock fixes.