Doc and CS fixes.
Merge pull request #3 from boenrobot/doc-cs-fix

Doc and CS fixes.