CS fix, docblocks, etc.
Merge pull request #5 from mpalourdio/misc

CS fix, docblocks, etc.