Docblock improvements
Merge pull request #218 from GrahamCampbell/docblocks

Docblock Improvements