Pull request - 08-25-2014

First code review
Tab detected.<br>Trailing whitespace detected.