Docblock and minor cs fixes
Merge pull request #103 from GrahamCampbell/cs

Docblock and minor cs fixes