fix comments for Haddock
Merge branch 'develop'