Pull request - 08-25-2014

First code review
Space missing after comma.<br>Tab detected.<br>Use snake_case for variables.