Merge pull request #2 from tmcdonell/master

haddock fix