CS fixes
Fixed the docblocks
Merge pull request #121 from GrahamCampbell/cs

CS Fixes