CJ's First pull request for review

First pull request for review.
Line is too long. [81/80]