Merge pull request #1 from tmcdonell/master

build fixes
haddock fix