Pull request - 08-25-2014

First code review
Missing space after #.<br>Line is too long. [94/80]