Docblock fixes
More fixes
More fixes
Merge pull request #351 from GrahamForks/docblocks

Docblock Fixes