Pull request - 08-25-2014

First code review
Trailing whitespace detected.