Pull request - 08-25-2014

First code review
Line is too long. [155/80]