Changes to make haddock happy
Merge pull request #195 from ddssff/master

Changes to make haddock happy