CS Fixes
More CS fixes
More CS Fixes
Remove alignment of return in docblocks
Merge pull request #122 from pierredup/master

CS FIxes