Docblock fixes
Merge pull request #194 from GrahamCampbell/docs

Docblock Fixes