CJ's First pull request for review

First pull request for review.
Use 2 (not 4) spaces for indentation.<br>Trailing whitespace detected.